git: 0744029e0efc - main - games/freeciv: update to 3.2.0 release (+)

From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Mon, 21 Jul 2025 13:48:25 UTC
The branch main has been updated by fluffy:

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

commit 0744029e0efc953fa3cfd0511919eb62b9c1972a
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2025-07-21 13:44:48 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2025-07-21 13:44:48 +0000

    games/freeciv: update to 3.2.0 release (+)
    
    GTK3:   gtk3-client has been discontinued. gtk3.22-client still exist
    GTK4:   not anymore require and implies GTK3 and preffered over GTK3
    QT6:    option was adjusted to me more clear
    
    Changelog:              https://freeciv.fandom.com/wiki/NEWS-3.2.0
---
 games/freeciv/Makefile  |  23 ++++----
 games/freeciv/distinfo  |   6 +--
 games/freeciv/pkg-plist | 136 ++++++++++++++++++++++++------------------------
 3 files changed, 80 insertions(+), 85 deletions(-)

diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index f6319a2e15c9..fbe53c15890b 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	freeciv
-PORTVERSION=	3.1.5
+PORTVERSION=	3.2.0
 PORTREVISION?=	0
 CATEGORIES=	games
 MASTER_SITES=	SF/freeciv/Freeciv%20${PORTVERSION:R}/${PORTVERSION} \
@@ -47,24 +47,21 @@ LDFLAGS+=	-Wl,--as-needed ${ICONV_LIB}
 PORTDATA=	*
 
 OPTIONS_DEFINE=		DOCS IPV6  NLS
-OPTIONS_DEFAULT=	QT SQLITE3
+OPTIONS_DEFAULT=	QT6 SQLITE3
 OPTIONS_MULTI=		DB UI
 OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE3
-OPTIONS_MULTI_UI=	GTK3 GTK4 QT SDL
+OPTIONS_MULTI_UI=	GTK3 GTK4 QT6 SDL
 OPTIONS_SUB=		yes
 
 DB_DESC=	Database support
 UI_DESC=	GUI clients
-QT_DESC=	QT GUI clients
 
 GTK3_USES=	gnome sdl
 GTK3_USE=	GNOME=cairo,gdkpixbuf,glib20,gtk30,pango \
 		SDL=mixer2
-GTK3_VARS=	_FREECIV_CLIENT+=gtk3 \
-		_FREECIV_CLIENT+=gtk3.22 \
+GTK3_VARS=	_FREECIV_CLIENT+=gtk3.22 \
 		_FREECIV_MP+=gtk3
 
-GTK4_IMPLIES=	GTK3
 GTK4_USES=	gnome sdl
 GTK4_USE=	GNOME=cairo,gdkpixbuf,glib20,gtk40,pango \
 		SDL=mixer2
@@ -84,15 +81,15 @@ PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-postgres-prefix=${LOCALBASE}
 PGSQL_VARS=		_FREECIV_DB+=postgres
 
-QT_USES=		qt:6 sdl
-QT_USE=			QT=base,tools:build \
+QT6_USES=		qt:6 sdl
+QT6_USE=		QT=base,tools:build \
 			SDL=mixer2
-QT_CONFIGURE_ON=	--with-qt6=yes \
+QT6_CONFIGURE_ON=	--with-qt6=yes \
 			--with-qt6-includes=${LOCALBASE}/${QT_INCDIR_REL} \
 			--with-qt6-libs=${LOCALBASE}/${QT_LIBDIR_REL}
-QT_CONFIGURE_ENV=	MOCCMD=${MOC}
-QT_CONFIGURE_ENABLE=	ruledit
-QT_VARS=		_FREECIV_CLIENT+=qt \
+QT6_CONFIGURE_ENV=	MOCCMD=${MOC}
+QT6_CONFIGURE_ENABLE=	ruledit
+QT6_VARS=		_FREECIV_CLIENT+=qt \
 			_FREECIV_MP+=qt
 
 SDL_USES=	sdl
diff --git a/games/freeciv/distinfo b/games/freeciv/distinfo
index 6cb803f16ac7..8cbee6d4edd8 100644
--- a/games/freeciv/distinfo
+++ b/games/freeciv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1747411889
-SHA256 (freeciv-3.1.5.tar.xz) = 0d9f687ff950a77a9fa0af66108a7f67da717fd40c3a0ca4c0a4f4a3f0214b33
-SIZE (freeciv-3.1.5.tar.xz) = 46870140
+TIMESTAMP = 1753102926
+SHA256 (freeciv-3.2.0.tar.xz) = 828e831b672a46b316f6fdb23e670230b2ec9c05b6fe8c66fc9f7e1c0679fcde
+SIZE (freeciv-3.2.0.tar.xz) = 58150968
diff --git a/games/freeciv/pkg-plist b/games/freeciv/pkg-plist
index 7357e7ad349e..5de335a53263 100644
--- a/games/freeciv/pkg-plist
+++ b/games/freeciv/pkg-plist
@@ -1,14 +1,13 @@
 %%CLIENT%%bin/freeciv-manual
-%%GTK3%%bin/freeciv-gtk3
 %%GTK3%%bin/freeciv-gtk3.22
 %%GTK4%%bin/freeciv-gtk4
 bin/freeciv-mp-cli
 %%GTK3%%bin/freeciv-mp-gtk3
 %%GTK4%%bin/freeciv-mp-gtk4
-%%QT%%bin/freeciv-mp-qt
-%%QT%%bin/freeciv-qt
-%%QT%%bin/freeciv-ruledit
-%%QT%%bin/freeciv-ruleup
+%%QT6%%bin/freeciv-mp-qt
+%%QT6%%bin/freeciv-qt
+%%QT6%%bin/freeciv-ruledit
+%%QT6%%bin/freeciv-ruleup
 %%SDL%%bin/freeciv-sdl2
 bin/freeciv-server
 %%ETCDIR%%/database.lua
@@ -18,14 +17,13 @@ lib/libfreeciv-srv.so.0.0.0
 lib/libfreeciv.so
 lib/libfreeciv.so.0
 lib/libfreeciv.so.0.0.0
-%%GTK3%%share/applications/org.freeciv.gtk3.desktop
 %%GTK3%%share/applications/org.freeciv.gtk322.desktop
 %%GTK3%%share/applications/org.freeciv.gtk3.mp.desktop
 %%GTK4%%share/applications/org.freeciv.gtk4.desktop
 %%GTK4%%share/applications/org.freeciv.gtk4.mp.desktop
-%%QT%%share/applications/org.freeciv.qt.desktop
-%%QT%%share/applications/org.freeciv.qt.mp.desktop
-%%QT%%share/applications/org.freeciv.ruledit.desktop
+%%QT6%%share/applications/org.freeciv.qt.desktop
+%%QT6%%share/applications/org.freeciv.qt.mp.desktop
+%%QT6%%share/applications/org.freeciv.ruledit.desktop
 %%SDL%%share/applications/org.freeciv.sdl2.desktop
 share/applications/org.freeciv.server.desktop
 %%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
@@ -42,7 +40,7 @@ share/applications/org.freeciv.server.desktop
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.Cygwin
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.meson
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS-3.1
+%%PORTDOCS%%%%DOCSDIR%%/NEWS-3.2
 %%PORTDOCS%%%%DOCSDIR%%/README.AI
 %%PORTDOCS%%%%DOCSDIR%%/README.AI_modules
 %%PORTDOCS%%%%DOCSDIR%%/README.achievements
@@ -68,169 +66,169 @@ share/applications/org.freeciv.server.desktop
 %%PORTDOCS%%%%DOCSDIR%%/doxygen.md
 %%CLIENT%%share/icons/hicolor/128x128/apps/freeciv-client.png
 %%CLIENT%%share/icons/hicolor/128x128/apps/freeciv-modpack.png
-%%QT%%share/icons/hicolor/128x128/apps/freeciv-ruledit.png
+%%QT6%%share/icons/hicolor/128x128/apps/freeciv-ruledit.png
 share/icons/hicolor/128x128/apps/freeciv-server.png
 %%CLIENT%%share/icons/hicolor/16x16/apps/freeciv-client.png
 %%CLIENT%%share/icons/hicolor/16x16/apps/freeciv-modpack.png
-%%QT%%share/icons/hicolor/16x16/apps/freeciv-ruledit.png
+%%QT6%%share/icons/hicolor/16x16/apps/freeciv-ruledit.png
 share/icons/hicolor/16x16/apps/freeciv-server.png
 %%CLIENT%%share/icons/hicolor/32x32/apps/freeciv-client.png
 %%CLIENT%%share/icons/hicolor/32x32/apps/freeciv-modpack.png
-%%QT%%share/icons/hicolor/32x32/apps/freeciv-ruledit.png
+%%QT6%%share/icons/hicolor/32x32/apps/freeciv-ruledit.png
 share/icons/hicolor/32x32/apps/freeciv-server.png
 %%CLIENT%%share/icons/hicolor/48x48/apps/freeciv-client.png
 %%CLIENT%%share/icons/hicolor/48x48/apps/freeciv-modpack.png
-%%QT%%share/icons/hicolor/48x48/apps/freeciv-ruledit.png
+%%QT6%%share/icons/hicolor/48x48/apps/freeciv-ruledit.png
 share/icons/hicolor/48x48/apps/freeciv-server.png
 %%CLIENT%%share/icons/hicolor/64x64/apps/freeciv-client.png
 %%CLIENT%%share/icons/hicolor/64x64/apps/freeciv-modpack.png
-%%QT%%share/icons/hicolor/64x64/apps/freeciv-ruledit.png
+%%QT6%%share/icons/hicolor/64x64/apps/freeciv-ruledit.png
 share/icons/hicolor/64x64/apps/freeciv-server.png
 %%NLS%%share/locale/ar/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/ar/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/ar/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/bg/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/bg/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/ca/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/ca/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/cs/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/cs/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/da/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/da/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/da/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/da/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/de/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/de/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/de/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/de/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/el/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/el/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/el/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/el/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/en_GB/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/en_GB/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/eo/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/eo/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/es/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/es/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/es/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/es/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/es_419/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/es_419/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/es_419/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/es_419/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/et/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/et/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/et/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/et/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/fa/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/fa/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/fa/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/fa/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/fi/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/fi/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/fr/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/fr/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/ga/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/ga/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/gd/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/gd/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/gd/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/gd/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/gl_ES/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/gl_ES/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/gl_ES/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/gl_ES/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/he/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/he/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/he/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/he/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/hu/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/hu/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/id/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/id/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/id/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/id/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/it/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/it/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/it/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/it/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/ja/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/ja/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/ko/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/ko/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/lt/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/lt/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/nb/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/nb/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/nl/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/nl/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/pl/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/pl/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/pt/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/pt/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/pt_BR/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/pt_BR/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/ro/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/ro/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/ru/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/ru/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/sk/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/sk/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/sr/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/sr/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/sv/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/sv/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/tr/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/tr/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/uk/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/uk/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/zh_CN/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/zh_CN/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/freeciv-nations.mo
-%%QT%%%%NLS%%share/locale/zh_TW/LC_MESSAGES/freeciv-ruledit.mo
+%%QT6%%%%NLS%%share/locale/zh_TW/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/freeciv-core.mo
-%%GTK3%%share/metainfo/org.freeciv.gtk3.metainfo.xml
-%%GTK3%%share/metainfo/org.freeciv.gtk322.metainfo.xml
-%%GTK3%%share/metainfo/org.freeciv.gtk3.mp.metainfo.xml
-%%GTK4%%share/metainfo/org.freeciv.gtk4.metainfo.xml
-%%GTK4%%share/metainfo/org.freeciv.gtk4.mp.metainfo.xml
-%%QT%%share/metainfo/org.freeciv.qt.metainfo.xml
-%%QT%%share/metainfo/org.freeciv.qt.mp.metainfo.xml
-%%QT%%share/metainfo/org.freeciv.ruledit.metainfo.xml
-%%SDL%%share/metainfo/org.freeciv.sdl2.metainfo.xml
 share/metainfo/org.freeciv.server.metainfo.xml
 share/man/man6/freeciv.6.gz
 %%CLIENT%%share/man/man6/freeciv-client.6.gz
 @comment share/man/man6/freeciv-gtk3.22.6.gz
-%%GTK3%%share/man/man6/freeciv-gtk3.6.gz
+%%GTK3%%share/man/man6/freeciv-gtk3.22.6.gz
 %%GTK4%%share/man/man6/freeciv-gtk4.6.gz
 share/man/man6/freeciv-manual.6.gz
 share/man/man6/freeciv-modpack.6.gz
 share/man/man6/freeciv-mp-cli.6.gz
 %%GTK3%%share/man/man6/freeciv-mp-gtk3.6.gz
 %%GTK4%%share/man/man6/freeciv-mp-gtk4.6.gz
-%%QT%%share/man/man6/freeciv-mp-qt.6.gz
-%%QT%%share/man/man6/freeciv-qt.6.gz
-%%QT%%share/man/man6/freeciv-ruledit.6.gz
-%%QT%%share/man/man6/freeciv-ruleup.6.gz
+%%QT6%%share/man/man6/freeciv-mp-qt.6.gz
+%%QT6%%share/man/man6/freeciv-qt.6.gz
+%%QT6%%share/man/man6/freeciv-ruledit.6.gz
+%%QT6%%share/man/man6/freeciv-ruleup.6.gz
 @comment share/man/man6/freeciv-sdl.6.gz
 %%SDL%%share/man/man6/freeciv-sdl2.6.gz
+%%SDL%%share/man/man6/freeciv-sdl3.6.gz
 share/man/man6/freeciv-server.6.gz
 @comment share/man/man6/freeciv-xaw.6.gz
+%%GTK3%%share/metainfo/org.freeciv.gtk322.metainfo.xml
+%%GTK3%%share/metainfo/org.freeciv.gtk3.mp.metainfo.xml
+%%GTK4%%share/metainfo/org.freeciv.gtk4.metainfo.xml
+%%GTK4%%share/metainfo/org.freeciv.gtk4.mp.metainfo.xml
+%%QT6%%share/metainfo/org.freeciv.qt.metainfo.xml
+%%QT6%%share/metainfo/org.freeciv.qt.mp.metainfo.xml
+%%QT6%%share/metainfo/org.freeciv.ruledit.metainfo.xml
+%%SDL%%share/metainfo/org.freeciv.sdl2.metainfo.xml
 %%CLIENT%%share/pixmaps/freeciv-client.png
 %%CLIENT%%share/pixmaps/freeciv-modpack.png
-%%QT%%share/pixmaps/freeciv-ruledit.png
+%%QT6%%share/pixmaps/freeciv-ruledit.png