bzflag: Update to 2.4.18

Switched to SDL2.

BZFlag 2.4.19
-------------

* Add new bz_ePlayerDeathFinalizedEvent API event - Vladimir Jimenez
* Output correct error when loading a nonexistent bzfs plugin - Vladimir Jimenez
* Remove obsolete bzfs option from Start Server menu on Windows - Scott Wichser


BZFlag 2.4.18  "Do You Hear What I Hear?" (2018-10-18)
------------------------------------------------------

* Fix DirectSound initialization order so that sound on Windows works again
    - Scott Wichser


BZFlag 2.4.16  "Reduce, Reuse, Replay" (2018-09-23)
---------------------------------------------------

* Send MsgFlagGrab before API event is called - Jeff Myers, Vladimir Jimenez
* Correctly unmuted when paused and killed by server - Alfredo Tupone
* Format codebase to allman style - Jeff Myers, Scott Wichser
* Use GLEW for obtaining OpenGL entry points and checking for extensions
    - Alfredo Tupone
* Revert a80ab87 (truncation warning fix) as that generated broken replay file
    headers. Detect and work around that bad header.
    - Joshua Bodine, Vladimir Jimenez, Scott Wichser
* Use pkg-config, if available, to detect ncurses
    - Scott Wichser, Joshua Bodine, Alfredo Tupone


BZFlag 2.4.14  "Hello Motto" (2018-05-02)
-----------------------------------------

* Add new bz_eAllowServerShotFiredEvent to the API - Vladimir Jimenez
* Fix antialiasing when starting the client windowed - Joshua Bodine
* Update the Windows icon file to include larger icons - Scott Wichser
* Treat the number pad keys uniquely for key mapping with SDL2 - Scott Wichser
* Better cpu selection for x86_64 - Alfredo Tupone
* Fix build with enable-profile - Alfredo Tupone
* Add safety check when getting flags (bzfs) - Alfredo Tupone
* Add min/../max to drawTime - Alfredo Tupone
* Fix the -configdir option for the client - Scott Wichser
* Upgrade Windows projects to Visual Studio 2017 - Scott Wichser, Jeff Myers
* Improve support for custom BZDB vars in plug-ins - Vladimir Jimenez
* Fix truncation warnings - Jeff Makey, Alfredo Tupone
* Add new bz_ePermissionModificationEvent to the API - Vladimir Jimenez
* Introduce new 'showMotto' permission - Vladimir Jimenez
* Fix gcc warnings and code formatting - Jeff Myers, Scott Wichser
* Remove old BitmapFont renderer - Scott Wichser
* Add new bz_eServerShotFiredEvent to the API - Vladimir Jimenez
* Revamp the world weapon API entirely - Vladimir Jimenez
* Add PLAYER-MOTTO output to logDetail plugin - Scott Wichser
* Display remaining ban time when a banned player connects - Vladimir Jimenez
* Punitive messages no longer display admin callsigns - Vladimir Jimenez
* Slash commands in the API now know destination channel - Jeff Myers
* Allow building with lcc compiler on e2k-alt-linux - Joshua Bodine
* Fix ability to bind a key with a modifier through menu - Joshua Bodine
* Disallow -helpmsg from world files - Vladimir Jimenez


BZFlag 2.4.12  "Silence is Golden" (2017-10-29)
-----------------------------------------------

* Allow API to trigger CTF capture event - Vladimir Jimenez
* Allow setting default values for BZDB from API - Vladimir Jimenez
* Add bzu_getTeamFromFlag() convenience function - Vladimir Jimenez
* Add new functions to the bz_APIStringList - Vladimir Jimenez
* Add string utility functions to the API and TextUtils - Vladimir Jimenez
* Fixed an issue with ASCII characters from modified non-ASCII keys in SDL 2
    - Joshua Bodine
* Fixed compilation on macOS when using autotools/gcc - Mike Miller
* Don't send client queries on behalf of players - Vladimir Jimenez
* Removed pollSet as a default perm in bzfs - Vladimir Jimenez
* Player records canSpawn value no longer always returns true - Vladimir Jimenez
* bz_addURLJob() now supports setting HTTP headers - Vladimir Jimenez
* Made multisampling work on all platforms with SDL 1.2/2 - Joshua Bodine
* Add bz_eMuteEvent and bz_eUnmuteEvent to the API - Vladimir Jimenez
* Add configure --disable-server option - Jeff Makey
* Add bz_isPlayerAutoPilot() to the API - Vladimir Jimenez
* Add bz_eAutoPilotEvent to the API - Vladimir Jimenez
* Add bz_getServerOwner() API function - Vladimir Jimenez
* The _maxFlagGrabs BZDB setting is no longer a random number - Vladimir Jimenez
* Add API access for the handicap system - Jeff Myers, Vladimir Jimenez
* Remove Xcode references to deployment targets except for main project
    - Joshua Bodine
* Allow silencing unregistered players in the client - Scott Wichser
* Fix the /silence and /unsilence client commands - Scott Wichser


BZFlag 2.4.10  "This is How We Roll" (2017-03-12)
-------------------------------------------------

* Fix high DPI handling on Windows (again) - Scott Wichser
* Custom slash commands respect double quotes when tokenizing - Vladimir Jimenez
* Make /help page names case-insensitive - Vladimir Jimenez
* Extend bz_ePlayerDieEventData to v2 to hold flag held when killed - Jeff Myers
* Add bzfs API hooks for polls and allow custom poll types - Vladimir Jimenez
* Reduce DNS cache time of list server hostname - Scott Wichser
* Fix bz_addURLJob() to correctly handle default NULL handler - Vladimir Jimenez
* TextUtils::url_encode and TextUtils::url_decode now use cURL's functions; this
    change fixes a crash bug with bz_urlEncode() - Vladimir Jimenez
* Add bz_reloadBadwords() to API - Vladimir Jimenez
* Add ability to reload badwords list with '/reload badwords' - Vladimir Jimenez
* Source code now dual licensed under the MPL 2.0 or LGPL 2.1 - Tim Riker
* Added an option to invert one or both joystick axes - Joshua Bodine
* Multisampling support under SDL 2 on macOS - Joshua Bodine


BZFlag 2.4.8  "Sixteen" (2016-10-10)
------------------------------------

* Add Russian transliteration - Ruslan Hihin, Aleksandr Lahin
* Fix a regression in 2.4.6 where the client would not reduce CPU usage when
    minimized on Windows - Scott Wichser
* On autotools platforms, try to use SDL2, then SDL1, and then fall back to
    native platform code. Allow specifying an SDL version as well.
    - Scott Wichser
* Prevent some more bzfs options from being specified in a world file
    - Scott Wichser
* Cleaned up some GCC6 warnings - Scott Wichser
* Spawn all players on base when a timed game starts - Konstantinos Kanavouras
* Add indicator for -noTeamKill servers on server list - Konstantinos Kanavouras
* Send a notification to admins when a BZDB variable is reset
    - Konstantinos Kanavouras
* Increase the range of the volume slider - Konstantinos Kanavouras


BZFlag 2.4.6  "Eight, Our Codebase is Overweight" (2016-06-26)
--------------------------------------------------------------

* regFlag plugin now uses bz_eAllowFlagGrab event - Scott Wichser
* RogueGenocide plugin defaults to ignoring rogue self-kills - Scott Wichser
* Standardize and update the documentation for bundled plugins - Scott Wichser
* Add bz_getRandomPoint to API - Vladimir Jimenez
* Correctly handle the keypad keys with SDL2 - Jeff Makey, Scott Wichser
* Implement SOURCE_DATE_EPOCH spec in our autoconf system to work towards
  reproducible builds - Scott Wichser, Jeff Makey
* Include a timestamp in the /savemsgs output filename - Scott Wichser
* Added -t option to /savemsgs to add timestamps to messages - Scott Wichser
* Added a GUI option to show timestamps on the messages - Scott Wichser
* For SDL2, restore the original gamma on exit and reapply desired gamma on
    window recreation - Scott Wichser
* Use SDL2 on Windows for the window/display management - Scott Wichser
* Remove hiddenAdmin plugin - Vladimir Jimenez
* Add a cycleRadar and cyclePanel key binding command - Joshua Bodine


BZFlag 2.4.4  "Be My Valentank" (2016-02-14)
--------------------------------------------

* Correctly exit the game when closing from the Windows 10 taskbar
    - Scott Wichser
* Update the player status when a gameover event occurs - Scott Wichser
* Fix fullscreen window toggling on Mac OS X - Joshua Bodine
* Fix crash on exit with Windows bzfs - Scott Wichser
* Fix crash on exit with Mac OS X bzfs - Joshua Bodine
* Fix buffer overrun that caused a crash on exit and other strange behavior on
    Windows and Linux - Scott Wichser
* On Windows, reload textures after initializing the context - Scott Wichser
* Add a menu to edit server list quick filters - Scott Wichser
* Tell Windows that we are DPI aware - Scott Wichser
* Time functions in the bzfs API use doubles instead of int - Vladimir Jimenez
* Fix issue on Windows that allowed mouse to get stuck off-screen when switching
    to windowed mode - Scott Wichser
* Replace NaN with zero in nboUnpackFloat() - Jeff Makey
* Add a bz_ChatEventData_V2 that contains message type - Konstantinos Kanavouras
* Show recipient/sender for private action messages in BZAadmin
    - Konstantinos Kanavouras
* Server list filter: remove "cached" boolean filter, rename "flags" to "ffa",
    "teams" to "ctf", and add "offa" - Scott Wichser
* Add server list filter help pages - Scott Wichser
* Add config option to control shot brightness - Konstantinos Kanavouras
* Don't show a running countdown to a player who joins a paused game
    - Konstantinos Kanavouras
* Allow RGB values in ANSI color codes to allow custom colors
    - Konstantinos Kanavouras
* Vastly improved support for changing tank and radar colors
    - Konstantinos Kanavouras
* Fix rendering of TK warning symbol - Joshua Bodine
* Remove third-party libraries from our source tree - Scott Wichser
* Fix search field losing focus while loading server list - Joshua Bodine
* Do not count observers when sorting the server list - Scott Wichser
* Randomize the order of servers with identical player counts - Scott Wichser
* Mouse grab/confine fixes - Joshua Bodine, Scott Wichser
* Improvements to flagStay and rabidRabbit plugin - Vladimir Jimenez
* Joystick hat fixes - Konstantinos Kanavouras
* Update shot stats live - Konstantinos Kanavouras
* Track shot stats for all flag types, even custom flags
    - Konstantinos Kanavouras
* Filter messages before MsgEnter - Jeff Myers
* Require a player have spawned to be added to rejoin wait list - Jeff Makey
* Validate the player ID in MsgPlayerUpdate and MsgPlayerUpdateShort
    - Scott Wichser
* Fix usage of privateMessage permission - Konstantinos Kanavouras
* Properly prevent multiple MsgEnter messages - Jeff Myers
* Refactor and extend the shot API - Jeff Myers
* Autokick on unknown packet type - Vladimir Jimenez
* Block whitespace-only message and kick for garbage characters - Scott Wichser
* Validate teleporter index in client and server - Scott Wichser
* Limit half-joined player connection duration - Scott Wichser
* Add various checks for invalid player actions - Jeff Makey
* Show coordinates of target tank instead of observer camera location
    - Jeff Makey
* Allow shot API event to cancel broadcasting shot to other clients - Jeff Myers
* Store a list of how many times each player was killed by other players and
    expose it to the API - Jeff Myers
* Allow plugins delay adding players to allow for remote data lookups
    - Jeff Myers
* Add API event triggered when authentication is complete - Jeff Myers
* Added bz_GetPlayerMottoData_V2 - Jeff Myers
* Relicense the SAMPLE_PLUGIN to BSD 2 clause license - Jeff Myers, Tim Riker
* Update joystick axis list when changing joystick device
    - Konstantinos Kanavouras
* List server communication now uses HTTPS - Scott Wichser
* Added bz_setPlayerSpawnAtBase and bz_getPlayerSpawnAtBase API functions
    - Vladimir Jimenez
* Added configure --enable-custom-plugins and --enable-custom-plugins-file
    options - Jeff Makey
* Introduce bz_AllowSpawnData_V2 - Vladimir Jimenez
* Added bz_setPlayerSpawnable and bz_isPlayerSpawnable API functions
    - Vladimir Jimenez
* Removed GLEW as a dependency - Joshua Bodine, Scott Wichser
* Made text at top of HUD use sans-serif font and removed serif font
    - Joshua Bodine
* Player scores are now factors in auto team assignment - Joshua Bodine
* New font rendering tool and new font textures up to 64pt - Joshua Bodine
* Added bz_getPlayerBySlotOrCallsign API function - Vladimir Jimenez
* Have custom permissions show in /showperms and /groupperms - Vladimir Jimenez
* Start adding unit tests with CppUTest - Scott Wichser
* CIDR ban support - Scott Wichser
* Radar size and panel size are now set individually  - Joshua Bodine
* Added bz_incrementTeamLosses and bz_incrementTeamWins API functions
    - Vladimir Jimenez
* Vertical sync support under SDL - Joshua Bodine, Jeff Makey
* SDL 2 support - Alfredo Tupone, Joshua Bodine
* Do not flash GAME OVER for observers - Jeff Makey
* Validate the teleporter indexes in MsgTeleport - Scott Wichser
* Correctly validate an offered admin password - Jeff Makey
* Added "showAdmin" permission - Vladimir Jimenez
* Added countdown pause/resume API events - Vladimir Jimenez
* Added bz_getCountdownRemaining API function - Vladimir Jimenez
* Added bz_getPausedTime API function - Vladimir Jimenez
* Added bz_isCountDownPaused API function - Vladimir Jimenez
* Added bz_getIdleTime API function - Vladimir Jimenez
* Added bz_getPlayerFlagID API function - Vladimir Jimenez
* Added bz_isAutoTeamEnabled API function - Vladimir Jimenez
* Added bz_cancelCountdown API function - Vladimir Jimenez
* Added bz_pollActive API function - Vladimir Jimenez
* Added bz_CustomZoneObject API class - Vladimir Jimenez
* Added CustomZoneSample plugin - Vladimir Jimenez
* Added permission for /listplugins - Vladimir Jimenez
* Allow API to overload built-in slash commands - Vladimir Jimenez
* Added "report" permission - Vladimir Jimenez
* Added bz_eGameResumeEvent and bz_eGamePauseEvent to the API
    - Vladimir Jimenez
* Don't allow muted players with ADMINMESSAGESEND to send PMs to hidden admins
    - Konstantinos Kanavouras, Vladimir Jimenez
* Add [Reverse Score] scoreboard sort option - Konstantinos Kanavouras
* Track number of self-kills on the scoreboard - Konstantinos Kanavouras
* Added menu option to pause chat window scrolling - Konstantinos Kanavouras
* Added "noteam" option for "/flag reset" command - Konstantinos Kanavouras
* Added option to bz_resetFlags to skip team flags - Konstantinos Kanavouras
* Implemented "/poll kill" command - Konstantinos Kanavouras
* Added "/countdown cancel" command - Konstantinos Kanavouras
* Added serverSidePlayerSample plugin - Jeff Myers
* Fix fancy radar tank when zoomed - Kyle Mills
* Added /handicap command - Frank Thilo
* Reverted to traditional handicap calculation - Frank Thilo
* Add bzfscron plugin to execute commands on time intervals
    - Daniel Remenak, Scott Wichser
* Server-side players can send slash commands - Scott Wichser
* Added server side shot tracking - Jeff Myers
* Added clientQuery permission - Konstantinos Kanavouras
* Added superUser plugin - Jeff Myers
* Added bz_getPlayerCount API function - Jeff Myers
* Added bz_incrementPlayerWins API function - Jeff Myers
* Added bz_incrementPlayerLosses API function - Jeff Myers
* Added bz_incrementPlayerTKs API function - Jeff Myers
* Make players respawn on bases after countdown ends - Lee Marshall
* Countdown now resets player scores as well as team scores - Lee Marshall
* Fully integrated Xcode project file - Joshua Bodine

5 files changed, 45 insertions, 52 deletions

diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index 174a6953472..9b20df7f7c3 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.66 2019/05/29 19:52:49 adam Exp $
+# $NetBSD: Makefile,v 1.67 2019/06/22 13:29:19 nia Exp $
 
-DISTNAME=	bzflag-2.4.2
-PKGREVISION=	19
+DISTNAME=	bzflag-2.4.18
 CATEGORIES=	games x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bzflag/}
+MASTER_SITES=	https://download.bzflag.org/bzflag/source/${PKGVERSION_NOREV}/
 
 MAINTAINER=	blymn@NetBSD.org
-HOMEPAGE=	http://bzflag.org/
+HOMEPAGE=	https://www.bzflag.org/
 COMMENT=	OpenGL tank game
 LICENSE=	gnu-lgpl-v2.1
 
 GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake perl
+USE_TOOLS+=	gmake perl pkg-config
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 FAKE_NCURSES=	yes	# They assume non ncurses is Solaris
@@ -27,17 +26,16 @@ SUBST_SED.fixme=	-e "s|@LINUX_TRUE@||g"
 SUBST_SED.fixme+=	-e "s|@LINUX_FALSE@|\#|g"
 .endif
 
-CONFIGURE_ARGS+=	--with-ncurses
-
 CHECK_PORTABILITY_SKIP+=	debian/*
 
-.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../net/libcares/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
diff --git a/games/bzflag/PLIST b/games/bzflag/PLIST
index 1d8f251b213..de436b80736 100644
--- a/games/bzflag/PLIST
+++ b/games/bzflag/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.11 2013/07/14 15:48:14 rodent Exp $
+@comment $NetBSD: PLIST,v 1.12 2019/06/22 13:29:19 nia Exp $
 bin/bzadmin
 bin/bzflag
 bin/bzfs
+lib/bzflag/CustomZoneSample.la
 lib/bzflag/HoldTheFlag.la
 lib/bzflag/Phoenix.la
 lib/bzflag/RogueGenocide.la
@@ -9,12 +10,13 @@ lib/bzflag/SAMPLE_PLUGIN.la
 lib/bzflag/TimeLimit.la
 lib/bzflag/airspawn.la
 lib/bzflag/autoFlagReset.la
+lib/bzflag/bzfscron.la
 lib/bzflag/chathistory.la
+lib/bzflag/customPollTypeSample.la
 lib/bzflag/customflagsample.la
 lib/bzflag/fairCTF.la
 lib/bzflag/fastmap.la
 lib/bzflag/flagStay.la
-lib/bzflag/hiddenAdmin.la
 lib/bzflag/keepaway.la
 lib/bzflag/killall.la
 lib/bzflag/koth.la
@@ -26,7 +28,9 @@ lib/bzflag/rabidRabbit.la
 lib/bzflag/recordmatch.la
 lib/bzflag/regFlag.la
 lib/bzflag/serverControl.la
+lib/bzflag/serverSidePlayerSample.la
 lib/bzflag/shockwaveDeath.la
+lib/bzflag/superUser.la
 lib/bzflag/teamflagreset.la
 lib/bzflag/thiefControl.la
 lib/bzflag/timedctf.la
@@ -76,8 +80,12 @@ share/bzflag/fonts/DejaVuSansCondensedBold_24.fmt
 share/bzflag/fonts/DejaVuSansCondensedBold_24.png
 share/bzflag/fonts/DejaVuSansCondensedBold_32.fmt
 share/bzflag/fonts/DejaVuSansCondensedBold_32.png
+share/bzflag/fonts/DejaVuSansCondensedBold_48.fmt
+share/bzflag/fonts/DejaVuSansCondensedBold_48.png
 share/bzflag/fonts/DejaVuSansCondensedBold_6.fmt
 share/bzflag/fonts/DejaVuSansCondensedBold_6.png
+share/bzflag/fonts/DejaVuSansCondensedBold_64.fmt
+share/bzflag/fonts/DejaVuSansCondensedBold_64.png
 share/bzflag/fonts/DejaVuSansCondensedBold_8.fmt
 share/bzflag/fonts/DejaVuSansCondensedBold_8.png
 share/bzflag/fonts/DejaVuSansMonoBold_12.fmt
@@ -86,22 +94,16 @@ share/bzflag/fonts/DejaVuSansMonoBold_16.fmt
 share/bzflag/fonts/DejaVuSansMonoBold_16.png
 share/bzflag/fonts/DejaVuSansMonoBold_24.fmt
 share/bzflag/fonts/DejaVuSansMonoBold_24.png
+share/bzflag/fonts/DejaVuSansMonoBold_32.fmt
+share/bzflag/fonts/DejaVuSansMonoBold_32.png
+share/bzflag/fonts/DejaVuSansMonoBold_48.fmt
+share/bzflag/fonts/DejaVuSansMonoBold_48.png
 share/bzflag/fonts/DejaVuSansMonoBold_6.fmt
 share/bzflag/fonts/DejaVuSansMonoBold_6.png
+share/bzflag/fonts/DejaVuSansMonoBold_64.fmt
+share/bzflag/fonts/DejaVuSansMonoBold_64.png
 share/bzflag/fonts/DejaVuSansMonoBold_8.fmt
 share/bzflag/fonts/DejaVuSansMonoBold_8.png
-share/bzflag/fonts/DejaVuSerifBold_12.fmt
-share/bzflag/fonts/DejaVuSerifBold_12.png
-share/bzflag/fonts/DejaVuSerifBold_16.fmt
-share/bzflag/fonts/DejaVuSerifBold_16.png
-share/bzflag/fonts/DejaVuSerifBold_24.fmt
-share/bzflag/fonts/DejaVuSerifBold_24.png
-share/bzflag/fonts/DejaVuSerifBold_32.fmt
-share/bzflag/fonts/DejaVuSerifBold_32.png
-share/bzflag/fonts/DejaVuSerifBold_6.fmt
-share/bzflag/fonts/DejaVuSerifBold_6.png
-share/bzflag/fonts/DejaVuSerifBold_8.fmt
-share/bzflag/fonts/DejaVuSerifBold_8.png
 share/bzflag/fonts/readme
 share/bzflag/frog.png
 share/bzflag/green_basetop.png
@@ -120,7 +122,6 @@ share/bzflag/hunter_tank.png
 share/bzflag/jump.wav
 share/bzflag/jumpjets.png
 share/bzflag/killteam.wav
-share/bzflag/l10n/ISO-639-2_values_8bits.txt
 share/bzflag/l10n/bzflag_cs_CZ.po
 share/bzflag/l10n/bzflag_da.po
 share/bzflag/l10n/bzflag_de.po
@@ -133,8 +134,8 @@ share/bzflag/l10n/bzflag_kg.po
 share/bzflag/l10n/bzflag_lt.po
 share/bzflag/l10n/bzflag_nl.po
 share/bzflag/l10n/bzflag_pt.po
+share/bzflag/l10n/bzflag_ru.po
 share/bzflag/l10n/bzflag_sv.po
-share/bzflag/l10n/bzflag_xx.po
 share/bzflag/land.wav
 share/bzflag/laser.wav
 share/bzflag/lock.wav
diff --git a/games/bzflag/distinfo b/games/bzflag/distinfo
index 3b06e8d89b8..259543d300b 100644
--- a/games/bzflag/distinfo
+++ b/games/bzflag/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2015/11/03 20:56:45 agc Exp $
+$NetBSD: distinfo,v 1.17 2019/06/22 13:29:19 nia Exp $
 
-SHA1 (bzflag-2.4.2.tar.gz) = d5926e58b89ec989aa8a11b75080908f18254bba
-RMD160 (bzflag-2.4.2.tar.gz) = b42a7f8554c3d73e25db39c27a9499cbc7350348
-SHA512 (bzflag-2.4.2.tar.gz) = 0cd6bcb262d7076838cbed4201afcf0f3b67938aa696077f548ac0bc58707fba256dfd385d2d57bfcc612725a9f740db5868d91e5f4b18c87a9c29b936f08051
-Size (bzflag-2.4.2.tar.gz) = 17423705 bytes
+SHA1 (bzflag-2.4.18.tar.gz) = f0bace06612000c64bc0a9a14bf8af569f2e33c7
+RMD160 (bzflag-2.4.18.tar.gz) = de5bd3982c13e14d31adcfa20ae7c158c50a4e41
+SHA512 (bzflag-2.4.18.tar.gz) = 61515b2a052ebf92e881608fe9f60879ca78e0fa2e65427f1388429f5678e50436eac421cf8a6a25a0d9b2467230c67749ca87751a8eee374843d37a0eea084e
+Size (bzflag-2.4.18.tar.gz) = 15003332 bytes
 SHA1 (patch-ad) = 626ff20e3b73f77734995732f34869550f590d5e
-SHA1 (patch-include_VotingArbiter.h) = 2d6348c5c7a834f29462d028f003866243959e56
+SHA1 (patch-src_bzadmin_curses__wrapper.h) = 3e978e7f699b91023c49a416e073fcc6ae732555
diff --git a/games/bzflag/patches/patch-include_VotingArbiter.h b/games/bzflag/patches/patch-include_VotingArbiter.h
deleted file mode 100644
index 8af47ad6f4a..00000000000
--- a/games/bzflag/patches/patch-include_VotingArbiter.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-include_VotingArbiter.h,v 1.1 2013/02/26 10:29:06 joerg Exp $
-
---- include/VotingArbiter.h.orig	2013-02-25 16:00:51.000000000 +0000
-+++ include/VotingArbiter.h
-@@ -231,11 +231,11 @@ public:
- };
- 
- 
--inline VotingArbiter::VotingArbiter(unsigned short int voteTime=60,
--				    unsigned short int vetoTime=20,
--				    unsigned short int votesRequired=2,
--				    float votePercentage=50.1,
--				    unsigned short int voteRepeatTime=300)
-+inline VotingArbiter::VotingArbiter(unsigned short int voteTime,
-+				    unsigned short int vetoTime,
-+				    unsigned short int votesRequired,
-+				    float votePercentage,
-+				    unsigned short int voteRepeatTime)
-   : _votingBooth(NULL),
-     _maxVotes(votesRequired+1),
-     _voteTime(voteTime),
diff --git a/games/bzflag/patches/patch-src_bzadmin_curses__wrapper.h b/games/bzflag/patches/patch-src_bzadmin_curses__wrapper.h
new file mode 100644
index 00000000000..69c569e5fc8
--- /dev/null
+++ b/games/bzflag/patches/patch-src_bzadmin_curses__wrapper.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_bzadmin_curses__wrapper.h,v 1.1 2019/06/22 13:29:19 nia Exp $
+
+Support NetBSD curses.
+
+--- src/bzadmin/curses_wrapper.h.orig	2018-10-18 10:39:15.000000000 +0000
++++ src/bzadmin/curses_wrapper.h
+@@ -28,7 +28,7 @@
+ 
+ // if we have ncurses.h, just include it
+ #ifdef HAVE_NCURSES_H
+-#include <ncurses.h>
++#include <curses.h>
+ #define COLOR_BGDEFAULT -1
+ #define COLOR_FGDEFAULT -1
+ #endif // ncurses