games/freeciv: Update to 2.6.0

- Add options to allow building of more of the various clients.
  For now just enable the Qt client by default.

Changes:	https://freeciv.fandom.com/wiki/NEWS-2.6.0

8 files changed, 208 insertions, 106 deletions

diff --git a/games/freeciv-nox11/Makefile b/games/freeciv-nox11/Makefile
index 4f0a067be3c2..57e4c4712b46 100644
--- a/games/freeciv-nox11/Makefile
+++ b/games/freeciv-nox11/Makefile
@@ -1,10 +1,10 @@
 # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
 
+PKGNAMESUFFIX=	-nox11
+
 MASTERDIR=	${.CURDIR}/../freeciv
 
-# Explicitly exclude X11 options
-OPTIONS_EXCLUDE=	SDL X11
-PKGNAMESUFFIX=	-nox11
+OPTIONS_EXCLUDE=	${OPTIONS_MULTI_UI}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 568863b967c7..f3eee8fedf98 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -2,84 +2,103 @@
 # $FreeBSD$
 
 PORTNAME=	freeciv
-PORTVERSION=	2.5.10
-PORTREVISION=	4
+PORTVERSION=	2.6.0
 CATEGORIES=	games
-MASTER_SITES=	SF/freeciv/Freeciv%20${PORTVERSION:R}/${PORTVERSION} \
-		http://download.gna.org/freeciv/stable/
+MASTER_SITES=	SF/freeciv/Freeciv%20${PORTVERSION:R}/${PORTVERSION}
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Free turn-based multiplayer strategy
 
 LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	hicolor-icon-theme>=0:misc/hicolor-icon-theme
-LIB_DEPENDS=	libltdl.so:devel/libltdl \
-		libcurl.so:ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libltdl.so:devel/libltdl
+
+USES=		autoreconf compiler:c++11-lang gmake iconv libtool lua:53 \
+		pkgconfig readline ssl tar:bzip2
 
-USES=		gmake iconv libtool localbase pkgconfig tar:bzip2 python \
-		sqlite readline
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} \
+		--disable-static \
 		--enable-aimodules \
-		--enable-fcdb=sqlite3 \
-		--enable-shared \
-		--program-transform-name= \
-		--without-ggz-client \
-		--without-ggz-server
+		--enable-client=${_FREECIV_CLIENT:ts,} \
+		--enable-fcdb=${_FREECIV_DB:ts,} \
+		--enable-fcmp=${_FREECIV_MP:U:S/^/cli /:ts,} \
+		--enable-mapimg=no \
+		--enable-shared
+
+LDFLAGS+=	-Wl,--as-needed
 
 PORTDATA=	*
 
-OPTIONS_DEFINE?=	NLS X11 SDL MYSQL IPV6 DOCS
-OPTIONS_DEFAULT?=	X11
+OPTIONS_DEFINE=		DOCS IPV6 NLS
+OPTIONS_DEFAULT=	QT5 SQLITE3
+OPTIONS_MULTI=		DB UI
+OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE3
+OPTIONS_MULTI_UI=	GTK2 GTK3 QT5 SDL
 OPTIONS_SUB=		yes
-SDL_CONFIGURE_ON=	--enable-client=gtk,sdl
-SDL_USE=		SDL=sdl,image,ttf,gfx
-MYSQL_CONFIGURE_ON=	--enable-fcdb=mysql --with-mysql-prefix=${LOCALBASE}
-MYSQL_USES=		mysql
+
+DB_DESC=	Database support
+UI_DESC=	GUI clients
+
+GTK2_USES=	gnome sdl
+GTK2_USE=	GNOME=gdkpixbuf2,glib20,gtk20,pango SDL=mixer2
+GTK2_VARS=	_FREECIV_CLIENT+=gtk2 \
+		_FREECIV_MP+=gtk2
+
+GTK3_USES=	gnome sdl
+GTK3_USE=	GNOME=cairo,gdkpixbuf2,glib20,gtk30,pango SDL=mixer2
+GTK3_VARS=	_FREECIV_CLIENT+=gtk3 \
+		_FREECIV_MP+=gtk3
+
 IPV6_CONFIGURE_ENABLE=	ipv6
+
+MYSQL_USES=		mysql
+MYSQL_CONFIGURE_ON=	--with-mysql-prefix=${LOCALBASE}
+MYSQL_VARS=		_FREECIV_DB+=mysql
+
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
-.include <bsd.port.options.mk>
+PGSQL_USES=		pgsql
+PGSQL_CONFIGURE_ON=	--with-postgres-prefix=${LOCALBASE}
+PGSQL_VARS=		_FREECIV_DB+=postgres
 
-.if ${PORT_OPTIONS:MSDL} && empty(PORT_OPTIONS:MX11)
-IGNORE=		cannot use SDL without X11: re-run make config
-.endif
+QT5_USES=		qt:5 sdl
+QT5_USE=		QT=core,gui,widgets,buildtools_build SDL=mixer2
+QT5_CONFIGURE_ON=	--with-qt5-includes=${LOCALBASE}/${QT_INCDIR_REL} \
+			--with-qt5-libs=${LOCALBASE}/${QT_LIBDIR_REL}
+QT5_CONFIGURE_ENABLE=	ruledit
+QT5_VARS=		_FREECIV_CLIENT+=qt \
+			_FREECIV_MP+=qt
+
+SDL_USES=	sdl
+SDL_USE=	SDL=gfx2,image2,mixer2,ttf2
+SDL_VARS=	_FREECIV_CLIENT+=sdl2
 
-.if ${PORT_OPTIONS:MX11}
-LIB_DEPENDS+=	libtiff.so:graphics/tiff \
-		libpng.so:graphics/png \
-		libfontconfig.so:x11-fonts/fontconfig \
-		libfreetype.so:print/freetype2
-USE_XORG=	xpm
-USE_SDL+=	mixer
-USE_GNOME=	gtk20 cairo
-INSTALLS_ICONS=	yes
-. if ! ${PORT_OPTIONS:MSDL}
-CONFIGURE_ARGS+=--enable-client=gtk
-. endif
-CONFLICTS=	freeciv-nox11-[0-9]*
-PLIST_SUB+=	GTK=""
+SQLITE3_USES=	sqlite
+SQLITE3_VARS=	_FREECIV_DB+=sqlite3
+
+# Save OPTIONS_MULTI_UI value for later before the framework
+# does things with it.
+_FREECIV_CLIENTS:=	${OPTIONS_MULTI_UI}
+
+.include <bsd.port.pre.mk>
+
+.if ${_FREECIV_CLIENT:Uno} == no
+CONFLICTS=	freeciv
+PLIST_SUB+=	${_FREECIV_CLIENTS:S/$/="@comment "/} \
+		CLIENT="@comment "
 .else
-CONFIGURE_ARGS+=--enable-client=no --enable-fcmp=no
-CONFLICTS=	freeciv-[0-9]*
-PLIST_SUB+=	GTK="@comment "
+CONFLICTS=	freeciv-nox11
+PLIST_SUB+=	CLIENT=""
 .endif
 
-post-patch:
-	${FIND} ${WRKSRC} -name Makefile.in|${XARGS} ${REINPLACE_CMD} -e \
-		'/pkgdatadir/s|[(]datadir)/@PACKAGE@|(prefix)/${DATADIR_REL}|'
-	${REINPLACE_CMD} 's/minor=99/minor=0/' ${WRKSRC}/configure
-	${REINPLACE_CMD} 's/(LIB_GGZMOD)/& $$(LIB_GGZ_GTK)/' \
-		${WRKSRC}/client/Makefile.in
+# Avoid annoying and too general LUA_LIBDIR=lib sub from USES=lua
+PLIST_SUB:=	${PLIST_SUB:NLUA_LIBDIR=*}
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfreeciv*.so
-	${RM} ${STAGEDIR}${PREFIX}/etc/ggz.modules
-
-post-install-X11-on:
-	${INSTALL_DATA} ${WRKSRC}/data/civclient.dsc ${STAGEDIR}${DATADIR}/
-	cd ${STAGEDIR}/${PREFIX}/bin && ${LN} -s freeciv-gtk2 freeciv-client
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfreeciv*.so
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/freeciv/distinfo b/games/freeciv/distinfo
index 35023bc97227..8e593b53655f 100644
--- a/games/freeciv/distinfo
+++ b/games/freeciv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1517835109
-SHA256 (freeciv-2.5.10.tar.bz2) = c8a14156562dce2f0a7b96390c2d5a35314f1124c448782a6a47b0c51cfcb302
-SIZE (freeciv-2.5.10.tar.bz2) = 40920632
+TIMESTAMP = 1560586935
+SHA256 (freeciv-2.6.0.tar.bz2) = 7c20399198d6c7d846fed9a69b02e01134ae5340a3ae0f99d1e38063ade6c999
+SIZE (freeciv-2.6.0.tar.bz2) = 51912466
diff --git a/games/freeciv/files/patch-common_Makefile.am b/games/freeciv/files/patch-common_Makefile.am
new file mode 100644
index 000000000000..9490b3aa02e4
--- /dev/null
+++ b/games/freeciv/files/patch-common_Makefile.am
@@ -0,0 +1,11 @@
+--- common/Makefile.am.orig	2019-06-16 16:23:58 UTC
++++ common/Makefile.am
+@@ -141,7 +141,7 @@ libfreeciv_la_LIBADD = \
+ 	$(top_builddir)/utility/libcivutility.la \
+ 	$(top_builddir)/common/aicore/libaicore.la \
+ 	$(top_builddir)/common/scriptcore/libscriptcore.la \
+-	$(COMMON_LIBS)
++	$(COMMON_LIBS) $(LIBICONV)
+ 
+ BUILT_SOURCES = packets_gen.c packets_gen.h
+ 
diff --git a/games/freeciv/files/patch-m4_sdl2-client.m4 b/games/freeciv/files/patch-m4_sdl2-client.m4
new file mode 100644
index 000000000000..5f48eef0e82e
--- /dev/null
+++ b/games/freeciv/files/patch-m4_sdl2-client.m4
@@ -0,0 +1,11 @@
+--- m4/sdl2-client.m4.orig	2019-06-15 17:19:23 UTC
++++ m4/sdl2-client.m4
+@@ -82,7 +82,7 @@ AC_DEFUN([FC_SDL2_PROJECT],
+   ac_save_LIBS="$LIBS"
+   CPPFLAGS="$CPPFLAGS $SDL2_CFLAGS"
+   CFLAGS="$CFLAGS $SDL2_CFLAGS"
+-  LIBS="$LIBS $SDL2_LIBS"
++  LIBS="$LIBS $SDL2_LIBS -lm"
+   AC_CHECK_LIB([$1], [$2],
+                [sdl2_lib_found="yes"], [sdl2_lib_found="no"
+ sdl2_h_found="no"])
diff --git a/games/freeciv/files/patch-server_Makefile.am b/games/freeciv/files/patch-server_Makefile.am
new file mode 100644
index 000000000000..c37d23a422be
--- /dev/null
+++ b/games/freeciv/files/patch-server_Makefile.am
@@ -0,0 +1,12 @@
+--- server/Makefile.am.orig	2019-06-16 16:26:20 UTC
++++ server/Makefile.am
+@@ -153,7 +153,8 @@ srvlibs = \
+ 
+ libfreeciv_srv_la_LIBADD = \
+  $(srvlibs) $(SRV_LIB_LIBS) \
+- $(LUA_LIBS) $(TOLUA_LIBS) $(LUASQL_LIBS)
++ $(LUA_LIBS) $(TOLUA_LIBS) $(LUASQL_LIBS) \
++ $(SERVER_LIBS)
+ 
+ exe_ldflags =
+ 
diff --git a/games/freeciv/pkg-descr b/games/freeciv/pkg-descr
index b994de358b29..c94ac8cb4a31 100644
--- a/games/freeciv/pkg-descr
+++ b/games/freeciv/pkg-descr
@@ -13,5 +13,3 @@ That also means it has very extensive multilanguage support, something
 rare in games.
 
 WWW: http://www.freeciv.org/
-
--Adam <adam-ports@blacktabby.org>
diff --git a/games/freeciv/pkg-plist b/games/freeciv/pkg-plist
index f6ae07a2d90f..7794546f7bf4 100644
--- a/games/freeciv/pkg-plist
+++ b/games/freeciv/pkg-plist
@@ -1,43 +1,59 @@
-%%X11%%bin/freeciv-client
-%%GTK%%bin/freeciv-gtk2
-%%X11%%bin/freeciv-manual
-%%GTK%%bin/freeciv-mp-gtk2
-%%SDL%%bin/freeciv-sdl
+%%CLIENT%%bin/freeciv-manual
+%%GTK2%%bin/freeciv-gtk2
+%%GTK3%%bin/freeciv-gtk3
+bin/freeciv-mp-cli
+%%GTK2%%bin/freeciv-mp-gtk2
+%%GTK3%%bin/freeciv-mp-gtk3
+%%QT5%%bin/freeciv-mp-qt
+%%QT5%%bin/freeciv-qt
+%%QT5%%bin/freeciv-ruledit
+%%SDL%%bin/freeciv-sdl2
 bin/freeciv-server
 %%ETCDIR%%/database.lua
-lib/libfreeciv-srv.a
 lib/libfreeciv-srv.so
 lib/libfreeciv-srv.so.0
 lib/libfreeciv-srv.so.0.0.0
-lib/libfreeciv.a
 lib/libfreeciv.so
 lib/libfreeciv.so.0
 lib/libfreeciv.so.0.0.0
-man/man6/freeciv-client.6.gz
-man/man6/freeciv-gtk2.6.gz
-man/man6/freeciv-gtk3.6.gz
+%%CLIENT%%man/man6/freeciv-client.6.gz
+%%GTK2%%man/man6/freeciv-gtk2.6.gz
+@comment man/man6/freeciv-gtk3.22.6.gz
+%%GTK3%%man/man6/freeciv-gtk3.6.gz
 man/man6/freeciv-manual.6.gz
 man/man6/freeciv-modpack.6.gz
 man/man6/freeciv-mp-cli.6.gz
-man/man6/freeciv-mp-gtk2.6.gz
-man/man6/freeciv-mp-gtk3.6.gz
-man/man6/freeciv-mp-qt.6.gz
-man/man6/freeciv-qt.6.gz
-man/man6/freeciv-sdl.6.gz
+%%GTK2%%man/man6/freeciv-mp-gtk2.6.gz
+%%GTK3%%man/man6/freeciv-mp-gtk3.6.gz
+%%QT5%%man/man6/freeciv-mp-qt.6.gz
+%%QT5%%man/man6/freeciv-qt.6.gz
+%%QT5%%man/man6/freeciv-ruledit.6.gz
+@comment man/man6/freeciv-sdl.6.gz
+%%SDL%%man/man6/freeciv-sdl2.6.gz
 man/man6/freeciv-server.6.gz
-man/man6/freeciv-xaw.6.gz
-%%GTK%%share/appdata/freeciv-gtk2.appdata.xml
-%%GTK%%share/appdata/freeciv-mp-gtk2.appdata.xml
-%%SDL%%share/appdata/freeciv-sdl.appdata.xml
+@comment man/man6/freeciv-xaw.6.gz
+%%GTK2%%share/appdata/freeciv-gtk2.appdata.xml
+%%GTK3%%share/appdata/freeciv-gtk3.appdata.xml
+%%GTK2%%share/appdata/freeciv-mp-gtk2.appdata.xml
+%%GTK3%%share/appdata/freeciv-mp-gtk3.appdata.xml
+%%QT5%%share/appdata/freeciv-mp-qt.appdata.xml
+%%QT5%%share/appdata/freeciv-qt.appdata.xml
+%%QT5%%share/appdata/freeciv-ruledit.appdata.xml
+%%SDL%%share/appdata/freeciv-sdl2.appdata.xml
 share/appdata/freeciv-server.appdata.xml
-%%GTK%%share/applications/freeciv-gtk2.desktop
-%%GTK%%share/applications/freeciv-mp-gtk2.desktop
-%%SDL%%share/applications/freeciv-sdl.desktop
+%%GTK2%%share/applications/freeciv-gtk2.desktop
+%%GTK2%%share/applications/freeciv-mp-gtk2.desktop
+%%GTK3%%share/applications/freeciv-mp-gtk3.desktop
+%%QT5%%share/applications/freeciv-mp-qt.desktop
+%%QT5%%share/applications/freeciv-qt.desktop
+%%QT5%%share/applications/freeciv-ruledit.desktop
+%%SDL%%share/applications/freeciv-sdl2.desktop
+%%GTK3%%share/applications/freeciv.desktop
 share/applications/freeciv-server.desktop
 %%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
+@comment %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/CodingStyle
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
@@ -46,10 +62,11 @@ share/applications/freeciv-server.desktop
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.Cygwin
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS-2.5
+%%PORTDOCS%%%%DOCSDIR%%/NEWS-2.6
 %%PORTDOCS%%%%DOCSDIR%%/README.AI
 %%PORTDOCS%%%%DOCSDIR%%/README.AI_modules
-%%PORTDOCS%%%%DOCSDIR%%/README.SDLClient
+%%PORTDOCS%%%%DOCSDIR%%/README.achievements
+%%PORTDOCS%%%%DOCSDIR%%/README.actions
 %%PORTDOCS%%%%DOCSDIR%%/README.agents
 %%PORTDOCS%%%%DOCSDIR%%/README.attributes
 %%PORTDOCS%%%%DOCSDIR%%/README.delta
@@ -57,101 +74,135 @@ share/applications/freeciv-server.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README.fcdb
 %%PORTDOCS%%%%DOCSDIR%%/README.governor
 %%PORTDOCS%%%%DOCSDIR%%/README.graphics
+%%PORTDOCS%%%%DOCSDIR%%/README.msys2
 %%PORTDOCS%%%%DOCSDIR%%/README.nations
 %%PORTDOCS%%%%DOCSDIR%%/README.packaging
-%%PORTDOCS%%%%DOCSDIR%%/README.ruleset_civ2civ3
-%%PORTDOCS%%%%DOCSDIR%%/README.ruleset_experimental
-%%PORTDOCS%%%%DOCSDIR%%/README.ruleset_multiplayer
 %%PORTDOCS%%%%DOCSDIR%%/README.rulesets
 %%PORTDOCS%%%%DOCSDIR%%/README.scorelog
 %%PORTDOCS%%%%DOCSDIR%%/README.sound
 %%PORTDOCS%%%%DOCSDIR%%/README.tilesets
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%X11%%share/icons/hicolor/128x128/apps/freeciv-client.png
-%%X11%%share/icons/hicolor/128x128/apps/freeciv-modpack.png
-%%X11%%share/icons/hicolor/128x128/apps/freeciv-server.png
-%%X11%%share/icons/hicolor/16x16/apps/freeciv-client.png
-%%X11%%share/icons/hicolor/16x16/apps/freeciv-modpack.png
-%%X11%%share/icons/hicolor/16x16/apps/freeciv-server.png
-%%X11%%share/icons/hicolor/32x32/apps/freeciv-client.png
-%%X11%%share/icons/hicolor/32x32/apps/freeciv-modpack.png
-%%X11%%share/icons/hicolor/32x32/apps/freeciv-server.png
-%%X11%%share/icons/hicolor/48x48/apps/freeciv-client.png
-%%X11%%share/icons/hicolor/48x48/apps/freeciv-modpack.png
-%%X11%%share/icons/hicolor/48x48/apps/freeciv-server.png
-%%X11%%share/icons/hicolor/64x64/apps/freeciv-client.png
-%%X11%%share/icons/hicolor/64x64/apps/freeciv-modpack.png
-%%X11%%share/icons/hicolor/64x64/apps/freeciv-server.png
+%%CLIENT%%share/icons/hicolor/128x128/apps/freeciv-client.png
+%%CLIENT%%share/icons/hicolor/128x128/apps/freeciv-modpack.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
+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
+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
+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
+share/icons/hicolor/64x64/apps/freeciv-server.png
 %%NLS%%share/locale/ar/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/ar/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/bg/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/ca/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/cs/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/da/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/da/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/da/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/de/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/de/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/de/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/el/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/el/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/el/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/en_GB/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/eo/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/es/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/es/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/es/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/et/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/et/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/et/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/fa/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/fa/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/fa/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/fi/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/fr/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/ga/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/gd/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/gd/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/gd/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/he/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/he/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/he/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/hu/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/id/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/id/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/id/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/it/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/it/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/it/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/ja/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/ko/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/lt/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/nb/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/nl/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/pl/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/pt/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/pt_BR/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/ro/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/ru/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/sr/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/sv/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/tr/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/uk/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/zh_CN/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/freeciv.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/freeciv-nations.mo
+%%QT5%%%%NLS%%share/locale/zh_TW/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/freeciv.mo
-%%X11%%share/pixmaps/freeciv-client.png
+%%CLIENT%%share/pixmaps/freeciv-client.png