teeworlds: Update to 0.7.4

Client
+ Race mode integration
- finish messages
- times ingame and in the server browser
- map record displayed in the scoreboard
- localized chat messages
- race gametype icon
+ In-game server browser
+ Chat pages & upgrades
- Up to 10 pages of chat history (page up/page down)
- Persistent chat: does not clear when changing map
- Map changes are marked by a chat info message
- Chat buffer: clicking with the mouse while chatting puts the chat in pause
- Ignoring a player clears past chat
- Add helper annotation when whispering
+ Statboard upgrade
- Auto statboard screenshots
- Merge K/D and Spree/Best spree columns
- Visual indicators for flag captures
- Visual indicators for weapon stats
- Fix statboard not closing
+ Wide menus mode
+ Add version info to settings file, change naming scheme to "settings07.cfg"
- You can now switch between 0.6 and 0.7 Teeworlds smoothly
+ HighDPI support
+ Audio toggling with visual effects (Ctrl+S by default)
+ Update scroll regions throughout the UI with smooth, adaptive scrollbars
+ Add a GUI for the experimental joystick support, disable joystick by default
+ Menu hotkeys (press the first letter)
+ Some more search bars
+ Add color palettes to copy skin parts colors
+ Add "toggle dynamic camera" to controls
+ Don't show loading progression in LAN tab
+ Fix chat rendering when scoreboard is open
+ Fix MOTD consistency, allow slightly more text to be displayed
+ Fix flag colors for non-team gamemodes
+ Hide scoreboard if statboard is active
+ Lower min. mousesens
+ Change some server browser defaults (all filter, players sort)
+ Optimise SnapFindItem, a bottleneck

Server
+ Chat commands integration
- Display chat commands list, with description and parameter list, to the players
- Delete and add commands on-the-go to create a context-aware UI
- Ability to disable or replace client-side commands
+ Race mode integration: customisable display (timer accuracy...)
+ Randomize survival-mode spawns
+ Prevent skipping deathtiles with enough speed
+ No more empty nicknames
+ Some log format changes (timestamps, flag capture time...)
+ Fix projectiles from disconnected players dealing no damage
+ Remove dummy when player joins a full server

Graphics
+ 24 new skins, colorable eyes, and many more body parts to use
- Auto-adjust eye color when it is too close to that of the body
+ Winter background theme (day and night, new default)

Editor
+ Layer size now defaults to the size of the game layer

Security
+ Fix integer overflow when computing tilemap size

3 files changed, 105 insertions, 32 deletions

diff --git a/games/teeworlds/Makefile b/games/teeworlds/Makefile
index 59f4dbc5738..a9b9188228b 100644
--- a/games/teeworlds/Makefile
+++ b/games/teeworlds/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.12 2019/07/18 10:46:23 wiedi Exp $
+# $NetBSD: Makefile,v 1.13 2020/01/08 13:40:19 nia Exp $
 
-DISTNAME=	teeworlds-0.7.3.1-src
+DISTNAME=	teeworlds-0.7.4-src
 PKGNAME=	${DISTNAME:S/-src//}
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=teeworlds/}
 GITHUB_RELEASE=	${PKGVERSION_NOREV}
 
-MAINTAINER=	fstd.lkml@gmail.com
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.teeworlds.com/
 COMMENT=	Fast-paced retro multiplayer shooter
 LICENSE=	zlib AND 2-clause-bsd AND modified-bsd AND cc-by-sa-v3.0
@@ -15,31 +15,25 @@ USE_LANGUAGES=	c c++03
 USE_CMAKE=	yes
 USE_TOOLS+=	pkg-config
 
+CMAKE_ARGS+=	-Wno-dev
+
+TOOL_DEPENDS+=	icoutils-[0-9]*:../../graphics/icoutils
+
 LDFLAGS.SunOS+=	-lsocket -lnsl
 
 INSTALLATION_DIRS+=	share/appdata
 INSTALLATION_DIRS+=	share/applications
-.for size in 256 128 48 32 24 16
-INSTALLATION_DIRS+=	share/icons/hicolor/${size}x${size}/apps
-.endfor
+INSTALLATION_DIRS+=	share/pixmaps
 
-TOOL_DEPENDS+=	ImageMagick-[0-9]*:../../graphics/ImageMagick
+PYTHON_FOR_BUILD_ONLY=	tool
 
-pre-configure:
-	convert ${WRKSRC}/other/icons/teeworlds.ico[0] ${WRKDIR}/teeworlds-256.png
-	convert ${WRKSRC}/other/icons/teeworlds.ico[1] ${WRKDIR}/teeworlds-128.png
-	convert ${WRKSRC}/other/icons/teeworlds.ico[2] ${WRKDIR}/teeworlds-48.png
-	convert ${WRKSRC}/other/icons/teeworlds.ico[3] ${WRKDIR}/teeworlds-32.png
-	convert ${WRKSRC}/other/icons/teeworlds.ico[4] ${WRKDIR}/teeworlds-24.png
-	convert ${WRKSRC}/other/icons/teeworlds.ico[5] ${WRKDIR}/teeworlds-16.png
+post-build:
+	${PREFIX}/bin/icotool -x -i 1 ${WRKSRC}/other/icons/teeworlds.ico -o ${WRKDIR}/teeworlds.png
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/other/teeworlds.desktop ${DESTDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/other/teeworlds.appdata.xml ${DESTDIR}${PREFIX}/share/appdata
-.for size in 256 128 48 32 24 16
-	${INSTALL_DATA} ${WRKDIR}/teeworlds-${size}.png \
-	    ${DESTDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps/teeworlds.png
-.endfor
+	${INSTALL_DATA} ${WRKDIR}/teeworlds.png ${DESTDIR}${PREFIX}/share/pixmaps
 
 .include "../../audio/wavpack/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
@@ -47,8 +41,8 @@ post-install:
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../lang/python/application.mk"
+.include "../../lang/python/tool.mk"
 .include "../../security/openssl/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/teeworlds/PLIST b/games/teeworlds/PLIST
index c289ccf7459..0b96260db1f 100644
--- a/games/teeworlds/PLIST
+++ b/games/teeworlds/PLIST
@@ -1,14 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2019/07/01 14:01:27 nia Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/01/08 13:40:19 nia Exp $
 bin/teeworlds
 bin/teeworlds_srv
 share/appdata/teeworlds.appdata.xml
 share/applications/teeworlds.desktop
-share/icons/hicolor/128x128/apps/teeworlds.png
-share/icons/hicolor/16x16/apps/teeworlds.png
-share/icons/hicolor/24x24/apps/teeworlds.png
-share/icons/hicolor/256x256/apps/teeworlds.png
-share/icons/hicolor/32x32/apps/teeworlds.png
-share/icons/hicolor/48x48/apps/teeworlds.png
+share/pixmaps/teeworlds.png
 share/teeworlds/data/audio/foley_body_impact-01.wv
 share/teeworlds/data/audio/foley_body_impact-02.wv
 share/teeworlds/data/audio/foley_body_impact-03.wv
@@ -498,48 +493,126 @@ share/teeworlds/data/maps/license.txt
 share/teeworlds/data/maps/lms1.map
 share/teeworlds/data/maps/readme.txt
 share/teeworlds/data/particles.png
+share/teeworlds/data/race_flag.png
+share/teeworlds/data/skins/beaver.json
 share/teeworlds/data/skins/bluekitty.json
 share/teeworlds/data/skins/bluestripe.json
+share/teeworlds/data/skins/body/bat.png
 share/teeworlds/data/skins/body/bear.png
+share/teeworlds/data/skins/body/beaver.png
+share/teeworlds/data/skins/body/dog.png
+share/teeworlds/data/skins/body/force.png
+share/teeworlds/data/skins/body/fox.png
+share/teeworlds/data/skins/body/hippo.png
 share/teeworlds/data/skins/body/kitty.png
+share/teeworlds/data/skins/body/koala.png
+share/teeworlds/data/skins/body/monkey.png
+share/teeworlds/data/skins/body/mouse.png
+share/teeworlds/data/skins/body/piglet.png
+share/teeworlds/data/skins/body/raccoon.png
+share/teeworlds/data/skins/body/spiky.png
 share/teeworlds/data/skins/body/standard.png
 share/teeworlds/data/skins/body/x_ninja.png
 share/teeworlds/data/skins/bot.png
 share/teeworlds/data/skins/brownbear.json
+share/teeworlds/data/skins/bumbler.json
 share/teeworlds/data/skins/cammo.json
 share/teeworlds/data/skins/cammostripes.json
+share/teeworlds/data/skins/cavebat.json
 share/teeworlds/data/skins/decoration/hair.png
 share/teeworlds/data/skins/decoration/twinbopp.png
+share/teeworlds/data/skins/decoration/twinmello.png
+share/teeworlds/data/skins/decoration/twinpen.png
 share/teeworlds/data/skins/decoration/unibop.png
+share/teeworlds/data/skins/decoration/unimelo.png
+share/teeworlds/data/skins/decoration/unipento.png
 share/teeworlds/data/skins/default.json
+share/teeworlds/data/skins/eyes/colorable.png
+share/teeworlds/data/skins/eyes/negative.png
 share/teeworlds/data/skins/eyes/standard.png
 share/teeworlds/data/skins/eyes/standardreal.png
 share/teeworlds/data/skins/eyes/x_ninja.png
 share/teeworlds/data/skins/feet/standard.png
+share/teeworlds/data/skins/force.json
+share/teeworlds/data/skins/fox.json
+share/teeworlds/data/skins/greycoon.json
+share/teeworlds/data/skins/greyfox.json
 share/teeworlds/data/skins/hands/standard.png
+share/teeworlds/data/skins/hippo.json
 share/teeworlds/data/skins/koala.json
+share/teeworlds/data/skins/limedog.json
 share/teeworlds/data/skins/limekitty.json
 share/teeworlds/data/skins/marking/bear.png
+share/teeworlds/data/skins/marking/belly1.png
+share/teeworlds/data/skins/marking/belly2.png
+share/teeworlds/data/skins/marking/blush.png
+share/teeworlds/data/skins/marking/bug.png
 share/teeworlds/data/skins/marking/cammo1.png
 share/teeworlds/data/skins/marking/cammo2.png
 share/teeworlds/data/skins/marking/cammostripes.png
+share/teeworlds/data/skins/marking/coonfluff.png
 share/teeworlds/data/skins/marking/donny.png
+share/teeworlds/data/skins/marking/downdony.png
 share/teeworlds/data/skins/marking/duodonny.png
+share/teeworlds/data/skins/marking/fox.png
+share/teeworlds/data/skins/marking/hipbel.png
+share/teeworlds/data/skins/marking/lowcross.png
+share/teeworlds/data/skins/marking/lowpaint.png
+share/teeworlds/data/skins/marking/marksman.png
+share/teeworlds/data/skins/marking/mice.png
+share/teeworlds/data/skins/marking/mixture1.png
+share/teeworlds/data/skins/marking/mixture2.png
+share/teeworlds/data/skins/marking/monkey.png
+share/teeworlds/data/skins/marking/panda1.png
+share/teeworlds/data/skins/marking/panda2.png
+share/teeworlds/data/skins/marking/purelove.png
 share/teeworlds/data/skins/marking/saddo.png
+share/teeworlds/data/skins/marking/setisu.png
+share/teeworlds/data/skins/marking/sidemarks.png
+share/teeworlds/data/skins/marking/singu.png
 share/teeworlds/data/skins/marking/stripe.png
+share/teeworlds/data/skins/marking/striped.png
 share/teeworlds/data/skins/marking/stripes.png
+share/teeworlds/data/skins/marking/stripes2.png
+share/teeworlds/data/skins/marking/thunder.png
+share/teeworlds/data/skins/marking/tiger1.png
+share/teeworlds/data/skins/marking/tiger2.png
 share/teeworlds/data/skins/marking/toptri.png
+share/teeworlds/data/skins/marking/triangular.png
+share/teeworlds/data/skins/marking/tricircular.png
+share/teeworlds/data/skins/marking/tripledon.png
+share/teeworlds/data/skins/marking/tritri.png
+share/teeworlds/data/skins/marking/twinbelly.png
+share/teeworlds/data/skins/marking/twincross.png
 share/teeworlds/data/skins/marking/twintri.png
 share/teeworlds/data/skins/marking/uppy.png
 share/teeworlds/data/skins/marking/warpaint.png
+share/teeworlds/data/skins/marking/warstripes.png
 share/teeworlds/data/skins/marking/whisker.png
+share/teeworlds/data/skins/marking/wildpaint.png
+share/teeworlds/data/skins/marking/wildpatch.png
+share/teeworlds/data/skins/marking/yinyang.png
+share/teeworlds/data/skins/monkey.json
+share/teeworlds/data/skins/paintgre.json
+share/teeworlds/data/skins/pandabear.json
+share/teeworlds/data/skins/panther.json
+share/teeworlds/data/skins/pento.json
+share/teeworlds/data/skins/piggy.json
 share/teeworlds/data/skins/pinky.json
+share/teeworlds/data/skins/raccoon.json
 share/teeworlds/data/skins/redbopp.json
 share/teeworlds/data/skins/redstripe.json
 share/teeworlds/data/skins/saddo.json
+share/teeworlds/data/skins/setisu.json
+share/teeworlds/data/skins/snowti.json
+share/teeworlds/data/skins/spiky.json
+share/teeworlds/data/skins/swardy.json
+share/teeworlds/data/skins/tiger.json
+share/teeworlds/data/skins/tooxy.json
 share/teeworlds/data/skins/toptri.json
 share/teeworlds/data/skins/twinbop.json
 share/teeworlds/data/skins/twintri.json
+share/teeworlds/data/skins/warmouse.json
 share/teeworlds/data/skins/warpaint.json
 share/teeworlds/data/skins/x_ninja.json
 share/teeworlds/data/skins/xmas_hat.png
@@ -554,6 +627,7 @@ share/teeworlds/data/ui/gametypes/dm.png
 share/teeworlds/data/ui/gametypes/lms.png
 share/teeworlds/data/ui/gametypes/lts.png
 share/teeworlds/data/ui/gametypes/mod.png
+share/teeworlds/data/ui/gametypes/race.png
 share/teeworlds/data/ui/gametypes/tdm.png
 share/teeworlds/data/ui/gui_buttons.png
 share/teeworlds/data/ui/gui_cursor.png
@@ -561,11 +635,13 @@ share/teeworlds/data/ui/gui_icons.png
 share/teeworlds/data/ui/gui_logo.png
 share/teeworlds/data/ui/icons/arrows.png
 share/teeworlds/data/ui/icons/browse.png
+share/teeworlds/data/ui/icons/browser.png
 share/teeworlds/data/ui/icons/chat_whisper.png
 share/teeworlds/data/ui/icons/friend.png
 share/teeworlds/data/ui/icons/level.png
 share/teeworlds/data/ui/icons/menu.png
 share/teeworlds/data/ui/icons/sidebar.png
+share/teeworlds/data/ui/icons/timer_clock.png
 share/teeworlds/data/ui/icons/tools.png
 share/teeworlds/data/ui/menuimages/demos.png
 share/teeworlds/data/ui/menuimages/editor.png
@@ -581,3 +657,6 @@ share/teeworlds/data/ui/themes/jungle.png
 share/teeworlds/data/ui/themes/jungle_day.map
 share/teeworlds/data/ui/themes/jungle_night.map
 share/teeworlds/data/ui/themes/none.png
+share/teeworlds/data/ui/themes/winter.png
+share/teeworlds/data/ui/themes/winter_day.map
+share/teeworlds/data/ui/themes/winter_night.map
diff --git a/games/teeworlds/distinfo b/games/teeworlds/distinfo
index 67c76ecd6d7..8d281a09069 100644
--- a/games/teeworlds/distinfo
+++ b/games/teeworlds/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2019/07/01 14:01:27 nia Exp $
+$NetBSD: distinfo,v 1.4 2020/01/08 13:40:19 nia Exp $
 
-SHA1 (teeworlds-0.7.3.1-src.tar.gz) = 303f12f1fc83773c242a84b40826b4e2c2897286
-RMD160 (teeworlds-0.7.3.1-src.tar.gz) = de2af1dcc356e9b1fe1a9fbd62c997d4b158f187
-SHA512 (teeworlds-0.7.3.1-src.tar.gz) = 7ead583136921d74d4e1923ac035e07e441e070681fa2abc030b99c4cac3b8ab62bc77c78b0901bfb2da2c94c6f33444841ccfda66de1cd21b64becb8a27c501
-Size (teeworlds-0.7.3.1-src.tar.gz) = 8682272 bytes
+SHA1 (teeworlds-0.7.4-src.tar.gz) = 237fc18b74a442633f963109e475cb1e80effe91
+RMD160 (teeworlds-0.7.4-src.tar.gz) = 5dd974c41bf2ca9fa07cb2e48eda19e933741413
+SHA512 (teeworlds-0.7.4-src.tar.gz) = 4c089f0eac26ad9956c8675aaf3504d4005d972c99f0f1c9e49e875bc2759ff2953961fedc0a75bd7debdfd9eb25b74bec32b2f94f319bbb7a5e3a985ddafd47
+Size (teeworlds-0.7.4-src.tar.gz) = 8924583 bytes