git: af93b629bde5 - 2026Q1 - games/armagetronad: Unbreak and update 0.2.8.3.5 => 0.2.9.2.5

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Mon, 23 Feb 2026 21:00:38 UTC
The branch 2026Q1 has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=af93b629bde5c7a39ea28c9aac36f82a8e7375a7

commit af93b629bde5c7a39ea28c9aac36f82a8e7375a7
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2026-02-23 20:54:52 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-02-23 21:00:30 +0000

    games/armagetronad: Unbreak and update 0.2.8.3.5 => 0.2.9.2.5
    
    Release Notes:
    https://download.armagetronad.org/blog/2020/07/29/build-stable-0.2.9.0/
    https://download.armagetronad.org/blog/2020/08/14/build-stable-0.2.9.0.1/
    https://download.armagetronad.org/blog/2020/11/30/build-stable-0.2.9.1.0/
    https://download.armagetronad.org/blog/2023/08/10/build-stable-0.2.9.1.1/
    https://download.armagetronad.org/blog/2024/03/17/build-stable-0.2.9.2.3/
    https://download.armagetronad.org/blog/2025/12/13/build-stable-0.2.9.2.4/
    https://download.armagetronad.org/blog/2025/12/14/build-stable-0.2.9.2.5/
    
    Reported by:    Xaero (via Discord)
    Approved by:    portmgr (blanket - fix port)
    MFH:            2026Q1
    Co-authored-by: Xaero
    
    (cherry picked from commit 80c3260cd94db39fc0b1b819e3de8473d1864bd2)
---
 games/armagetronad/Makefile                        | 24 ++++---------------
 games/armagetronad/distinfo                        |  6 ++---
 games/armagetronad/files/patch-Makefile.am         | 16 ++++++-------
 games/armagetronad/files/patch-batch_sysinstall.in | 14 +++++------
 .../files/patch-desktop_armagetronad.desktop.in    | 11 ---------
 games/armagetronad/pkg-plist                       | 28 ++++++++++++++++------
 6 files changed, 43 insertions(+), 56 deletions(-)

diff --git a/games/armagetronad/Makefile b/games/armagetronad/Makefile
index efed77813d73..cd250a823c9f 100644
--- a/games/armagetronad/Makefile
+++ b/games/armagetronad/Makefile
@@ -1,7 +1,5 @@
 PORTNAME=	armagetronad
-DISTVERSION=	0.2.8.3.5
-DISTVERSIONSUFFIX=	.src
-PORTREVISION=	4
+DISTVERSION=	0.2.9.2.5
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/stable/${DISTVERSION}/
 
@@ -12,37 +10,23 @@ WWW=		http://www.armagetronad.org/
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN=		Fails to build with libxml2 2.14, error: indirection requires pointer operand ('std::nullptr_t' invalid)
-
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libpng.so:graphics/png
 
-USES=		autoreconf desktop-file-utils gl gmake gnome jpeg sdl
+USES=		autoreconf desktop-file-utils gl gmake gnome pkgconfig sdl \
+		tar:tbz
 USE_CXXSTD=	c++14
 USE_GL=		gl glu
 USE_GNOME=	libxml2
 USE_SDL=	image mixer sdl
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-etc --disable-games --enable-music
-CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS}"
+CONFIGURE_ARGS=	--disable-etc --disable-games --disable-uninstall --enable-music
 
 BINARY_ALIAS=	sdl11-config=sdl-config
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
-
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
-post-install:
-	@${MV} ${STAGEDIR}${DATADIR}/desktop/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}/${PORTNAME}.desktop
-.for SZ in 16 32 48
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps
-.endfor
-	@${MV} ${STAGEDIR}${DATADIR}/desktop/icons/small/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/${PORTNAME}.png
-	@${MV} ${STAGEDIR}${DATADIR}/desktop/icons/medium/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/${PORTNAME}.png
-	@${MV} ${STAGEDIR}${DATADIR}/desktop/icons/large/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png
-	@${RM} -r ${STAGEDIR}${DATADIR}/desktop
-
 .include <bsd.port.mk>
diff --git a/games/armagetronad/distinfo b/games/armagetronad/distinfo
index 199035aba976..8a00678f9bc7 100644
--- a/games/armagetronad/distinfo
+++ b/games/armagetronad/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1582191189
-SHA256 (armagetronad-0.2.8.3.5.src.tar.gz) = b4c993558c08806c40e3c7095437451ffe9bc3d3f8c0310e58c50a81153446fc
-SIZE (armagetronad-0.2.8.3.5.src.tar.gz) = 2096771
+TIMESTAMP = 1771818181
+SHA256 (armagetronad-0.2.9.2.5.tbz) = 941d9f194340b84b1dd36d0f58c089660a15814ce37ca3813b90105dbedc5619
+SIZE (armagetronad-0.2.9.2.5.tbz) = 1867467
diff --git a/games/armagetronad/files/patch-Makefile.am b/games/armagetronad/files/patch-Makefile.am
index 2aa51e4446ad..e23b1de406dd 100644
--- a/games/armagetronad/files/patch-Makefile.am
+++ b/games/armagetronad/files/patch-Makefile.am
@@ -1,20 +1,20 @@
---- Makefile.am.orig	2019-07-23 16:38:02 UTC
+--- Makefile.am.orig	2025-05-16 19:09:00 UTC
 +++ Makefile.am
-@@ -23,7 +23,7 @@ SUBDIRS = src resource batch config desktop
+@@ -23,7 +23,7 @@ if BUILDMASTER
  
  # special tasks to do if we're building the master server
  if BUILDMASTER
--masterInstallTasks=	cd  $(DESTDIR)$(bindir); mv armagetronad_main_master$(EXEEXT) @prognamebase@-master$(executable_suffix)
-+masterInstallTasks=	cd  $(DESTDIR)$(bindir); mv -f armagetronad_main_master$(EXEEXT) @prognamebase@-master$(executable_suffix)
- masterUninstallTasks=rm -f $(DESTDIR)$(bindir)/@prognamebase@-master$(executable_suffix)
+-masterInstallTasks=	cd "$(DESTDIR)$(bindir)"; mv armagetronad_main_master$(EXEEXT) @prognamebase@-master$(executable_suffix)
++masterInstallTasks=	cd "$(DESTDIR)$(bindir)"; mv -f armagetronad_main_master$(EXEEXT) @prognamebase@-master$(executable_suffix)
+ masterUninstallTasks=rm -f "$(DESTDIR)$(bindir)"/@prognamebase@-master$(executable_suffix)
  else
  masterInstallTasks=echo 'No tasks for the master server'
-@@ -107,7 +107,7 @@ endif
+@@ -106,7 +106,7 @@ if BUILDMAIN
  install-exec-hook: install-uninstall
  #	rename executable to armagetronad-VERSION and link to armagetronad
  if BUILDMAIN
--	cd  $(DESTDIR)${bindir}; mv armagetronad_main$(EXEEXT) @progname@$(executable_suffix)
-+	cd  $(DESTDIR)${bindir}; mv -f armagetronad_main$(EXEEXT) @progname@$(executable_suffix)
+-	cd  "$(DESTDIR)${bindir}"; mv armagetronad_main$(EXEEXT) @progname@$(executable_suffix)
++	cd  "$(DESTDIR)${bindir}"; mv -f armagetronad_main$(EXEEXT) @progname@$(executable_suffix)
  endif
  
  #	delegate to special tasks
diff --git a/games/armagetronad/files/patch-batch_sysinstall.in b/games/armagetronad/files/patch-batch_sysinstall.in
index adbca77707a3..b56b537d7ed1 100644
--- a/games/armagetronad/files/patch-batch_sysinstall.in
+++ b/games/armagetronad/files/patch-batch_sysinstall.in
@@ -1,11 +1,11 @@
 --- batch/sysinstall.in.orig	2011-09-11 10:41:39 UTC
 +++ batch/sysinstall.in
-@@ -205,7 +205,7 @@ if test $MODE = install; then
-     for script in $DESTDIR$SCRIPTDIR/* $DESTDIR$CONFIGDIR/rc.config; do
-         if test $script != $DESTDIR$SCRIPTDIR/sysinstall; then
-             sed -e ${sedcommands} < $script > $script.trans || exit 1
--            mv $script.trans $script
-+            mv -f $script.trans $script
-             chmod 755 $script
+@@ -235,7 +235,7 @@ if test $MODE = install; then
+     for script in "$DESTDIR$SCRIPTDIR"/* "$DESTDIR$CONFIGDIR"/rc.config; do
+         if test "$script" != "$DESTDIR$SCRIPTDIR"/sysinstall; then
+             sed -e ${sedcommands} < "$script" > "$script.trans" || exit 1
+-            mv "$script.trans" "$script"
++            mv -f "$script.trans" "$script"
+             chmod 755 "$script"
          fi
      done
diff --git a/games/armagetronad/files/patch-desktop_armagetronad.desktop.in b/games/armagetronad/files/patch-desktop_armagetronad.desktop.in
deleted file mode 100644
index 6895b237c92a..000000000000
--- a/games/armagetronad/files/patch-desktop_armagetronad.desktop.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- desktop/armagetronad.desktop.in.orig	2019-07-23 16:43:09 UTC
-+++ desktop/armagetronad.desktop.in
-@@ -3,7 +3,7 @@ Type=Application
- Name=@progtitle@@progtitle_server@
- Exec=@progname@
- Comment=3d light cycle game
--Icon=@progname@.png
-+Icon=@progname@
- Terminal=@build_dedicated@
- Path=@prefix@/bin
- Categories=Game;ActionGame;
diff --git a/games/armagetronad/pkg-plist b/games/armagetronad/pkg-plist
index d1d12a1a270a..36a056a51e00 100644
--- a/games/armagetronad/pkg-plist
+++ b/games/armagetronad/pkg-plist
@@ -1,4 +1,5 @@
 bin/armagetronad
+bin/armagetronad-master
 %%ETCDIR%%/aiplayers.cfg
 %%ETCDIR%%/default.cfg
 %%ETCDIR%%/examples/breakfast_in_hell.cfg
@@ -11,6 +12,12 @@ bin/armagetronad
 %%ETCDIR%%/examples/fortress_soccer.cfg
 %%ETCDIR%%/examples/single_use_turbo.cfg
 %%ETCDIR%%/examples/teamsumo.cfg
+%%ETCDIR%%/keys_cursor.cfg
+%%ETCDIR%%/keys_cursor_single.cfg
+%%ETCDIR%%/keys_twohand.cfg
+%%ETCDIR%%/keys_wasd.cfg
+%%ETCDIR%%/keys_x.cfg
+%%ETCDIR%%/keys_zqsd.cfg
 %%ETCDIR%%/master.srv
 %%ETCDIR%%/rc.config
 %%ETCDIR%%/settings.cfg
@@ -18,7 +25,13 @@ bin/armagetronad
 %%ETCDIR%%/settings_dedicated.cfg
 %%ETCDIR%%/settings_visual.cfg
 %%ETCDIR%%/subcultures.srv
-share/applications/armagetronad.desktop
+share/appdata/org.armagetronad.armagetronad.appdata.xml
+share/applications/org.armagetronad.armagetronad.desktop
+%%DATADIR%%/desktop/icons/128x128/armagetronad.png
+%%DATADIR%%/desktop/icons/16x16/armagetronad.png
+%%DATADIR%%/desktop/icons/32x32/armagetronad.png
+%%DATADIR%%/desktop/icons/48x48/armagetronad.png
+%%DATADIR%%/desktop/icons/64x64/armagetronad.png
 %%DATADIR%%/language/american.txt
 %%DATADIR%%/language/british.txt
 %%DATADIR%%/language/deutsch.txt
@@ -26,11 +39,9 @@ share/applications/armagetronad.desktop
 %%DATADIR%%/language/english_base_notranslate.txt
 %%DATADIR%%/language/french.txt
 %%DATADIR%%/language/languages.txt
-%%DATADIR%%/language/languages.txt.in
 %%DATADIR%%/language/polish.txt
 %%DATADIR%%/language/polish_transliterated.txt
 %%DATADIR%%/language/spanish.txt
-%%DATADIR%%/language/update.py
 %%DATADIR%%/models/cycle_body.mod
 %%DATADIR%%/models/cycle_front.mod
 %%DATADIR%%/models/cycle_rear.mod
@@ -52,11 +63,12 @@ share/applications/armagetronad.desktop
 %%DATADIR%%/resource/included/map-0.1-exp.dtd
 %%DATADIR%%/resource/included/map-0.1.dtd
 %%DATADIR%%/resource/included/map-0.2.8_beta3.dtd
+%%DATADIR%%/scripts/rcd_config
+%%DATADIR%%/scripts/rcd_startstop
 %%DATADIR%%/scripts/relocate
 %%DATADIR%%/scripts/sysinstall
 %%DATADIR%%/sound/cyclrun.wav
 %%DATADIR%%/sound/expl.wav
-%%DATADIR%%/textures/KGN_logo.png
 %%DATADIR%%/textures/cycle_body.png
 %%DATADIR%%/textures/cycle_wheel.png
 %%DATADIR%%/textures/dir_wall.png
@@ -71,6 +83,8 @@ share/applications/armagetronad.desktop
 %%DATADIR%%/textures/shadow.png
 %%DATADIR%%/textures/sky.png
 %%DATADIR%%/textures/title.jpg
-share/icons/hicolor/16x16/apps/armagetronad.png
-share/icons/hicolor/32x32/apps/armagetronad.png
-share/icons/hicolor/48x48/apps/armagetronad.png
+share/icons/hicolor/128x128/apps/org.armagetronad.armagetronad.png
+share/icons/hicolor/16x16/apps/org.armagetronad.armagetronad.png
+share/icons/hicolor/32x32/apps/org.armagetronad.armagetronad.png
+share/icons/hicolor/48x48/apps/org.armagetronad.armagetronad.png
+share/icons/hicolor/64x64/apps/org.armagetronad.armagetronad.png