warzone2100: Update to 3.4.1

pkgsrc changes:
---------------
  * The project is now hosted on Github
  * Remove the patches: the fixes have been fixed upstream
  * The tool to generate documentation has been replaced from textproc/asciidoc
    to textproc/ruby-asciidoctor

upstream changes:
-----------------
2020-07-19: Version 3.4.1
 * General:
   * Fix: Zoom speed tied to game speed (commit:22a7855b4ca5262f75b48625ea1a2fd14e6e3d2d, #939)
   * Fix: Chatbox text drawn over tooltips (commit:605969d3196d56d7fbcc9057b776d168630a9634, #965)
   * Fix: End game stat bars having an off by one error (commit:ef02b1256619e15b0b08a7d8fbe36b4a60994204, #973)
   * Fix: Improve keymap default logic (commit:79518b0b19396c48ffc607183353dbe252578291, commit:8d764e53c31909f12d46ab8194d64be460988618, #977)
   * Fix: Chatbox related softlock (commit:a12b1a9cf305054317630664492dc8816acefada, #978)
   * Fix: Fix simple keybinds not firing when a meta key is held down (commit:92979bab768e0fba7666c944883885017e8ddcc8, #993)
   * Fix: Refund factory power better with queued templates (commit:43b48a7a8552615787a07ee808a9693e0f8bf7b7, #990)
   * Fix: Minimized/occluded window causing a huge spike in CPU activity on macOS due to vsync issue (commit:17fb3cc2db07cd063886ef6d180a5b8be65e7654, #1020)
   * Fix: Prevent softlock when opening reticule menus while keymap is open in multiplayer (commit:7a268d18fbff99ff09eb639db2b6cb940fa33dd7, #1030)
 * Campaign:
   * Change: Victory condition "eliminate bases" now triggers a last attack from the AI like the other conditions do (commit:215f6f255621138b745ef364052d2890282f41f0, #988)
   * Fix: Failing at the start of cam3-c if no trucks were present at the end of the cam3-1 mission (commit:46fe92bfecbed112af1bef5f0ade117039650ff7, #1021)
 * Multiplayer:
   * Fix: Changing flag color should not reset ready status (commit:cd1c0be79a6698d8db6e2110a8899239e08e9a91, #966)
   * Fix: Fix map preview sticking to kicked players (commit:a411fddbc629829c7010503e0c85ca274006b98d, #974)
   * Fix: Player stat "played" not representing actual completed games played (commit:ca27273228e8f04df5e5c7e1bde45950b3be1e8f, #1013)
   * Fix: Reload palette file after mod downloads (commit:4a8f98d4b5f9a72b0dd09b4241a7d60646d69505, #1015)
   * Remove: Prevent ability to change to smaller maps after hosting has started (commit:c56ad15e34ed1cdd52d885b1b3b6d751a2c1a1ff, #1027)
 * AI:
   * Change: Improvements to BoneCrusher! AI (commit:e02323c2665da6f6ce09f7417c47f00e71439498, commit:9902035e1d4600c246b553f52e526f8a126bb2f6, commit:38a44a163ad2af9d628f0a8875f5eb8594d3ad95, #1007)
 * Balance:
   * Change: Make Scourge available at start in T3 (commit:ab9a5f3d5b861c84023df8cc3bc19ca548b61557, #999)
 * Other:
   * Add: Account for Repair/Demolish construction queue mid-way stopping (commit:588c84c9a42f9de8e841322468b9574c0d4a7811, #989)
   * Add: macOS: Video sequences app bundle packaging (commit:880352481ad60c61b120a3f59893b3d8c2668eec, #1018)
   * Change: Set new map zoom rate limits (commit:5d212ce31693585cae5f0c68331d7eae7e7f6dfb, #939)
   * Change: Point revisions use the same app configuration / save directory (commit:22dab1a7069bc86acf5a1c161bd3f18252d29c56, #976)
   * Fix: Damage calculation must always return at least 1 thus fixing Nexus Link damage against tracked units (commit: 7b41dd69c63cbdc3c5ef53b89a3ea717e06ad9c8, #981)

2020-06-24: Version 3.4.0
 * General:
   * Add: Frontend "continue last save" option (commit:54536b3bb2f919de5250698ea00317c0b174c797, #408)
   * Add: Shortcut to quit to main-menu after victory (commit:9beabb55a7444c5cb02ab9992f22dd51ded7fe43, #518)
   * Add: T4 technology level where all research is completed and addon.lev change (commit:c0f8f1ddef9e38948a9fed5aa300f9a4b5698a1d, commit:e50fac0423492ca8180e42507fe0db6c51c9a282, commit:1cfb90a05efc7f7135d5b659b434a6381aee71a8, #396)
   * Add: Option to enforce structure limits on maps and disable most research related to limited structures (commit:ba06ee18c99b04f3cd46a81e2eed1a251f2d05f3, commit:55d627faf623ec07663701165ab4efe3d8044408, #409)
   * Add: Quicksave feature (commit: d130d5cf8f510dbcf6a3680d5ef436b18d761669, #464)
   * Add: Way to change most game settings with the in-game pause menu (commit:905cc6ff2f659d6118ce13285f2ddd341a17c6cf, commit:e821f2ed15765f0f0a7fe64df335f646bf61e93b, #469, #565)
   * Add: Autosave feature where the save rate is moddable in rules.js (commit:bff9eb56db0b0883156eb14bcd8add2327bc0f7a, #536)
   * Add: Favorite build items menu shown as a heart icon (commit:8241df0042cfaac75b2e1b192ffb8c31b220ec4e, #556)
   * Add: Right-click AI slot to quickly copy it to all other AI slots (commit:e7ff1e1d5fb956aeaa1dc721f3950dd0f2f4de2b, #551)
   * Add: Randomization of game options button in skirmish/multiplayer games (commit:f49ff2b8bbbf9b43bf80dbb2402507cf770cef89, #539)
   * Add: Randomization of map and positions. Not available when hosting games (commit:e821f2ed15765f0f0a7fe64df335f646bf61e93b, commit:c4fb21e2dfd02b48c353e0b2491d87728770569b, #568, #596)
   * Add: Allow pressing enter/return key when connecting to password protected games (commit:81a1a3790662ba3508b888d47929bf0011a6bc4b, #579)
   * Add: Add support for changing map, game name, and hosting player's name after already hosting (too many commits, #526)
   * Add: Support configuration of OpenAL-HRTF mode (commit:33c4d81795f8f98c103b2af81d4c1575f0f4abb4, #675)
   * Add: Support in-game notification popups (commit:0d9a0e6736ee830b29811bf27eacf79f693f8ab5, #679)
   * Add: keybindings for camera pan added (commit:6fb19e8a053a9a5de2138fe6afa6c1ea6d7e0c6f, #739)
   * Add: Discord rich presence / join support (commit:9c59dd3b15a7d14b4a11244daecaf9fa45d7aac7, #876)
   * Add: Unit / kill count gui feature (commit:ff8c56612a1e3afd597f88fb6cd2ae56142e5206, #943)
   * Change: Challenge layout updates (commit:93db639e1f83ea1819139bf6b85f70b1287a094e, #524)
   * Change: Pressing the key 'M' now shows the key mappings (commit:0bc1b68c862f85146b0693e9c29509ddf63fd5ad, #661)
   * Change: Sort saved games so that recent ones appear first (commit:2d35022fd58193fe6995c6df7806bf6d1a77bd55, #902)
   * Change: Simplify technology level selection (commit:e448c8a4f3b865957aab58d8718f6da1c2bf87eb, #949)
   * Fix: Not initializing the random number generators at application start (commit:925cb7ca4614930ad40d0932c6d957e7986090ac, #539)
   * Fix: Enemy hover units turning invisible when over certain depths of water tiles trying to be seen by other hover units (commit:8242c25a2436b817fdf0662bf295ac467ecde59f, #576)
   * Fix: Fast-play should not create net logs (commit:e2f3dc9e40247cf0065fb20fd080a00a0dbd9946, #599)
   * Fix: Production queue was broken after loading saves (commit:25f2970f5f73128df9ed0d87c0bdf032f7a10aaa, #664, ticket:2983)
   * Fix: Units dropping out of the sky when produced from factories (commit:6b869f9e02fa21cbc7f0f0902d5d7ee9f6d77d2b, #719)
   * Fix: Game falls into infinite loop when you load a damaged save (commit:10ca85b2ebfb86ab7dcbf14b16b461e8f3490312, #906)
   * Fix: Tile burning flag is not restored on load (commit:384c7228621c0f0b98910ffb767425e541d7123d, #912)
   * Fix: Trucks should stop mid-way if structure becomes finished (commit:312c7869f908f00484d6184221fa6ab0d37f1832, #914)
   * Fix: Moduled building demolishing power return (commit:91ce267100564a1d7ec0edb54294bd46a14d938e, #940)
   * Fix: "Cannot build. Resource burning" will pop up for each selected truck (commit:ee555f790f9e2363f71e1199aa99b3e2f072f145, #907)
 * Graphics:
   * Add: Allow shadows with these feature objects: artifact, boulder, and vehicle (commit:0e502341f099f78f2a0d81b158e0c0d225a54cdf, #635)
   * Add: Interpolate frames in animation (commit:b399fc362dcb202e341d7ddb73ea9e782b64e79a, #748)
   * Add: Occlude terrain ambiently (commit:ba0b8ce41712c146cab142c771fc796838ac0a96, #764)
   * Change: Replace little cyborg walking animation with super cyborg walking animation (commit:98582506106a76e6a1d11c0f874ea84c25f2a712, #819)
   * Change: Allow transparency for structure bases (commit:7a5a14c43ad83ba0eb0da56fe3301b9d921496df, #883)
   * Fix: Atmospheric effects should respect game time slowdown (commit:41c72f127d9b130c4fe9df901519728a7a1634d0, #913)
 * Campaign:
   * Add: Make campaign use dark unexplored tiles like before 3.1.1 (commit:15a032e9de9179f678dd3063151a040bd9e362c3, commit:5dd63b5fcd8dbffaea5087b5c89f88551b655937, #447, #529)
   * Change: Slow down factory production timers on Alpha 12 (commit:9fa9b8ca09e257cb96cc86a4ad937c3f8a1adfe7, #678)
   * Change: Increase Bunker-Buster ROF (commit:f0998eaad700fa88881e13d999d37c2261e14b63, #707)
   * Fix: Alpha 11 (cam1-7) failing to allow the player to win if getting the artifact too fast (commit:cd6d345eef01abf6343d7dc762ba6dfd4ee5ac05, #574)
   * Fix: Gamma missions 3, 4s (pre-away mission), and 5 did not game-over because of trucks stored at the end of the Gamma 2 scenario (commit:e0fb35b5a9ee445e5555482d58b37a97e95ce6c8, #588)
   * Fix: Prevent the ability to select the campaign transporter on Alpha 9, Beta 1, and Gamma 1 (commit:9e6e5bfd0b716f8f496710d5304cd15dd72a8ad8, commit:7e8c5deed1ae9351bf143a7bae6dab4ba6a5ea9e, #651)
 * Modding:
   * Add: Basic upgrade support for repair turrets (commit:3ae3006f67beb2addf9b7149becde6d2c132188d, #658)
 * Multiplayer:
   * Add: Remembers the last server in the IP-connect box (commit: feb25267030a0bf079a848f3cc232db8255087bf, #433)
   * Change: Consistent upgrade values for some research (commit:112122b92f0370b60a0e379ca4e93187540eff5b, #557)
   * Change: Scavengers no longer affect score (commit:f0cbddfcdd8dcf237c05c2b00cb624ac995da6bd, #666)
   * Change: Starting technology is mostly different on T2/T3 and based on time (commit:f7f33be120633e2382a505279390cd7f26b2702e, #720)
   * Fix: Melting map player 4 owning a player 0 derrick (commit:07c4fdc24cfe85c5649048a2247a8ccdec796dd3, #546)
   * Fix: resetReadyStatus() now actually resets ready status buttons as it implies when host changes settings (commit:ce1b60c3e9e5c17faa8f45d80fcc9fea2d5870eb, commit:31295dfcbbbb4aae3c67095980fc6ba2ae56f02f, #572)
   * Fix: Do not allow the exit-click for Map Preview go to the invisible widgets (commit:91194316acc451e3f1e4cbbaa38849a7d57aae17, #585)
   * Fix: Protect the status of map-mods when previewing maps so a warning about hosts altering the code doesn't happen, or, the red icon showing when it should not (commit:8d4a8c243e74b7ab8323fb0ceeba56147a53ee76, #586)
   * Fix: Fix saved template availability when loading skirmish saves without a HQ built or when immediately removing the HQ on (advanced) bases (commit:78f312d3ed33163639ee867837496cceeba2127b, commit:23497d673c9905e01d2d34f73755127fe8af21fc, #630)
   * Fix: Drum spawn logic should no longer show an error in some cases (commit:da3fc1f58c5d2da72e698375cc80f3f78650b834, #657, ticket:4419)
   * Fix: Beacons will now remove themselves properly when dropping another with a save already having one (commit:5286fb434f74536a7e690b7367730bb7bccda1be, #707)
 * Scripting:
   * Add: Prints some game settings on skirmish/multiplayer game start (commit:a087c51b467ebffe7cb0edaca14e8ebe9d4411e7, #615)
   * Change: Ignores repeated orders issued from scripts (commit:b2eb7f4ef4087b20c9dde1e4156e390e17485be6, #487)
   * Fix: eventGameLoaded only fires when loading saves, as it was intended (commit:6bcd12ccdf9f8a739348ed2406274a0351025720, #550)
   * Fix: Functions isStructureAvailable(), addDroid(), makeTemplate(), and buildDroid() no longer return false if they encounter redundant components/structures (commit:eee8025fc1f4484327a4bf5c2bfe0aa25169f74e, #590)
   * Fix: Script debugger impacting performance after closing it (commit:aaaf3ae796106a40cb005ace87de7369179fb766, #611)
   * Fix: LASSAT stattype could not be used with function enumStruct() (commit:442b0b00c76b3044dfc1e8340dda007c69f25d46, #613)
   * Remove: WzScript (commit:05d7814e4d15e5c46311ab91410a52546e83a49c, #512)
 * AI:
   * Add: BoneCrusher! AI (commit:60a369044b6d5f5e306a1969dbc81ac4782f1ceb, #532)
   * Add: Cobra AI (commit: 42adc8de34c018c3fc809bfddb59f288059c94d3, #513)
   * Add: Nexus AI ported from original (commit: 5aa27ef4cbcfd62cb97454b60580323663300ec1, #513)
   * Change: Rename SemperFi-JS to SemperFi (commit:ed9f4d0c59a7689d9d26c9eb3538a84b596aa973, #513)
   * Fix: Division by zero if one AI is available to choose from in the AI chooser menu (commit:020586f6bb15a97949f7a8986889862639ca7db1, #523)
   * Fix: AI communication channels were switched off after loading saves from a fresh application start (commit:5171d00e34814b53a85ca2131c83625695eccecb, #660)
   * Remove: Classic Nexus AI (commit:3fbe32bb8257c3cba27d8244769ebe8420b6936b, #511)
   * Remove: Classic SemperFi AI (commit:2612c2bce9470ac6c0a8e51f44b55382842e0226, #511)
 * Other:
   * Add: Autohost from JSON settings file similar to automated challenges (commit:aa1ba903c99ffe5dc41b2da6e57fcc072c7e592a, #502)
   * Add: Timestamp chat messages (commit:a68d5389c913d5a36d1c66b9135b383202c8b41f, #680)
   * Add: Fade effect when starting games (commit:b328ea78b271f931853cfe67500280fcbc061601, #751)
   * Add: Vary initial derrick animation frame (commit:b00e9f15de144b1e3c10814a282d6500f06ac765, #747)
   * Add: Vary initial radar dish rotation (commit:63b7a2c4f11c3bec2c532636284dba3165c0d69a, #741)
   * Add: Give half-tracks propulsion sound (commit:5614099a6cc7d40e5adf0328165b09d703f94438, #870, ticket:4181)
   * Change: Huge titleUI refactor (too many commits, #540)
   * Change: Display "global" or "ally" on chat messages for the sending player (commit: ea97d3202c0f342c5287fffb5bdd8724d9e4daca, commit:e065469b1e8f667222eb5548e685a159a8815403, #519)
   * Change: Behavior of "select similar units" improved (commit:bc5597071f7814c50f89c28895b4db61fdb1d9ab, #669)
   * Change: Deprecate autotools toolchain (commit:eca70df4a21492bd27b14b6e993d20bcbb375429, #695)
   * Change: Smoother mouse rotation (commit:7316d8103dc2390cd34ca95fdaf201a1d68f90d1, #734)
   * Change: Smoother zooming (commit:8a943d9470b8538599006fd5c067237e6595cc50, commit:3314483a92b9e595299df0ff76c45e3160242f55, #733, #751)
   * Change: Redo the drag box pulse effect (commit:524271d5f49c4811850019c319d4c3e86f56dc73, #749)
   * Change: Adjust height tracking logic (too many commits, #892)
   * Fix: Map zoom config limits are now higher to prevent the camera starting too far zoomed in (commit:098d2eb74640cf87f54736967102681a02330bea, #537)
   * Fix: Derricks now emit sound again (commit:e307e88e97ff05ef7a54139922b2247aa9763143, #543, ticket:4766)
   * Fix: Scanlines config option is no longer switched off if a video can not by played with scanlines (commit:4d4f955f35776d27f997ea90fe2d00125969c145, #581)
   * Fix: Display of debug menu items (commit:c91d6e7715a09c7e0474ed8e75dcc1396ac27582, #598)
   * Fix: Better crash log handling on Windows (commit:16b420cfbec50b1fcb9f552eb084c72c8f326e36, commit:d52958a62926a67d595fdd527b22040dd60f98a4, commit:2edb62ed9a457ed06a3a8ee0f107c3b3fe32f2a3, #619)
   * Fix: Enable HiDPI support on all platforms supported by SDL (commit:5e3387a1f5850fa3a60d3ac6c92722c01c484495, #627)
   * Fix: Fix negative score overflow in debug menu (commit:01275997ad7a76a91aa1d9d68a57729cadcee16e, #667)
   * Fix: Improve info message when losing a unit (commit:2264ed975f35b6ab5ab05fbf7321882cb947b9a7, #668)
   * Fix: Prevent duplicate projectile IDs (commit:0861c922d8891be1f1b878da617c8544810cd80d, #769)
   * Fix: Prevent some graphical responses from the reticule buttons when the game is paused (commit:234fe01a0f12c178689e2b3bfcf8f5e84c12bac8, #792)
   * Fix: Fix radar jump rotation bug (commit:2d5c88b7b61492c2edc117b27ddc7c255caaeb4a, #856)
   * Fix: Crash when upgrading structures without upgraded models available (commit:f4350b9becd0128b5a272dd8692897300e39a18b, #887)
   * Fix: Prevent the radar viewing window staying green when switching from Gamma to skirmish/multiplayer games (commit:35505527dd8d0571beb809f484f571544b76b372, #891)
   * Fix: Reset scroll direction / speed on new game start (commit:4626a62fbca70e50f093b5884ea8963b68f11251, commit:ff527f66fbb03738b2a73376f09b8600437fe657, #898)
   * Remove: Disable cursor swapping when moving the camera via keys (commit:284a168a90dba3b1aab288f8c661ecbe71157b65, #772)
 * Balance:
   * Change: Increase multiplayer Bunker-Buster weapon ROFs to hopefully increase their usefulness, according to mp community players (commit:58449ecb36f0283e9c31a68c6d35b0aafc31caff, #531, ticket:4861)
   * Fix: HMG bunker not being affected by upgrades due to sharing same name with another structure (commit:f27ae30a370266e1a09ce1d088b5906cbf7eaf90, #508)
 * Translations:
   * Change: Moved to Crowdin (commit:5b446f5c21e58941b5528ace991eac512085799e, #700)
 * Documentation:
   * Add: Alliance type ALLIANCES_UNSHARED now documented for script global variable 'allianceType' (commit:e030c3d0b2894343912a489167ecfd2a27b66495, #601)
   * Remove: Doxygen support (commit:540ce1948e055e9937383c052616a5e4dd5fb0c9, #316)

9 files changed, 29 insertions, 171 deletions

diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile
index 1a9a85fd2fb..b535b28aba6 100644
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.37 2020/06/02 08:23:56 adam Exp $
+# $NetBSD: Makefile,v 1.38 2020/07/20 20:21:26 triaxx Exp $
 
-DISTNAME=	warzone2100-3.3.0_src
-PKGNAME=	${DISTNAME:S/_src//}
-PKGREVISION=	4
+DISTNAME=	warzone2100_src
+PKGNAME=	warzone2100-3.4.1
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=warzone2100/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=Warzone2100/}
+GITHUB_RELEASE=	${PKGVERSION_NOREV}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -12,14 +12,14 @@ HOMEPAGE=	https://wz2100.net/
 COMMENT=	Real-time strategy and real-time tactics hybrid computer game
 LICENSE=	gnu-gpl-v2
 
-BUILD_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
-DEPENDS+=	dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
-
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config zip
 USE_TOOLS+=	msgfmt msgmerge xgettext
 
+.include "../../lang/ruby/rubyversion.mk"
+BUILD_DEPENDS+=	${RUBY_PKGPREFIX}-asciidoctor>=1.5.3:../../print/ruby-asciidoctor
+
 # Could NOT find Gettext: Found unsuitable version "0.16.1", but
 # required is at least "0.18"
 _TOOLS_USE_PKGSRC.msgfmt=	yes
@@ -29,7 +29,6 @@ _TOOLS_USE_PKGSRC.xgettext=	yes
 .include "../../games/warzone2100/options.mk"
 
 WRKSRC=		${WRKDIR}/warzone2100
-
 CONFIGURE_DIRS=	build
 CMAKE_ARG_PATH=	${WRKSRC}
 
@@ -41,25 +40,33 @@ LDFLAGS.DragonFly=	-lX11 -lintl
 BUILDLINK_TRANSFORM+=	rm:-Werror
 
 pre-configure:
-	${RUN} mkdir -p ${WRKSRC}/build
+	${RUN}${MKDIR} ${WRKSRC}/build
 
 .include "../../audio/openal-soft/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gettext+=		gettext>=0.18
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/physfs/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
+BUILDLINK_API_DEPENDS.harfbuzz+=	harfbuzz>=1.0
 .include "../../fonts/harfbuzz/buildlink3.mk"
+BUILDLINK_API_DEPENDS.freetype2+=	freetype2>=2.10.2
 .include "../../graphics/freetype2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glew+=		glew>=1.5.2
 .include "../../graphics/glew/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+BUILDLINK_API_DEPENDS.png+=		png>=1.2
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/quesoglc/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"
 .include "../../net/miniupnpc/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libsodium+=	libsodium>=1.0.13
+.include "../../security/libsodium/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtscript/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/warzone2100/PLIST b/games/warzone2100/PLIST
index 8b4840c13ee..2808f3b1195 100644
--- a/games/warzone2100/PLIST
+++ b/games/warzone2100/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2020/01/27 19:35:54 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.6 2020/07/20 20:21:26 triaxx Exp $
 bin/warzone2100
 man/man6/warzone2100.6
 share/applications/warzone2100.desktop
@@ -10,6 +10,7 @@ share/doc/warzone2100/ChangeLog
 share/doc/warzone2100/README.md
 share/doc/warzone2100/Scripting.md
 share/doc/warzone2100/ScriptingManual.htm
+share/doc/warzone2100/copyright
 share/doc/warzone2100/docbook-xsl.css
 share/doc/warzone2100/images/artillery-far-away.jpg
 share/doc/warzone2100/images/artillery-sensor.jpg
@@ -63,9 +64,6 @@ share/doc/warzone2100/js-globals.md
 share/doc/warzone2100/js-objects.md
 share/doc/warzone2100/quickstartguide.html
 share/doc/warzone2100/warzone2100.6.html
-share/fonts/DejaVu.LICENSE.txt
-share/fonts/DejaVuSans-Bold.ttf
-share/fonts/DejaVuSans.ttf
 share/icons/warzone2100.png
 share/locale/ca_ES/LC_MESSAGES/warzone2100.mo
 share/locale/cs/LC_MESSAGES/warzone2100.mo
@@ -102,6 +100,9 @@ share/locale/zh_CN/LC_MESSAGES/warzone2100.mo
 share/locale/zh_TW/LC_MESSAGES/warzone2100.mo
 share/metainfo/warzone2100.appdata.xml
 share/warzone2100/base.wz
+share/warzone2100/fonts/DejaVu.LICENSE.txt
+share/warzone2100/fonts/DejaVuSans-Bold.ttf
+share/warzone2100/fonts/DejaVuSans.ttf
 share/warzone2100/mp.wz
 share/warzone2100/music/menu.ogg
 share/warzone2100/music/music.wpl
diff --git a/games/warzone2100/distinfo b/games/warzone2100/distinfo
index eb067bcbe6a..740c650e340 100644
--- a/games/warzone2100/distinfo
+++ b/games/warzone2100/distinfo
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.11 2020/03/27 08:31:02 nia Exp $
+$NetBSD: distinfo,v 1.12 2020/07/20 20:21:26 triaxx Exp $
 
-SHA1 (warzone2100-3.3.0_src.tar.xz) = 781ee178a9e2cf5204a4cb8fc29a5226f64d8229
-RMD160 (warzone2100-3.3.0_src.tar.xz) = 28fa1a10af8df3f029ea8026cb76d59c883ffa1b
-SHA512 (warzone2100-3.3.0_src.tar.xz) = 876e36578472d9de4c00651af9b26a79bbbc85161d03c58e381aac90be710999b9091524425332e950ed42b79d872ace6848798829e7d3d7bb6ae7dae0003559
-Size (warzone2100-3.3.0_src.tar.xz) = 86605304 bytes
-SHA1 (patch-build__tools_autorevision) = eabdeddd5e920467f7f05a0dbf1b4689da444773
-SHA1 (patch-lib_exceptionhandler_exceptionhandler.cpp) = 4271efc90e2972ee196d6ced5ec254fe708c42f0
-SHA1 (patch-lib_framework_string__ext.h) = 93a0e2e4acf298be49d5853f9084df187240309b
-SHA1 (patch-lib_netplay_netplay.cpp) = 9152f24677a900e68e034c45154ad44e05a79bc1
-SHA1 (patch-lib_sdl_CMakeLists.txt) = 2034d69568dcb90784b9a26e920d632182dee794
+SHA1 (warzone2100_src.tar.xz) = 88707f7584d6008a8b7c3b15384faf906c39dbad
+RMD160 (warzone2100_src.tar.xz) = 6969e635b23ba8ed30f11f7d88679912d1147617
+SHA512 (warzone2100_src.tar.xz) = 26c026400e418ed3da94d96e7bb443c765ede3e0b347785ff8a9e687a5ad87afe03012c830fd509b927634484687efac951b2ef3417e7fe027ce0e684561ca84
+Size (warzone2100_src.tar.xz) = 89169752 bytes
diff --git a/games/warzone2100/options.mk b/games/warzone2100/options.mk
index f59d22c1f25..44b60d94c83 100644
--- a/games/warzone2100/options.mk
+++ b/games/warzone2100/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2020/03/27 08:07:27 nia Exp $
+# $NetBSD: options.mk,v 1.3 2020/07/20 20:21:26 triaxx Exp $
 #
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.warzone2100
@@ -7,12 +7,12 @@ PKG_OPTIONS_GROUP.backend=	sdl2 qt5
 PKG_SUGGESTED_OPTIONS=		sdl2
 
 .include "../../mk/bsd.options.mk"
-.include "../../mk/bsd.options.mk"
 
 ###
 ### Use SDL backend.
 ###
 .if !empty(PKG_OPTIONS:Msdl2)
+BUILDLINK_API_DEPENDS.SDL2+=	SDL2>=2.0.5
 .include "../../devel/SDL2/buildlink3.mk"
 .endif
 
diff --git a/games/warzone2100/patches/patch-build__tools_autorevision b/games/warzone2100/patches/patch-build__tools_autorevision
deleted file mode 100644
index cfec6f45ae0..00000000000
--- a/games/warzone2100/patches/patch-build__tools_autorevision
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-build__tools_autorevision,v 1.1 2020/01/27 19:35:54 triaxx Exp $
-
-Fix portability error with "==" operator in test.
-
---- build_tools/autorevision.orig	2019-08-31 18:17:21.000000000 +0000
-+++ build_tools/autorevision
-@@ -342,7 +342,7 @@ EOF
- if [ -f "${CACHEFILE}" ] && [ "${CACHEFORCE}" = "1" ]; then
- 	# When requested only read from the cache to populate our symbols.
- 	. "${CACHEFILE}"
--elif [ -n "${TRAVIS}" ] && [ "${TRAVIS}" == "true" ]; then
-+elif [ -n "${TRAVIS}" ] && [ "${TRAVIS}" = "true" ]; then
- 	# Autorevision is being executed from a Travis-CI build
- 	travisCIBuild
- elif [ ! -z "$(git rev-parse HEAD 2>/dev/null)" ]; then
diff --git a/games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler.cpp b/games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler.cpp
deleted file mode 100644
index 47d94dcdb75..00000000000
--- a/games/warzone2100/patches/patch-lib_exceptionhandler_exceptionhandler.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-$NetBSD: patch-lib_exceptionhandler_exceptionhandler.cpp,v 1.3 2020/01/27 19:35:54 triaxx Exp $
-
-Disable unsupported sigcodes for DragonFlyBSD.
-
---- lib/exceptionhandler/exceptionhandler.cpp.orig	2019-08-31 18:17:21.000000000 +0000
-+++ lib/exceptionhandler/exceptionhandler.cpp
-@@ -23,6 +23,7 @@
- #include "lib/framework/string_ext.h"
- #include "exceptionhandler.h"
- #include "dumpinfo.h"
-+#include <errno.h>
- 
- #if defined(WZ_OS_WIN)
- #include <tchar.h>
-@@ -122,18 +123,21 @@ static const char *wz_strsignal(int sign
- 	case SIGBUS:
- 		switch (sigcode)
- 		{
-+#if !defined(__DragonFly__)
- 		case BUS_ADRALN:
- 			return "SIGBUS: Access to an undefined portion of a memory object: Invalid address alignment";
- 		case BUS_ADRERR:
- 			return "SIGBUS: Access to an undefined portion of a memory object: Nonexistent physical address";
- 		case BUS_OBJERR:
- 			return "SIGBUS: Access to an undefined portion of a memory object: Object-specific hardware error";
-+#endif
- 		default:
- 			return "SIGBUS: Access to an undefined portion of a memory object";
- 		}
- 	case SIGFPE:
- 		switch (sigcode)
- 		{
-+#if !defined(__DragonFly__)
- 		case FPE_INTDIV:
- 			return "SIGFPE: Erroneous arithmetic operation: Integer divide by zero";
- 		case FPE_INTOVF:
-@@ -150,6 +154,7 @@ static const char *wz_strsignal(int sign
- 			return "SIGFPE: Erroneous arithmetic operation: Invalid floating-point operation";
- 		case FPE_FLTSUB:
- 			return "SIGFPE: Erroneous arithmetic operation: Subscript out of range";
-+#endif
- 		default:
- 			return "SIGFPE: Erroneous arithmetic operation";
- 		};
-@@ -158,6 +163,7 @@ static const char *wz_strsignal(int sign
- 	case SIGILL:
- 		switch (sigcode)
- 		{
-+#if !defined(__DragonFly__)
- 		case ILL_ILLOPC:
- 			return "SIGILL: Illegal instruction: Illegal opcode";
- 		case ILL_ILLOPN:
-@@ -174,6 +180,7 @@ static const char *wz_strsignal(int sign
- 			return "SIGILL: Illegal instruction: Coprocessor error";
- 		case ILL_BADSTK:
- 			return "SIGILL: Illegal instruction: Internal stack error";
-+#endif
- 		default:
- 			return "SIGILL: Illegal instruction";
- 		}
-@@ -188,10 +195,12 @@ static const char *wz_strsignal(int sign
- 	case SIGSEGV:
- 		switch (sigcode)
- 		{
-+#if !defined(__DragonFly__)
- 		case SEGV_MAPERR:
- 			return "SIGSEGV: Invalid memory reference: Address not mapped to object";
- 		case SEGV_ACCERR:
- 			return "SIGSEGV: Invalid memory reference: Invalid permissions for mapped object";
-+#endif
- 		default:
- 			return "SIGSEGV: Invalid memory reference";
- 		}
-@@ -209,10 +218,12 @@ static const char *wz_strsignal(int sign
- 	case SIGTRAP:
- 		switch (sigcode)
- 		{
-+#if !defined(__DragonFly__)
- 		case TRAP_BRKPT:
- 			return "SIGTRAP: Trace/breakpoint trap: Process breakpoint";
- 		case TRAP_TRACE:
- 			return "SIGTRAP: Trace/breakpoint trap: Process trace trap";
-+#endif
- 		default:
- 			return "SIGTRAP: Trace/breakpoint trap";
- 		}
diff --git a/games/warzone2100/patches/patch-lib_framework_string__ext.h b/games/warzone2100/patches/patch-lib_framework_string__ext.h
deleted file mode 100644
index 0b8b584de96..00000000000
--- a/games/warzone2100/patches/patch-lib_framework_string__ext.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-lib_framework_string__ext.h,v 1.1 2020/01/27 19:35:54 triaxx Exp $
-
-Add header for varargs.
-
---- lib/framework/string_ext.h.orig	2019-08-31 18:17:22.000000000 +0000
-+++ lib/framework/string_ext.h
-@@ -32,6 +32,7 @@
- 
- #include <string>
- #include <utility>
-+#include <stdarg.h>
- 
- /*!
-  * On MSVC, in order to squelch tons of 'memory leaks' we set the allocator
diff --git a/games/warzone2100/patches/patch-lib_netplay_netplay.cpp b/games/warzone2100/patches/patch-lib_netplay_netplay.cpp
deleted file mode 100644
index a0395ce2b5c..00000000000
--- a/games/warzone2100/patches/patch-lib_netplay_netplay.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-lib_netplay_netplay.cpp,v 1.2 2020/01/27 19:35:54 triaxx Exp $
-
---- lib/netplay/netplay.cpp.orig	2019-08-31 18:17:22.000000000 +0000
-+++ lib/netplay/netplay.cpp
-@@ -1801,7 +1801,7 @@ static void NETcheckPlayers()
- // We should not block here.
- bool NETrecvNet(NETQUEUE *queue, uint8_t *type)
- {
--	const int status = upnp_status; // hack fix for clang and c++11 - fixed in standard for c++14
-+	const int status = upnp_status.load(); // hack fix for clang and c++11 - fixed in standard for c++14
- 	switch (status)
- 	{
- 	case UPNP_ERROR_CONTROL_NOT_AVAILABLE:
diff --git a/games/warzone2100/patches/patch-lib_sdl_CMakeLists.txt b/games/warzone2100/patches/patch-lib_sdl_CMakeLists.txt
deleted file mode 100644
index 158705946c1..00000000000
--- a/games/warzone2100/patches/patch-lib_sdl_CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-lib_sdl_CMakeLists.txt,v 1.1 2020/03/27 08:31:02 nia Exp $
-
-Don't statically link SDL2.
-
---- lib/sdl/CMakeLists.txt.orig	2019-08-31 18:17:22.000000000 +0000
-+++ lib/sdl/CMakeLists.txt
-@@ -19,9 +19,7 @@ set(_sdl2_main_library)
- # - and is required to properly link with a static SDL2 library (at least on Windows and macOS)
- find_package(SDL2 ${SDL2_MIN_VERSION} CONFIG QUIET)
- if(SDL2_FOUND)
--	if (TARGET SDL2::SDL2-static)
--		set(_sdl2_library SDL2::SDL2-static)
--	elseif(TARGET SDL2::SDL2)
-+	if(TARGET SDL2::SDL2)
- 		set(_sdl2_library SDL2::SDL2)
- 	else()
- 		# Fall-back to FindSDL2 module (below)