warmux: Update to 11.04.1

pkgsrc changes:
---------------
  * The site listed in MASTER_SITES seems to be down. We can use mirror
    sites as those used by FreeBSD.

upstream changes:
-----------------
> 2011/04/18 - 11.04 release
  - Replay functionality! Still a bit unstable and version-specific
    (thanks mylad for the help image)
  - The various funny animations are now displayed more often
  - Fixed various bugs with grapple and construct in far edges of the world
    (thanks peterolen and lordjj for the bug reports)
  - Improved a bit the grapple behaviour (patch from peterolen)
  - Reduced max memory usage for the Symbian and Android ports
  - Introduce quality settings, and add one level for handhelds allowing
    alphablending and thus much higher quality ground.
  - Readd fading to laser beams
  - Fix key binding edition menu
  - Fix keys getting stuck when modifiers (control/alt/shift) were changed
  - Clean and update command line parameters; --size sets display size
  - Big rewrite of internal network protocol; should reduce a bit traffic
  - Various fixes with network menu (incorrect team updates, crashes)
  - Cache loading of xml files: menus and particle spawning should now
    be much faster
  - Android port: better resume
  - Android port: text editing with the classical virtual keyboard
  - Android port: can go to sleep when downloading (also more robust)
  - Fix MacOSX not able to list public games

5 files changed, 35 insertions, 52 deletions

diff --git a/games/warmux/Makefile b/games/warmux/Makefile
index ac452657cf2..6ed7278e5c7 100644
--- a/games/warmux/Makefile
+++ b/games/warmux/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.40 2020/11/05 09:08:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.41 2021/01/27 12:13:43 triaxx Exp $
 
-DISTNAME=	warmux-11.01
-PKGREVISION=	34
+DISTNAME=	warmux-11.04.1
 CATEGORIES=	games
-MASTER_SITES=	http://download.gna.org/warmux/
+MASTER_SITES=	http://ftp.nluug.nl/ibiblio/distributions/slitaz/sources/packages-cooking/w/ \
+	http://mirror.clarkson.edu/slitaz/sources/packages/w/ \
+	http://ftp.ec-m.fr/pub/OpenBSD/distfiles/ \
+	https://ftp.uni-erlangen.de/gentoo/distfiles/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -17,6 +19,7 @@ USE_TOOLS+=		pkg-config msgfmt
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-fribidi
 CONFIGURE_ARGS+=	--enable-servers
+WRKSRC=			${WRKDIR}/warmux-11.04
 
 BUILDLINK_TRANSFORM+=	rm:-Wl,--as-needed
 
diff --git a/games/warmux/PLIST b/games/warmux/PLIST
index feebc4d6d5f..78bb54b98a2 100644
--- a/games/warmux/PLIST
+++ b/games/warmux/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/01/27 18:00:50 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/01/27 12:13:43 triaxx Exp $
 bin/warmux
 bin/warmux-index-server
 bin/warmux-list-games
 bin/warmux-server
 man/man6/warmux.6
 share/applications/warmux.desktop
+share/applications/warmux_files.desktop
 share/locale/bg/LC_MESSAGES/warmux.mo
 share/locale/bs/LC_MESSAGES/warmux.mo
 share/locale/ca/LC_MESSAGES/warmux.mo
@@ -38,7 +39,7 @@ share/locale/sk/LC_MESSAGES/warmux.mo
 share/locale/sl/LC_MESSAGES/warmux.mo
 share/locale/sv/LC_MESSAGES/warmux.mo
 share/locale/tr/LC_MESSAGES/warmux.mo
-share/locale/ua/LC_MESSAGES/warmux.mo
+share/locale/uk/LC_MESSAGES/warmux.mo
 share/locale/zh_CN/LC_MESSAGES/warmux.mo
 share/locale/zh_TW/LC_MESSAGES/warmux.mo
 share/pixmaps/warmux_128x128.png
@@ -833,6 +834,7 @@ share/warmux/icon/uninstall_32x32.png
 share/warmux/icon/uninstall_64x64.png
 share/warmux/icon/warmux.icns
 share/warmux/icon/warmux.ico
+share/warmux/icon/warmux.mbm
 share/warmux/icon/warmux.mif
 share/warmux/icon/warmux.svg
 share/warmux/icon/warmux.xpm
@@ -845,6 +847,7 @@ share/warmux/icon/warmux_64x64.png
 share/warmux/interface/not_skin/background_control_interface.png
 share/warmux/interface/not_skin/background_help.png
 share/warmux/interface/not_skin/background_interface.png
+share/warmux/interface/not_skin/background_replay.png
 share/warmux/interface/not_skin/readme.txt
 share/warmux/interface/not_skin/small_background_interface.png
 share/warmux/interface/whitetheme/arrow_jump.png
@@ -980,11 +983,11 @@ share/warmux/map/frog/config.xml
 share/warmux/map/frog/map.png
 share/warmux/map/frog/preview.jpg
 share/warmux/map/frog/sky.jpg
-share/warmux/map/funkyisland/clouds.png
-share/warmux/map/funkyisland/config.xml
-share/warmux/map/funkyisland/island.png
-share/warmux/map/funkyisland/island_bg.jpg
-share/warmux/map/funkyisland/preview.jpg
+share/warmux/map/funky_island/clouds.png
+share/warmux/map/funky_island/config.xml
+share/warmux/map/funky_island/island.png
+share/warmux/map/funky_island/island_bg.jpg
+share/warmux/map/funky_island/preview.jpg
 share/warmux/map/goodandevil/config.xml
 share/warmux/map/goodandevil/goodandevil.png
 share/warmux/map/goodandevil/preview.jpg
@@ -1171,6 +1174,7 @@ share/warmux/menu/help_game_mode.jpg
 share/warmux/menu/help_ingame.jpg
 share/warmux/menu/help_interface.png
 share/warmux/menu/help_minimap.png
+share/warmux/menu/help_replay.png
 share/warmux/menu/help_shortkeys.png
 share/warmux/menu/help_team_selection.jpg
 share/warmux/menu/help_touch_interface.png
@@ -1182,6 +1186,7 @@ share/warmux/menu/i_network.png
 share/warmux/menu/i_options.png
 share/warmux/menu/i_play.png
 share/warmux/menu/i_quit.png
+share/warmux/menu/i_replay.png
 share/warmux/menu/i_update.png
 share/warmux/menu/ico_maps.png
 share/warmux/menu/ico_network.png
@@ -1209,6 +1214,7 @@ share/warmux/menu/quit.png
 share/warmux/menu/refresh.png
 share/warmux/menu/resolution.png
 share/warmux/menu/right.png
+share/warmux/menu/save.png
 share/warmux/menu/scroll_on_border.png
 share/warmux/menu/send_txt.png
 share/warmux/menu/sound_effects_enable.png
diff --git a/games/warmux/distinfo b/games/warmux/distinfo
index 0a09e60746f..d04cea5c2e6 100644
--- a/games/warmux/distinfo
+++ b/games/warmux/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 20:57:06 agc Exp $
+$NetBSD: distinfo,v 1.6 2021/01/27 12:13:43 triaxx Exp $
 
-SHA1 (warmux-11.01.tar.bz2) = 18e5d5bf144f069405c75ff8fe51296d9a7871a5
-RMD160 (warmux-11.01.tar.bz2) = 85a7bbfed5ca2ccbd793a12d7ea548948a747a88
-SHA512 (warmux-11.01.tar.bz2) = df74abd2f90836780b1e9c60a57a446e9d74f631089e4ac71d387fdfe79573673059f6315c346e5724ce1f46fa54ff086b3cde0de078dc9061453cfbe40222d8
-Size (warmux-11.01.tar.bz2) = 110379327 bytes
+SHA1 (warmux-11.04.1.tar.bz2) = 375dbeb43a56a047daa4fcea49a9802f4b308795
+RMD160 (warmux-11.04.1.tar.bz2) = badd055d0e10e364cfa140a76f39ec0956c674c0
+SHA512 (warmux-11.04.1.tar.bz2) = 99501ea186e091b55a6e45935de83440be02ae4fc12ee6def5ec24e213c829230b4f6017043be6afbc7188e442b0e1128cfd27c290fbe0e49b6597f927fd1e2d
+Size (warmux-11.04.1.tar.bz2) = 110083622 bytes
 SHA1 (patch-aa) = 163449e2cc6fadede8ce1a77bee08fcda59a0f0f
 SHA1 (patch-ab) = 48893791c36ae88b3fc5f565a39d3de786bc88d4
 SHA1 (patch-ac) = 24179b2ccdc2dc2dc6c95c33f12b7e55bb6f5a6e
-SHA1 (patch-lib_fixedpoint_fixed__class.h) = 7c13bb8e5b9377ddc91bb9d2aabdefb907901593
-SHA1 (patch-lib_warmux_action_action.cpp) = 8a1138902c4fb8fbff4fddac4975fe352b532eca
+SHA1 (patch-lib_warmux_action_action.cpp) = da8b2164a6fda5e890c5297a16235b5e29f47dc2
 SHA1 (patch-lib_warmux_base_i18n.cpp) = 130fa3617f5549e9c47dcd907c33a54f0b19fcda
 SHA1 (patch-tools_list__games_main.cpp) = 0577d2e2cc073ba7d8efdce567138eb43bc535f4
diff --git a/games/warmux/patches/patch-lib_fixedpoint_fixed__class.h b/games/warmux/patches/patch-lib_fixedpoint_fixed__class.h
deleted file mode 100644
index 782002fe5c3..00000000000
--- a/games/warmux/patches/patch-lib_fixedpoint_fixed__class.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-lib_fixedpoint_fixed__class.h,v 1.1 2015/03/10 13:59:29 joerg Exp $
-
---- lib/fixedpoint/fixed_class.h.orig	2015-03-09 22:46:53.000000000 +0000
-+++ lib/fixedpoint/fixed_class.h
-@@ -77,7 +77,7 @@ struct fixed_point {
-   /*explicit*/ fixed_point(float f) : intValue(float2fix<p>(f)) {}
-   /*explicit*/ fixed_point(double d) : intValue(float2fix<p>((float)d)) {}
-   /*explicit*/ fixed_point(unsigned int u) : intValue(((fixint_t)u) << p) {}
--#if LONG_MAX != INT_MAX
-+#if SIZE_MAX != INT_MAX
-   /*explicit*/ fixed_point(size_t i) : intValue(((fixint_t)i) << p) {}
- #endif
- 
diff --git a/games/warmux/patches/patch-lib_warmux_action_action.cpp b/games/warmux/patches/patch-lib_warmux_action_action.cpp
index c190719182d..09f9976639b 100644
--- a/games/warmux/patches/patch-lib_warmux_action_action.cpp
+++ b/games/warmux/patches/patch-lib_warmux_action_action.cpp
@@ -1,27 +1,15 @@
-$NetBSD: patch-lib_warmux_action_action.cpp,v 1.1 2012/04/01 14:41:17 wiz Exp $
+$NetBSD: patch-lib_warmux_action_action.cpp,v 1.2 2021/01/27 12:13:43 triaxx Exp $
 
 Cast away some constness for clang-3.1.
 
---- lib/warmux/action/action.cpp.orig	2011-01-20 15:53:53.000000000 +0000
+--- lib/warmux/action/action.cpp.orig	2011-04-28 19:03:14.000000000 +0000
 +++ lib/warmux/action/action.cpp
-@@ -73,16 +73,16 @@ Action::Action(const char *buffer, Dista
+@@ -85,7 +85,7 @@ Action::Action(const char *buffer, Dista
+ {
+   m_creator = _creator;
  
-   var.clear();
-   buffer += 4; // skip the buffer len
--  m_type = (Action_t)SDLNet_Read32(buffer);
-+  m_type = (Action_t)SDLNet_Read32((char*)buffer);
+-  m_header.len = SDLNet_Read32(buffer);
++  m_header.len = SDLNet_Read32((char*)buffer);
+   ASSERT(m_header.len >= sizeof(Header));
    buffer += 4;
--  m_timestamp = (uint)SDLNet_Read32(buffer);
-+  m_timestamp = (uint)SDLNet_Read32((char*)buffer);
-   buffer += 4;
--  int m_length = SDLNet_Read32(buffer);
-+  int m_length = SDLNet_Read32((char*)buffer);
-   buffer += 4;
- 
-   for(int i=0; i < m_length; i++)
-   {
--    uint32_t val = SDLNet_Read32(buffer);
-+    uint32_t val = SDLNet_Read32((char*)buffer);
-     var.push_back(val);
-     buffer += 4;
-   }
+   // All of the following could be skipped for the actions we now,