armagetronad: 0.2.9.0.1

  Changes on the 0.2.9 branch

- Added detection and reaction code for timing assist bots
- /shuffle now works before you actually join a team
- Implemented /shout command and associated settings
- Fixed suspension and silenced status not being re-applied after a player
  disconnects and rejoins a server.
- Tweaks to enemy influence system.
- Ingame menu and console now are drawn on top of a semi-transparent,
  darkened area for increased readability.
- New first start menu with clearer language selection and initial setup.
- Tutorial match against one AI at slower speed.
- Tutorial tooltips for the most important keybindings.
- ADD_MASTER_SERVER command to announce a server to a new master server.
  Simplifies the process to list your server on a subculture.
- Team launch positions logged to ladderlog with POSITIONS event. Disabled by
  default.
- New command-line option "--input" added to poll for input from a file
  instead of stdin.
- Added WHITELIST_ENEMIES_[IP/USERNAME] to allow players to be enemies, even
  if they come from the same IP address and ALLOW_ENEMIES_SAME_IP is
  disabled (which is its default setting).
- GAME_END, NEW_MATCH, and NEW_ROUND ladderlog events include date and time.
- Added ENCODING ladderlog event, which specifies the encoding for data in
  ladderlog.txt.
- "--input" now can be used more than once to read from multiple files or pipes.
- new team management ladderlog messages:

       TEAM_CREATED <team name>
       TEAM_DESTROYED <team name>
       TEAM_RENAMED <old team name> <new team name>
       TEAM_PLAYER_ADDED <team name> <player>
       TEAM_PLAYER_REMOVED <team name> <player>

- Manage external scripts on Unix dedicated servers. New commands:
  SPAWN_SCRIPT, RESPAWN_SCRIPT, FORCE_RESPAWN_SCRIPT, KILL_SCRIPT,
  LIST_SCRIPTS, SCRIPT_ENV.
- New setting ACCESS_LEVEL_ANNOUNCE_LOGIN that determines if a player's
  login/logout message can be announced.
- Authentication is now enabled by default.

6 files changed, 44 insertions, 17 deletions

diff --git a/games/armagetronad-server/Makefile b/games/armagetronad-server/Makefile
index 6767dc628d2..024661d957a 100644
--- a/games/armagetronad-server/Makefile
+++ b/games/armagetronad-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2020/11/05 09:08:07 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2020/11/25 20:34:37 nia Exp $
 #
 
-PKGREVISION= 2
 .include "../../games/armagetronad/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/.src//:S/armagetronad/armagetronad-server/}
@@ -22,7 +21,10 @@ INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR}
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/examples
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/examples/cvs_test
 
-.for f in aiplayers.cfg default.cfg master.srv rc.config settings.cfg settings_authentication.cfg settings_dedicated.cfg settings_visual.cfg subcultures.srv
+.for f in aiplayers.cfg keys_cursor.cfg keys_cursor_single.cfg \
+    keys_twohand.cfg keys_wasd.cfg keys_x.cfg keys_zqsd.cfg default.cfg \
+    master.srv rc.config settings.cfg settings_authentication.cfg \
+    settings_dedicated.cfg settings_visual.cfg subcultures.srv
 CONF_FILES+=	${EGDIR}/armagetronad-dedicated/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
diff --git a/games/armagetronad-server/PLIST b/games/armagetronad-server/PLIST
index f3aad6a2153..d3cec5e310a 100644
--- a/games/armagetronad-server/PLIST
+++ b/games/armagetronad-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2016/07/24 15:44:49 kamil Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/11/25 20:34:37 nia Exp $
 bin/armagetronad-dedicated
 share/armagetronad-dedicated/desktop/armagetronad.desktop
 share/armagetronad-dedicated/desktop/icons/large/armagetronad.png
@@ -40,6 +40,9 @@ share/armagetronad-dedicated/scripts/rcd_startstop
 share/armagetronad-dedicated/scripts/relocate
 share/armagetronad-dedicated/scripts/serverstarter
 share/armagetronad-dedicated/scripts/sysinstall
+share/doc/armagetronad-dedicated/COPYING.txt
+share/doc/armagetronad-dedicated/Howto-Maps.txt
+share/doc/armagetronad-dedicated/commands.txt
 share/doc/armagetronad-dedicated/html/bugs.html
 share/doc/armagetronad-dedicated/html/changelog.html
 share/doc/armagetronad-dedicated/html/commands.html
@@ -71,6 +74,12 @@ share/examples/armagetronad-server/armagetronad-dedicated/examples/death_zone.cf
 share/examples/armagetronad-server/armagetronad-dedicated/examples/fortress_soccer.cfg
 share/examples/armagetronad-server/armagetronad-dedicated/examples/single_use_turbo.cfg
 share/examples/armagetronad-server/armagetronad-dedicated/examples/teamsumo.cfg
+share/examples/armagetronad-server/armagetronad-dedicated/keys_cursor.cfg
+share/examples/armagetronad-server/armagetronad-dedicated/keys_cursor_single.cfg
+share/examples/armagetronad-server/armagetronad-dedicated/keys_twohand.cfg
+share/examples/armagetronad-server/armagetronad-dedicated/keys_wasd.cfg
+share/examples/armagetronad-server/armagetronad-dedicated/keys_x.cfg
+share/examples/armagetronad-server/armagetronad-dedicated/keys_zqsd.cfg
 share/examples/armagetronad-server/armagetronad-dedicated/master.srv
 share/examples/armagetronad-server/armagetronad-dedicated/rc.config
 share/examples/armagetronad-server/armagetronad-dedicated/settings.cfg
diff --git a/games/armagetronad/Makefile b/games/armagetronad/Makefile
index a405f20ae9c..eaeb812edb5 100644
--- a/games/armagetronad/Makefile
+++ b/games/armagetronad/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2020/11/05 09:08:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2020/11/25 20:34:37 nia Exp $
 #
 
-PKGREVISION= 2
 .include "Makefile.common"
 
 PKGNAME=	${DISTNAME:S/.src//}
@@ -22,7 +21,10 @@ INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR}
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/examples
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/examples/cvs_test
 
-.for f in aiplayers.cfg default.cfg master.srv rc.config settings.cfg settings_authentication.cfg settings_dedicated.cfg settings_visual.cfg subcultures.srv
+.for f in aiplayers.cfg keys_cursor.cfg keys_cursor_single.cfg \
+    keys_twohand.cfg keys_wasd.cfg keys_x.cfg keys_zqsd.cfg default.cfg \
+    master.srv rc.config settings.cfg settings_authentication.cfg \
+    settings_dedicated.cfg settings_visual.cfg subcultures.srv
 CONF_FILES+=	${EGDIR}/armagetronad/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
diff --git a/games/armagetronad/Makefile.common b/games/armagetronad/Makefile.common
index 2976e2e3c04..b0322159311 100644
--- a/games/armagetronad/Makefile.common
+++ b/games/armagetronad/Makefile.common
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile.common,v 1.5 2020/02/26 14:56:28 nia Exp $
+# $NetBSD: Makefile.common,v 1.6 2020/11/25 20:34:37 nia Exp $
 #
 # used by games/armagetronad/Makefile
 # used by games/armagetronad-server/Makefile
 
-DISTNAME=	armagetronad-0.2.8.3.5.src
+DISTNAME=	armagetronad-0.2.9.0.1
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=armagetronad/}
+MASTER_SITES=	https://launchpad.net/armagetronad/0.2.9/${PKGVERSION_NOREV}/+download/
+EXTRACT_SUFX=	.tbz
 
 HOMEPAGE=	http://www.armagetronad.org/
 LICENSE=	gnu-gpl-v2
@@ -17,7 +18,7 @@ PATCHDIR=	${.CURDIR}/../../games/armagetronad/patches
 
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		bash gmake
+USE_TOOLS+=		bash gmake pkg-config
 REPLACE_PYTHON+=	language/update.py
 
 SUBST_CLASSES+=		bash
@@ -33,5 +34,7 @@ CONFIGURE_ARGS+=	--disable-useradd
 # This sanitizes paths
 CONFIGURE_ARGS+=	--disable-games
 
+CHECK_PORTABILITY_SKIP+=	docker/deploy/targets.sh.in
+
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/games/armagetronad/PLIST b/games/armagetronad/PLIST
index 2024cdaed8e..d8c817b6b67 100644
--- a/games/armagetronad/PLIST
+++ b/games/armagetronad/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2016/07/24 15:43:50 kamil Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/11/25 20:34:37 nia Exp $
 bin/armagetronad
 share/armagetronad/desktop/armagetronad.desktop
 share/armagetronad/desktop/icons/large/armagetronad.png
@@ -37,6 +37,8 @@ share/armagetronad/resource/included/Z-Man/fortress/zonetest-0.1.0.aamap.xml
 share/armagetronad/resource/included/map-0.1-exp.dtd
 share/armagetronad/resource/included/map-0.1.dtd
 share/armagetronad/resource/included/map-0.2.8_beta3.dtd
+share/armagetronad/scripts/rcd_config
+share/armagetronad/scripts/rcd_startstop
 share/armagetronad/scripts/relocate
 share/armagetronad/scripts/sysinstall
 share/armagetronad/sound/cyclrun.wav
@@ -56,6 +58,9 @@ share/armagetronad/textures/rim_wall.png
 share/armagetronad/textures/shadow.png
 share/armagetronad/textures/sky.png
 share/armagetronad/textures/title.jpg
+share/doc/armagetronad/COPYING.txt
+share/doc/armagetronad/Howto-Maps.txt
+share/doc/armagetronad/commands.txt
 share/doc/armagetronad/html/bugs.html
 share/doc/armagetronad/html/changelog.html
 share/doc/armagetronad/html/commands.html
@@ -87,6 +92,12 @@ share/examples/armagetronad/armagetronad/examples/death_zone.cfg
 share/examples/armagetronad/armagetronad/examples/fortress_soccer.cfg
 share/examples/armagetronad/armagetronad/examples/single_use_turbo.cfg
 share/examples/armagetronad/armagetronad/examples/teamsumo.cfg
+share/examples/armagetronad/armagetronad/keys_cursor.cfg
+share/examples/armagetronad/armagetronad/keys_cursor_single.cfg
+share/examples/armagetronad/armagetronad/keys_twohand.cfg
+share/examples/armagetronad/armagetronad/keys_wasd.cfg
+share/examples/armagetronad/armagetronad/keys_x.cfg
+share/examples/armagetronad/armagetronad/keys_zqsd.cfg
 share/examples/armagetronad/armagetronad/master.srv
 share/examples/armagetronad/armagetronad/rc.config
 share/examples/armagetronad/armagetronad/settings.cfg
diff --git a/games/armagetronad/distinfo b/games/armagetronad/distinfo
index 1dd29ab5122..cdd4c31f72c 100644
--- a/games/armagetronad/distinfo
+++ b/games/armagetronad/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2020/02/26 14:56:28 nia Exp $
+$NetBSD: distinfo,v 1.5 2020/11/25 20:34:37 nia Exp $
 
-SHA1 (armagetronad-0.2.8.3.5.src.tar.gz) = 42379be705000a54736491ab0efeac4e211a6589
-RMD160 (armagetronad-0.2.8.3.5.src.tar.gz) = 81be89090525e8f78bb42d5e3450459b69ab3d11
-SHA512 (armagetronad-0.2.8.3.5.src.tar.gz) = ee3c1be492e3f5e35e29bdefd39a3407272acc8f392030d011162af45834a617715435b32dae1a45f9889455847b629a23f6711eaf901a1f61da84bdf2dbd7e0
-Size (armagetronad-0.2.8.3.5.src.tar.gz) = 2096771 bytes
+SHA1 (armagetronad-0.2.9.0.1.tbz) = 84c0a3e03766871bb9a5c03af7d866f8274fcd26
+RMD160 (armagetronad-0.2.9.0.1.tbz) = 4a5e79d8f7cf0fb06952244120cc3734e73e92a1
+SHA512 (armagetronad-0.2.9.0.1.tbz) = d0bf8a973aafc6dd41f2dd41e29d34cebae1829d9e050948045c68a2a408595dda7cc94eb3169ed5c470770a01eb93744760a2b83146ab7813dc513bb5b26279
+Size (armagetronad-0.2.9.0.1.tbz) = 1907392 bytes