- Update to Freeciv 2.2.1

- Claim maintainership
- Remove separate plist file for nox11
- Add option to build SDL-client
- Add option to build without NLS

Feature safe:	yes

4 files changed, 950 insertions, 922 deletions

diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 28a03031322a..eb23f0995057 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	freeciv
-PORTVERSION=	2.1.11
-PORTREVISION=	3
+PORTVERSION=	2.2.1
 CATEGORIES=	games
-MASTER_SITES=	SF/freeciv/Freeciv%202.1/${PORTVERSION}
+MASTER_SITES=	SF/freeciv/Freeciv%20${PORTVERSION:R}/${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Free turn-based multiplayer strategy
 
 RUN_DEPENDS=	hicolor-icon-theme>=0:${PORTSDIR}/misc/hicolor-icon-theme
@@ -21,15 +20,14 @@ USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-libiconv-prefix=${PREFIX} --program-transform-name=
 INSTALLS_ICONS=	yes
-PORT_VERBS=	civ
 
-MAN6=		civserver.6 civclient.6
+MAN6=		freeciv-server.6 freeciv-client.6 \
+		freeciv-xaw.6 freeciv-win32.6 freeciv-sdl.6 freeciv-gtk2.6 \
+		freeciv-ftwl.6
 
 .ifndef WITHOUT_X11
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
@@ -42,26 +40,34 @@ USE_XORG=	xpm
 USE_SDL=	mixer
 USE_GNOME=	gtk20
 CONFIGURE_ARGS+=--enable-client=gtk
-.ifndef WITHOUT_ESOUND
 USE_GNOME+=	esound
-.else
-CONFIGURE_ARGS+=--disable-esd
-.endif
 CONFLICTS=	freeciv-nox11-[0-9]*
+PLIST_SUB+=	X11="" GTK=""
 .else
-PLIST=	${PKGDIR}/pkg-plist.nox11
 PKGNAMESUFFIX?=	-nox11
 CONFIGURE_ARGS+=--enable-client=no
 CONFLICTS=	freeciv-[0-9]*
+PLIST_SUB+=	X11="@comment " GTK="@comment "
+.endif
+
+.ifdef WITH_SDL
+CONFIGURE_ARGS+=--enable-client=gtk,sdl
+USE_SDL=	sdl image ttf
+PLIST_SUB+=	SDL=""
+.else
+PLIST_SUB+=	SDL="@comment "
 .endif
 
-.ifndef WITHOUT_AUTH
 .ifndef WITHOUT_MYSQL
-CONFIGURE_ARGS+=	--enable-auth --with-mysql-prefix=${LOCALBASE}
+CONFIGURE_ARGS+=--enable-auth --with-mysql-prefix=${LOCALBASE}
 USE_MYSQL=	yes
 .endif
+
+.ifdef WITHOUT_NLS
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .else
-CONFIGURE_ARGS+=	--disable-auth
+PLIST_SUB+=	NLS=""
 .endif
 
 post-patch:
@@ -73,6 +79,7 @@ post-patch:
 .ifndef WITHOUT_X11
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/data/civclient.dsc ${DATADIR}/
+	@cd ${PREFIX}/bin && ${LN} -s freeciv-gtk2 freeciv-client
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/freeciv/distinfo b/games/freeciv/distinfo
index 0248939274ea..6cf830d795ef 100644
--- a/games/freeciv/distinfo
+++ b/games/freeciv/distinfo
@@ -1,3 +1,3 @@
-MD5 (freeciv-2.1.11.tar.bz2) = b064e5949d211a46a9d6d050f3c98959
-SHA256 (freeciv-2.1.11.tar.bz2) = f52fb8318cf121b74da04d5279c24d2045d829718c67cc21cb62439f50754707
-SIZE (freeciv-2.1.11.tar.bz2) = 29884418
+MD5 (freeciv-2.2.1.tar.bz2) = b43269e38ecd32cb09850778befc72b3
+SHA256 (freeciv-2.2.1.tar.bz2) = cecf98af004fa49e5fc8b3e4447eefbad27e237377e4c9add2e9da60da53cb31
+SIZE (freeciv-2.2.1.tar.bz2) = 33400493
diff --git a/games/freeciv/pkg-plist b/games/freeciv/pkg-plist
index bc80e57d541f..2f777bb4257b 100644
--- a/games/freeciv/pkg-plist
+++ b/games/freeciv/pkg-plist
@@ -1,79 +1,89 @@
-bin/civclient
-bin/civmanual
-bin/civserver
+bin/freeciv-server
+%%X11%%bin/civmanual
+%%X11%%bin/freeciv-client
+%%GTK%%bin/freeciv-gtk2
+%%SDL%%bin/freeciv-sdl
+lib/libfreeciv.a
+lib/libfreeciv.la
+lib/libfreeciv-srv.a
+lib/libfreeciv-srv.la
 share/applications/freeciv-server.desktop
-share/applications/freeciv.desktop
-%%DATADIR%%/amplio/ancientcities.png
-%%DATADIR%%/amplio/ancientcities.spec
-%%DATADIR%%/amplio/buildings.spec
-%%DATADIR%%/amplio/cityicon.png
-%%DATADIR%%/amplio/civicon.png
-%%DATADIR%%/amplio/explosions.png
-%%DATADIR%%/amplio/explosions.spec
-%%DATADIR%%/amplio/fog.png
-%%DATADIR%%/amplio/fog.spec
-%%DATADIR%%/amplio/grid.png
-%%DATADIR%%/amplio/grid.spec
-%%DATADIR%%/amplio/icons.spec
-%%DATADIR%%/amplio/medievalcities.png
-%%DATADIR%%/amplio/medievalcities.spec
-%%DATADIR%%/amplio/moderncities.png
-%%DATADIR%%/amplio/moderncities.spec
-%%DATADIR%%/amplio/nuke.png
-%%DATADIR%%/amplio/nuke.spec
-%%DATADIR%%/amplio/select-alpha.png
-%%DATADIR%%/amplio/select.png
-%%DATADIR%%/amplio/select.spec
-%%DATADIR%%/amplio/terrain1.png
-%%DATADIR%%/amplio/terrain1.spec
-%%DATADIR%%/amplio/terrain2.png
-%%DATADIR%%/amplio/terrain2.spec
-%%DATADIR%%/amplio/tiles.png
-%%DATADIR%%/amplio/tiles.spec
-%%DATADIR%%/amplio/units.png
-%%DATADIR%%/amplio/units.spec
-%%DATADIR%%/amplio/wonders.spec
-%%DATADIR%%/amplio.tilespec
-%%DATADIR%%/buildings/airport.png
-%%DATADIR%%/buildings/aqueduct.png
-%%DATADIR%%/buildings/bank.png
-%%DATADIR%%/buildings/barracks_i.png
-%%DATADIR%%/buildings/barracks_ii.png
-%%DATADIR%%/buildings/barracks_iii.png
-%%DATADIR%%/buildings/capitalization.png
-%%DATADIR%%/buildings/cathedral.png
-%%DATADIR%%/buildings/city_walls.png
-%%DATADIR%%/buildings/coastal_defense.png
-%%DATADIR%%/buildings/colosseum.png
-%%DATADIR%%/buildings/courthouse.png
-%%DATADIR%%/buildings/factory.png
-%%DATADIR%%/buildings/granary.png
-%%DATADIR%%/buildings/harbor.png
-%%DATADIR%%/buildings/hydro_plant.png
-%%DATADIR%%/buildings/library.png
-%%DATADIR%%/buildings/marketplace.png
-%%DATADIR%%/buildings/mass_transit.png
-%%DATADIR%%/buildings/mfg_plant.png
-%%DATADIR%%/buildings/nuclear_plant.png
-%%DATADIR%%/buildings/offshore_platform.png
-%%DATADIR%%/buildings/palace.png
-%%DATADIR%%/buildings/police_station.png
-%%DATADIR%%/buildings/port_facility.png
-%%DATADIR%%/buildings/power_plant.png
-%%DATADIR%%/buildings/recycling_center.png
-%%DATADIR%%/buildings/research_lab.png
-%%DATADIR%%/buildings/sam_battery.png
-%%DATADIR%%/buildings/sdi_defense.png
-%%DATADIR%%/buildings/sewer_system.png
-%%DATADIR%%/buildings/solar_plant.png
-%%DATADIR%%/buildings/space_component.png
-%%DATADIR%%/buildings/space_modules.png
-%%DATADIR%%/buildings/space_structural.png
-%%DATADIR%%/buildings/stock_exchange.png
-%%DATADIR%%/buildings/super_highways.png
-%%DATADIR%%/buildings/supermarket.png
-%%DATADIR%%/buildings/temple.png
-%%DATADIR%%/buildings/university.png
+%%X11%%share/applications/freeciv.desktop
+%%X11%%%%DATADIR%%/amplio/ancientcities.png
+%%X11%%%%DATADIR%%/amplio/ancientcities.spec
+%%X11%%%%DATADIR%%/amplio/buildings.spec
+%%X11%%%%DATADIR%%/amplio/cityicon.png
+%%X11%%%%DATADIR%%/amplio/civicon.png
+%%X11%%%%DATADIR%%/amplio/explosions.png
+%%X11%%%%DATADIR%%/amplio/explosions.spec
+%%X11%%%%DATADIR%%/amplio/fog.png
+%%X11%%%%DATADIR%%/amplio/fog.spec
+%%X11%%%%DATADIR%%/amplio/grid.png
+%%X11%%%%DATADIR%%/amplio/grid.spec
+%%X11%%%%DATADIR%%/amplio/icons.spec
+%%X11%%%%DATADIR%%/amplio/medievalcities.png
+%%X11%%%%DATADIR%%/amplio/medievalcities.spec
+%%X11%%%%DATADIR%%/amplio/moderncities.png
+%%X11%%%%DATADIR%%/amplio/moderncities.spec
+%%X11%%%%DATADIR%%/amplio/nuke.png
+%%X11%%%%DATADIR%%/amplio/nuke.spec
+%%X11%%%%DATADIR%%/amplio/ocean.png
+%%X11%%%%DATADIR%%/amplio/ocean.spec
+%%X11%%%%DATADIR%%/amplio/select-alpha.png
+%%X11%%%%DATADIR%%/amplio/select.png
+%%X11%%%%DATADIR%%/amplio/select.spec
+%%X11%%%%DATADIR%%/amplio/terrain1.png
+%%X11%%%%DATADIR%%/amplio/terrain1.spec
+%%X11%%%%DATADIR%%/amplio/terrain2.png
+%%X11%%%%DATADIR%%/amplio/terrain2.spec
+%%X11%%%%DATADIR%%/amplio/tiles.png
+%%X11%%%%DATADIR%%/amplio/tiles.spec
+%%X11%%%%DATADIR%%/amplio/units.png
+%%X11%%%%DATADIR%%/amplio/units.spec
+%%X11%%%%DATADIR%%/amplio/water.png
+%%X11%%%%DATADIR%%/amplio/water.spec
+%%X11%%%%DATADIR%%/amplio/wonders.spec
+%%X11%%%%DATADIR%%/amplio.tilespec
+%%X11%%%%DATADIR%%/buildings/airport.png
+%%X11%%%%DATADIR%%/buildings/aqueduct.png
+%%X11%%%%DATADIR%%/buildings/bank.png
+%%X11%%%%DATADIR%%/buildings/barracks_i.png
+%%X11%%%%DATADIR%%/buildings/barracks_ii.png
+%%X11%%%%DATADIR%%/buildings/barracks_iii.png
+%%X11%%%%DATADIR%%/buildings/capitalization.png
+%%X11%%%%DATADIR%%/buildings/cathedral.png
+%%X11%%%%DATADIR%%/buildings/city_walls.png
+%%X11%%%%DATADIR%%/buildings/coastal_defense.png
+%%X11%%%%DATADIR%%/buildings/colosseum.png
+%%X11%%%%DATADIR%%/buildings/courthouse.png
+%%X11%%%%DATADIR%%/buildings/factory.png
+%%X11%%%%DATADIR%%/buildings/granary.png
+%%X11%%%%DATADIR%%/buildings/harbor.png
+%%X11%%%%DATADIR%%/buildings/hydro_plant.png
+%%X11%%%%DATADIR%%/buildings/library.png
+%%X11%%%%DATADIR%%/buildings/marketplace.png
+%%X11%%%%DATADIR%%/buildings/mass_transit.png
+%%X11%%%%DATADIR%%/buildings/mfg_plant.png
+%%X11%%%%DATADIR%%/buildings/nuclear_plant.png
+%%X11%%%%DATADIR%%/buildings/offshore_platform.png
+%%X11%%%%DATADIR%%/buildings/palace.png
+%%X11%%%%DATADIR%%/buildings/police_station.png
+%%X11%%%%DATADIR%%/buildings/port_facility.png
+%%X11%%%%DATADIR%%/buildings/power_plant.png
+%%X11%%%%DATADIR%%/buildings/recycling_center.png
+%%X11%%%%DATADIR%%/buildings/research_lab.png
+%%X11%%%%DATADIR%%/buildings/sam_battery.png
+%%X11%%%%DATADIR%%/buildings/sdi_defense.png
+%%X11%%%%DATADIR%%/buildings/sewer_system.png
+%%X11%%%%DATADIR%%/buildings/solar_plant.png
+%%X11%%%%DATADIR%%/buildings/space_component.png
+%%X11%%%%DATADIR%%/buildings/space_modules.png
+%%X11%%%%DATADIR%%/buildings/space_structural.png
+%%X11%%%%DATADIR%%/buildings/stock_exchange.png
+%%X11%%%%DATADIR%%/buildings/super_highways.png
+%%X11%%%%DATADIR%%/buildings/supermarket.png
+%%X11%%%%DATADIR%%/buildings/temple.png
+%%X11%%%%DATADIR%%/buildings/university.png
 %%DATADIR%%/civ1/buildings.ruleset
 %%DATADIR%%/civ1/effects.ruleset
 %%DATADIR%%/civ1/game.ruleset
@@ -92,9 +102,11 @@ share/applications/freeciv.desktop
 %%DATADIR%%/civ2/terrain.ruleset
 %%DATADIR%%/civ2/units.ruleset
 %%DATADIR%%/civ2.serv
-@unexec ggz-config --remove --modfile %D/%%DATADIR%%/civclient.dsc
-%%DATADIR%%/civclient.dsc
-@exec ggz-config --install --modfile %D/%%DATADIR%%/civclient.dsc
+%%X11%%@unexec ggz-config --remove --modfile %D/%%DATADIR%%/civclient.dsc
+%%X11%%%%DATADIR%%/civclient.dsc
+%%X11%%@exec ggz-config --install --modfile %D/%%DATADIR%%/civclient.dsc
+%%DATADIR%%/default/ai_effects.ruleset
+%%DATADIR%%/default/default.lua
 %%DATADIR%%/default/buildings.ruleset
 %%DATADIR%%/default/cities.ruleset
 %%DATADIR%%/default/effects.ruleset
@@ -106,370 +118,485 @@ share/applications/freeciv.desktop
 %%DATADIR%%/default/terrain.ruleset
 %%DATADIR%%/default/units.ruleset
 %%DATADIR%%/default.serv
-%%DATADIR%%/flags/aborigines-shield.png
-%%DATADIR%%/flags/aborigines.png
-%%DATADIR%%/flags/afghanistan-shield.png
-%%DATADIR%%/flags/afghanistan.png
-%%DATADIR%%/flags/algeria-shield.png
-%%DATADIR%%/flags/algeria.png
-%%DATADIR%%/flags/antarctica-shield.png
-%%DATADIR%%/flags/antarctica.png
-%%DATADIR%%/flags/arab-shield.png
-%%DATADIR%%/flags/arab.png
-%%DATADIR%%/flags/aram-shield.png
-%%DATADIR%%/flags/aram.png
-%%DATADIR%%/flags/argentina-shield.png
-%%DATADIR%%/flags/argentina.png
-%%DATADIR%%/flags/armenia-shield.png
-%%DATADIR%%/flags/armenia.png
-%%DATADIR%%/flags/assyria-shield.png
-%%DATADIR%%/flags/assyria.png
-%%DATADIR%%/flags/australia-shield.png
-%%DATADIR%%/flags/australia.png
-%%DATADIR%%/flags/austria-shield.png
-%%DATADIR%%/flags/austria.png
-%%DATADIR%%/flags/azerbaijan-shield.png
-%%DATADIR%%/flags/azerbaijan.png
-%%DATADIR%%/flags/aztec-shield.png
-%%DATADIR%%/flags/aztec.png
-%%DATADIR%%/flags/babylon-shield.png
-%%DATADIR%%/flags/babylon.png
-%%DATADIR%%/flags/bangladesh-shield.png
-%%DATADIR%%/flags/bangladesh.png
-%%DATADIR%%/flags/barbarian-shield.png
-%%DATADIR%%/flags/barbarian.png
-%%DATADIR%%/flags/bavarian-shield.png
-%%DATADIR%%/flags/bavarian.png
-%%DATADIR%%/flags/belgium-shield.png
-%%DATADIR%%/flags/belgium.png
-%%DATADIR%%/flags/boer-shield.png
-%%DATADIR%%/flags/boer.png
-%%DATADIR%%/flags/bosnia-shield.png
-%%DATADIR%%/flags/bosnia.png
-%%DATADIR%%/flags/brasil-shield.png
-%%DATADIR%%/flags/brasil.png
-%%DATADIR%%/flags/bulgaria-shield.png
-%%DATADIR%%/flags/bulgaria.png
-%%DATADIR%%/flags/byzantium-shield.png
-%%DATADIR%%/flags/byzantium.png
-%%DATADIR%%/flags/canada-shield.png
-%%DATADIR%%/flags/canada.png
-%%DATADIR%%/flags/cartago-shield.png
-%%DATADIR%%/flags/cartago.png
-%%DATADIR%%/flags/catalan-shield.png
-%%DATADIR%%/flags/catalan.png
-%%DATADIR%%/flags/cheyenne-shield.png
-%%DATADIR%%/flags/cheyenne.png
-%%DATADIR%%/flags/chile-shield.png
-%%DATADIR%%/flags/chile.png
-%%DATADIR%%/flags/china-shield.png
-%%DATADIR%%/flags/china.png
-%%DATADIR%%/flags/colombia-shield.png
-%%DATADIR%%/flags/colombia.png
-%%DATADIR%%/flags/constantine-shield.png
-%%DATADIR%%/flags/constantine.png
-%%DATADIR%%/flags/cornwall-shield.png
-%%DATADIR%%/flags/cornwall.png
-%%DATADIR%%/flags/croatia-shield.png
-%%DATADIR%%/flags/croatia.png
-%%DATADIR%%/flags/cuba-shield.png
-%%DATADIR%%/flags/cuba.png
-%%DATADIR%%/flags/czech-shield.png
-%%DATADIR%%/flags/czech.png
-%%DATADIR%%/flags/denmark-shield.png
-%%DATADIR%%/flags/denmark.png
-%%DATADIR%%/flags/egypt-shield.png
-%%DATADIR%%/flags/egypt.png
-%%DATADIR%%/flags/egypt_ancient-shield.png
-%%DATADIR%%/flags/egypt_ancient.png
-%%DATADIR%%/flags/england-shield.png
-%%DATADIR%%/flags/england.png
-%%DATADIR%%/flags/estonia-shield.png
-%%DATADIR%%/flags/estonia.png
-%%DATADIR%%/flags/ethiopia-shield.png
-%%DATADIR%%/flags/ethiopia.png
-%%DATADIR%%/flags/europe-shield.png
-%%DATADIR%%/flags/europe.png
-%%DATADIR%%/flags/finland-shield.png
-%%DATADIR%%/flags/finland.png
-%%DATADIR%%/flags/france-shield.png
-%%DATADIR%%/flags/france.png
-%%DATADIR%%/flags/france_old-shield.png
-%%DATADIR%%/flags/france_old.png
-%%DATADIR%%/flags/galicia-shield.png
-%%DATADIR%%/flags/galicia.png
-%%DATADIR%%/flags/gaul-shield.png
-%%DATADIR%%/flags/gaul.png
-%%DATADIR%%/flags/georgia-shield.png
-%%DATADIR%%/flags/georgia.png
-%%DATADIR%%/flags/germany-shield.png
-%%DATADIR%%/flags/germany.png
-%%DATADIR%%/flags/greece-shield.png
-%%DATADIR%%/flags/greece.png
-%%DATADIR%%/flags/greece_ancient-shield.png
-%%DATADIR%%/flags/greece_ancient.png
-%%DATADIR%%/flags/greenland-shield.png
-%%DATADIR%%/flags/greenland.png
-%%DATADIR%%/flags/hittite-shield.png
-%%DATADIR%%/flags/hittite.png
-%%DATADIR%%/flags/hungary-shield.png
-%%DATADIR%%/flags/hungary.png
-%%DATADIR%%/flags/iceland-shield.png
-%%DATADIR%%/flags/iceland.png
-%%DATADIR%%/flags/illyria-shield.png
-%%DATADIR%%/flags/illyria.png
-%%DATADIR%%/flags/inca-shield.png
-%%DATADIR%%/flags/inca.png
-%%DATADIR%%/flags/india-shield.png
-%%DATADIR%%/flags/india.png
-%%DATADIR%%/flags/indonesia-shield.png
-%%DATADIR%%/flags/indonesia.png
-%%DATADIR%%/flags/iran-shield.png
-%%DATADIR%%/flags/iran.png
-%%DATADIR%%/flags/iran_ancient-shield.png
-%%DATADIR%%/flags/iran_ancient.png
-%%DATADIR%%/flags/iraq-shield.png
-%%DATADIR%%/flags/iraq.png
-%%DATADIR%%/flags/iraq_old-shield.png
-%%DATADIR%%/flags/iraq_old.png
-%%DATADIR%%/flags/ireland-shield.png
-%%DATADIR%%/flags/ireland.png
-%%DATADIR%%/flags/iroquois-shield.png
-%%DATADIR%%/flags/iroquois.png
-%%DATADIR%%/flags/israel-shield.png
-%%DATADIR%%/flags/israel.png
-%%DATADIR%%/flags/italy-shield.png
-%%DATADIR%%/flags/italy.png
-%%DATADIR%%/flags/japan-shield.png
-%%DATADIR%%/flags/japan.png
-%%DATADIR%%/flags/kampuchea-shield.png
-%%DATADIR%%/flags/kampuchea.png
-%%DATADIR%%/flags/kenya-shield.png
-%%DATADIR%%/flags/kenya.png
-%%DATADIR%%/flags/korea-shield.png
-%%DATADIR%%/flags/korea.png
-%%DATADIR%%/flags/latvia-shield.png
-%%DATADIR%%/flags/latvia.png
-%%DATADIR%%/flags/libya-shield.png
-%%DATADIR%%/flags/libya.png
-%%DATADIR%%/flags/lithuania-shield.png
-%%DATADIR%%/flags/lithuania.png
-%%DATADIR%%/flags/macedonia-shield.png
-%%DATADIR%%/flags/macedonia.png
-%%DATADIR%%/flags/madagascar-shield.png
-%%DATADIR%%/flags/madagascar.png
-%%DATADIR%%/flags/malaysia-shield.png
-%%DATADIR%%/flags/malaysia.png
-%%DATADIR%%/flags/mali-shield.png
-%%DATADIR%%/flags/mali.png
-%%DATADIR%%/flags/maori-shield.png
-%%DATADIR%%/flags/maori.png
-%%DATADIR%%/flags/mars-shield.png
-%%DATADIR%%/flags/mars.png
-%%DATADIR%%/flags/maya-shield.png
-%%DATADIR%%/flags/maya.png
-%%DATADIR%%/flags/mexico-shield.png
-%%DATADIR%%/flags/mexico.png
-%%DATADIR%%/flags/mongolia-shield.png
-%%DATADIR%%/flags/mongolia.png
-%%DATADIR%%/flags/myanmar-shield.png
-%%DATADIR%%/flags/myanmar.png
-%%DATADIR%%/flags/nato-shield.png
-%%DATADIR%%/flags/nato.png
-%%DATADIR%%/flags/netherlands-shield.png
-%%DATADIR%%/flags/netherlands.png
-%%DATADIR%%/flags/newzealand-shield.png
-%%DATADIR%%/flags/newzealand.png
-%%DATADIR%%/flags/nigeria-shield.png
-%%DATADIR%%/flags/nigeria.png
-%%DATADIR%%/flags/norway-shield.png
-%%DATADIR%%/flags/norway.png
-%%DATADIR%%/flags/observer-shield.png
-%%DATADIR%%/flags/observer.png
-%%DATADIR%%/flags/ottoman-shield.png
-%%DATADIR%%/flags/ottoman.png
-%%DATADIR%%/flags/pakistan-shield.png
-%%DATADIR%%/flags/pakistan.png
-%%DATADIR%%/flags/palmyra-shield.png
-%%DATADIR%%/flags/palmyra.png
-%%DATADIR%%/flags/papua_newguinea-shield.png
-%%DATADIR%%/flags/papua_newguinea.png
-%%DATADIR%%/flags/peru-shield.png
-%%DATADIR%%/flags/peru.png
-%%DATADIR%%/flags/philippines-shield.png
-%%DATADIR%%/flags/philippines.png
-%%DATADIR%%/flags/phoenicia-shield.png
-%%DATADIR%%/flags/phoenicia.png
-%%DATADIR%%/flags/poland-shield.png
-%%DATADIR%%/flags/poland.png
-%%DATADIR%%/flags/portugal-shield.png
-%%DATADIR%%/flags/portugal.png
-%%DATADIR%%/flags/qing-shield.png
-%%DATADIR%%/flags/qing.png
-%%DATADIR%%/flags/quebec-shield.png
-%%DATADIR%%/flags/quebec.png
-%%DATADIR%%/flags/romania-shield.png
-%%DATADIR%%/flags/romania.png
-%%DATADIR%%/flags/rome-shield.png
-%%DATADIR%%/flags/rome.png
-%%DATADIR%%/flags/russia-shield.png
-%%DATADIR%%/flags/russia.png
-%%DATADIR%%/flags/rwanda-shield.png
-%%DATADIR%%/flags/rwanda.png
-%%DATADIR%%/flags/ryukyu-shield.png
-%%DATADIR%%/flags/ryukyu.png
-%%DATADIR%%/flags/sapmi-shield.png
-%%DATADIR%%/flags/sapmi.png
-%%DATADIR%%/flags/scotland-shield.png
-%%DATADIR%%/flags/scotland.png
-%%DATADIR%%/flags/serbia-shield.png
-%%DATADIR%%/flags/serbia.png
-%%DATADIR%%/flags/silesia-shield.png
-%%DATADIR%%/flags/silesia.png
-%%DATADIR%%/flags/singapore-shield.png
-%%DATADIR%%/flags/singapore.png
-%%DATADIR%%/flags/slovakia-shield.png
-%%DATADIR%%/flags/slovakia.png
-%%DATADIR%%/flags/slovenia-shield.png
-%%DATADIR%%/flags/slovenia.png
-%%DATADIR%%/flags/south_africa-shield.png
-%%DATADIR%%/flags/south_africa.png
-%%DATADIR%%/flags/southern_cross-shield.png
-%%DATADIR%%/flags/southern_cross.png
-%%DATADIR%%/flags/soviet-shield.png
-%%DATADIR%%/flags/soviet.png
-%%DATADIR%%/flags/spain-shield.png
-%%DATADIR%%/flags/spain.png
-%%DATADIR%%/flags/srilanka-shield.png
-%%DATADIR%%/flags/srilanka.png
-%%DATADIR%%/flags/stpatrick-shield.png
-%%DATADIR%%/flags/stpatrick.png
-%%DATADIR%%/flags/sudan-shield.png
-%%DATADIR%%/flags/sudan.png
-%%DATADIR%%/flags/sumeria-shield.png
-%%DATADIR%%/flags/sumeria.png
-%%DATADIR%%/flags/swaziland-shield.png
-%%DATADIR%%/flags/swaziland.png
-%%DATADIR%%/flags/sweden-shield.png
-%%DATADIR%%/flags/sweden.png
-%%DATADIR%%/flags/swiss-shield.png
-%%DATADIR%%/flags/swiss.png
-%%DATADIR%%/flags/syria-shield.png
-%%DATADIR%%/flags/syria.png
-%%DATADIR%%/flags/taiwan-shield.png
-%%DATADIR%%/flags/taiwan.png
-%%DATADIR%%/flags/texas-shield.png
-%%DATADIR%%/flags/texas.png
-%%DATADIR%%/flags/thailand-shield.png
-%%DATADIR%%/flags/thailand.png
-%%DATADIR%%/flags/tibet-shield.png
-%%DATADIR%%/flags/tibet.png
-%%DATADIR%%/flags/tunisia-shield.png
-%%DATADIR%%/flags/tunisia.png
-%%DATADIR%%/flags/turkey-shield.png
-%%DATADIR%%/flags/turkey.png
-%%DATADIR%%/flags/ukraine-shield.png
-%%DATADIR%%/flags/ukraine.png
-%%DATADIR%%/flags/united_kingdom-shield.png
-%%DATADIR%%/flags/united_kingdom.png
-%%DATADIR%%/flags/united_nations-shield.png
-%%DATADIR%%/flags/united_nations.png
-%%DATADIR%%/flags/unknown-shield.png
-%%DATADIR%%/flags/unknown.png
-%%DATADIR%%/flags/usa-shield.png
-%%DATADIR%%/flags/usa.png
-%%DATADIR%%/flags/uyghur-shield.png
-%%DATADIR%%/flags/uyghur.png
-%%DATADIR%%/flags/venezuela-shield.png
-%%DATADIR%%/flags/venezuela.png
-%%DATADIR%%/flags/vietnam-shield.png
-%%DATADIR%%/flags/vietnam.png
-%%DATADIR%%/flags/viking-shield.png
-%%DATADIR%%/flags/viking.png
-%%DATADIR%%/flags/wales-shield.png
-%%DATADIR%%/flags/wales.png
-%%DATADIR%%/flags/westphalia-shield.png
-%%DATADIR%%/flags/westphalia.png
-%%DATADIR%%/flags/zulu-shield.png
-%%DATADIR%%/flags/zulu.png
-%%DATADIR%%/freeciv.rc-2.0
-%%DATADIR%%/helpdata.txt
-%%DATADIR%%/hex2t/grid.png
-%%DATADIR%%/hex2t/grid.spec
-%%DATADIR%%/hex2t/items.png
-%%DATADIR%%/hex2t/items.spec
-%%DATADIR%%/hex2t/overlays.png
-%%DATADIR%%/hex2t/overlays.spec
-%%DATADIR%%/hex2t/select.png
-%%DATADIR%%/hex2t/select.spec
-%%DATADIR%%/hex2t/tiles.png
-%%DATADIR%%/hex2t/tiles.spec
-%%DATADIR%%/hex2t.tilespec
-%%DATADIR%%/isophex/darkness.png
-%%DATADIR%%/isophex/darkness.spec
-%%DATADIR%%/isophex/gold.spec
-%%DATADIR%%/isophex/grid.png
-%%DATADIR%%/isophex/grid.spec
-%%DATADIR%%/isophex/rivers.png
-%%DATADIR%%/isophex/rivers.spec
-%%DATADIR%%/isophex/terrain1.png
-%%DATADIR%%/isophex/terrain1.spec
-%%DATADIR%%/isophex/terrain2.png
-%%DATADIR%%/isophex/terrain2.spec
-%%DATADIR%%/isophex/tiles.png
-%%DATADIR%%/isophex/tiles.spec
-%%DATADIR%%/isophex.tilespec
-%%DATADIR%%/isotrident/cities.png
-%%DATADIR%%/isotrident/cities.spec
-%%DATADIR%%/isotrident/fog.png
-%%DATADIR%%/isotrident/fog.spec
-%%DATADIR%%/isotrident/grid.png
-%%DATADIR%%/isotrident/grid.spec
-%%DATADIR%%/isotrident/morecities.png
-%%DATADIR%%/isotrident/morecities.spec
-%%DATADIR%%/isotrident/nuke.png
-%%DATADIR%%/isotrident/nuke.spec
-%%DATADIR%%/isotrident/select.png
-%%DATADIR%%/isotrident/select.spec
-%%DATADIR%%/isotrident/terrain1.png
-%%DATADIR%%/isotrident/terrain1.spec
-%%DATADIR%%/isotrident/terrain2.png
-%%DATADIR%%/isotrident/terrain2.spec
-%%DATADIR%%/isotrident/tiles.png
-%%DATADIR%%/isotrident/tiles.spec
-%%DATADIR%%/isotrident/unitextras.png
-%%DATADIR%%/isotrident/unitextras.spec
-%%DATADIR%%/isotrident.tilespec
-%%DATADIR%%/misc/buildings.png
-%%DATADIR%%/misc/buildings.spec
-%%DATADIR%%/misc/chiefs.png
-%%DATADIR%%/misc/chiefs.spec
-%%DATADIR%%/misc/citybar.png
-%%DATADIR%%/misc/citybar.spec
-%%DATADIR%%/misc/cityicon.png
-%%DATADIR%%/misc/civicon.png
-%%DATADIR%%/misc/colors.png
-%%DATADIR%%/misc/colors.spec
-%%DATADIR%%/misc/colors.tilespec
-%%DATADIR%%/misc/cursors.png
-%%DATADIR%%/misc/cursors.spec
-%%DATADIR%%/misc/flags.spec
-%%DATADIR%%/misc/icons.spec
-%%DATADIR%%/misc/intro.png
-%%DATADIR%%/misc/overlays.png
-%%DATADIR%%/misc/overlays.spec
-%%DATADIR%%/misc/radar.png
-%%DATADIR%%/misc/shields.spec
-%%DATADIR%%/misc/small.png
-%%DATADIR%%/misc/small.spec
-%%DATADIR%%/misc/space.png
-%%DATADIR%%/misc/space.spec
-%%DATADIR%%/misc/techs.png
-%%DATADIR%%/misc/techs.spec
-%%DATADIR%%/misc/treaty.png
-%%DATADIR%%/misc/treaty.spec
+%%X11%%%%DATADIR%%/flags/aborigines-shield.png
+%%X11%%%%DATADIR%%/flags/aborigines.png
+%%X11%%%%DATADIR%%/flags/afghanistan-shield.png
+%%X11%%%%DATADIR%%/flags/afghanistan.png
+%%X11%%%%DATADIR%%/flags/ainu-shield.png
+%%X11%%%%DATADIR%%/flags/ainu.png
+%%X11%%%%DATADIR%%/flags/akwe-shield.png
+%%X11%%%%DATADIR%%/flags/akwe.png
+%%X11%%%%DATADIR%%/flags/algeria-shield.png
+%%X11%%%%DATADIR%%/flags/algeria.png
+%%X11%%%%DATADIR%%/flags/antarctica-shield.png
+%%X11%%%%DATADIR%%/flags/antarctica.png
+%%X11%%%%DATADIR%%/flags/arab-shield.png
+%%X11%%%%DATADIR%%/flags/arab.png
+%%X11%%%%DATADIR%%/flags/aram-shield.png
+%%X11%%%%DATADIR%%/flags/aram.png
+%%X11%%%%DATADIR%%/flags/argentina-shield.png
+%%X11%%%%DATADIR%%/flags/argentina.png
+%%X11%%%%DATADIR%%/flags/armenia-shield.png
+%%X11%%%%DATADIR%%/flags/armenia.png
+%%X11%%%%DATADIR%%/flags/assyria-shield.png
+%%X11%%%%DATADIR%%/flags/assyria.png
+%%X11%%%%DATADIR%%/flags/australia-shield.png
+%%X11%%%%DATADIR%%/flags/australia.png
+%%X11%%%%DATADIR%%/flags/austria-shield.png
+%%X11%%%%DATADIR%%/flags/austria.png
+%%X11%%%%DATADIR%%/flags/aymara-shield.png
+%%X11%%%%DATADIR%%/flags/aymara.png
+%%X11%%%%DATADIR%%/flags/azerbaijan-shield.png
+%%X11%%%%DATADIR%%/flags/azerbaijan.png
+%%X11%%%%DATADIR%%/flags/aztec-shield.png
+%%X11%%%%DATADIR%%/flags/aztec.png
+%%X11%%%%DATADIR%%/flags/babylon-shield.png
+%%X11%%%%DATADIR%%/flags/babylon.png
+%%X11%%%%DATADIR%%/flags/bangladesh-shield.png
+%%X11%%%%DATADIR%%/flags/bangladesh.png
+%%X11%%%%DATADIR%%/flags/barbarian-shield.png
+%%X11%%%%DATADIR%%/flags/barbarian.png
+%%X11%%%%DATADIR%%/flags/bavarian-shield.png
+%%X11%%%%DATADIR%%/flags/bavarian.png
+%%X11%%%%DATADIR%%/flags/belarus-shield.png
+%%X11%%%%DATADIR%%/flags/belarus.png
+%%X11%%%%DATADIR%%/flags/belgium-shield.png
+%%X11%%%%DATADIR%%/flags/belgium.png
+%%X11%%%%DATADIR%%/flags/boer-shield.png
+%%X11%%%%DATADIR%%/flags/boer.png
+%%X11%%%%DATADIR%%/flags/bosnia-shield.png
+%%X11%%%%DATADIR%%/flags/bosnia.png
+%%X11%%%%DATADIR%%/flags/brasil-shield.png
+%%X11%%%%DATADIR%%/flags/brasil.png
+%%X11%%%%DATADIR%%/flags/brittany-shield.png
+%%X11%%%%DATADIR%%/flags/brittany.png
+%%X11%%%%DATADIR%%/flags/bulgaria-shield.png
+%%X11%%%%DATADIR%%/flags/bulgaria.png
+%%X11%%%%DATADIR%%/flags/burgundy-shield.png
+%%X11%%%%DATADIR%%/flags/burgundy.png
+%%X11%%%%DATADIR%%/flags/burundi-shield.png
+%%X11%%%%DATADIR%%/flags/burundi.png
+%%X11%%%%DATADIR%%/flags/byzantium-shield.png
+%%X11%%%%DATADIR%%/flags/byzantium.png
+%%X11%%%%DATADIR%%/flags/canada-shield.png
+%%X11%%%%DATADIR%%/flags/canada.png
+%%X11%%%%DATADIR%%/flags/cartago-shield.png
+%%X11%%%%DATADIR%%/flags/cartago.png
+%%X11%%%%DATADIR%%/flags/catalan-shield.png
+%%X11%%%%DATADIR%%/flags/catalan.png
+%%X11%%%%DATADIR%%/flags/cheyenne-shield.png
+%%X11%%%%DATADIR%%/flags/cheyenne.png
+%%X11%%%%DATADIR%%/flags/chile-shield.png
+%%X11%%%%DATADIR%%/flags/chile.png
+%%X11%%%%DATADIR%%/flags/china-shield.png
+%%X11%%%%DATADIR%%/flags/china.png
+%%X11%%%%DATADIR%%/flags/chola-shield.png
+%%X11%%%%DATADIR%%/flags/chola.png
+%%X11%%%%DATADIR%%/flags/colombia-shield.png
+%%X11%%%%DATADIR%%/flags/colombia.png
+%%X11%%%%DATADIR%%/flags/constantine-shield.png
+%%X11%%%%DATADIR%%/flags/constantine.png
+%%X11%%%%DATADIR%%/flags/cornwall-shield.png
+%%X11%%%%DATADIR%%/flags/cornwall.png
+%%X11%%%%DATADIR%%/flags/croatia-shield.png
+%%X11%%%%DATADIR%%/flags/croatia.png
+%%X11%%%%DATADIR%%/flags/cuba-shield.png
+%%X11%%%%DATADIR%%/flags/cuba.png
+%%X11%%%%DATADIR%%/flags/czech-shield.png
+%%X11%%%%DATADIR%%/flags/czech.png
+%%X11%%%%DATADIR%%/flags/denmark-shield.png
+%%X11%%%%DATADIR%%/flags/denmark.png
+%%X11%%%%DATADIR%%/flags/dominica-shield.png
+%%X11%%%%DATADIR%%/flags/dominica.png
+%%X11%%%%DATADIR%%/flags/egypt-shield.png
+%%X11%%%%DATADIR%%/flags/egypt.png
+%%X11%%%%DATADIR%%/flags/egypt_ancient-shield.png
+%%X11%%%%DATADIR%%/flags/egypt_ancient.png
+%%X11%%%%DATADIR%%/flags/england-shield.png
+%%X11%%%%DATADIR%%/flags/england.png
+%%X11%%%%DATADIR%%/flags/esperanto-shield.png
+%%X11%%%%DATADIR%%/flags/esperanto.png
+%%X11%%%%DATADIR%%/flags/estonia-shield.png
+%%X11%%%%DATADIR%%/flags/estonia.png
+%%X11%%%%DATADIR%%/flags/ethiopia-shield.png
+%%X11%%%%DATADIR%%/flags/ethiopia.png
+%%X11%%%%DATADIR%%/flags/europe-shield.png
+%%X11%%%%DATADIR%%/flags/europe.png
+%%X11%%%%DATADIR%%/flags/euskadi-shield.png
+%%X11%%%%DATADIR%%/flags/euskadi.png
+%%X11%%%%DATADIR%%/flags/finland-shield.png
+%%X11%%%%DATADIR%%/flags/finland.png
+%%X11%%%%DATADIR%%/flags/france-shield.png
+%%X11%%%%DATADIR%%/flags/france.png
+%%X11%%%%DATADIR%%/flags/france_old-shield.png
+%%X11%%%%DATADIR%%/flags/france_old.png
+%%X11%%%%DATADIR%%/flags/galicia-shield.png
+%%X11%%%%DATADIR%%/flags/galicia.png
+%%X11%%%%DATADIR%%/flags/gaul-shield.png
+%%X11%%%%DATADIR%%/flags/gaul.png
+%%X11%%%%DATADIR%%/flags/georgia-shield.png
+%%X11%%%%DATADIR%%/flags/georgia.png
+%%X11%%%%DATADIR%%/flags/germany-shield.png
+%%X11%%%%DATADIR%%/flags/germany.png
+%%X11%%%%DATADIR%%/flags/greece-shield.png
+%%X11%%%%DATADIR%%/flags/greece.png
+%%X11%%%%DATADIR%%/flags/greece_ancient-shield.png
+%%X11%%%%DATADIR%%/flags/greece_ancient.png
+%%X11%%%%DATADIR%%/flags/greenland-shield.png
+%%X11%%%%DATADIR%%/flags/greenland.png
+%%X11%%%%DATADIR%%/flags/gupta-shield.png
+%%X11%%%%DATADIR%%/flags/gupta.png
+%%X11%%%%DATADIR%%/flags/hacker-shield.png
+%%X11%%%%DATADIR%%/flags/hacker.png
+%%X11%%%%DATADIR%%/flags/hawaii-shield.png
+%%X11%%%%DATADIR%%/flags/hawaii.png
+%%X11%%%%DATADIR%%/flags/himyar-shield.png
+%%X11%%%%DATADIR%%/flags/himyar.png
+%%X11%%%%DATADIR%%/flags/hittite-shield.png
+%%X11%%%%DATADIR%%/flags/hittite.png
+%%X11%%%%DATADIR%%/flags/hopi-shield.png
+%%X11%%%%DATADIR%%/flags/hopi.png
+%%X11%%%%DATADIR%%/flags/hungary-shield.png
+%%X11%%%%DATADIR%%/flags/hungary.png
+%%X11%%%%DATADIR%%/flags/iceland-shield.png
+%%X11%%%%DATADIR%%/flags/iceland.png
+%%X11%%%%DATADIR%%/flags/illyria-shield.png
+%%X11%%%%DATADIR%%/flags/illyria.png
+%%X11%%%%DATADIR%%/flags/inca-shield.png
+%%X11%%%%DATADIR%%/flags/inca.png
+%%X11%%%%DATADIR%%/flags/india-shield.png
+%%X11%%%%DATADIR%%/flags/india.png
+%%X11%%%%DATADIR%%/flags/indonesia-shield.png
+%%X11%%%%DATADIR%%/flags/indonesia.png
+%%X11%%%%DATADIR%%/flags/innu-shield.png
+%%X11%%%%DATADIR%%/flags/innu.png
+%%X11%%%%DATADIR%%/flags/iran-shield.png
+%%X11%%%%DATADIR%%/flags/iran.png
+%%X11%%%%DATADIR%%/flags/iran_ancient-shield.png
+%%X11%%%%DATADIR%%/flags/iran_ancient.png
+%%X11%%%%DATADIR%%/flags/iraq-shield.png
+%%X11%%%%DATADIR%%/flags/iraq.png
+%%X11%%%%DATADIR%%/flags/iraq_old-shield.png
+%%X11%%%%DATADIR%%/flags/iraq_old.png
+%%X11%%%%DATADIR%%/flags/ireland-shield.png
+%%X11%%%%DATADIR%%/flags/ireland.png
+%%X11%%%%DATADIR%%/flags/iroquois-shield.png
+%%X11%%%%DATADIR%%/flags/iroquois.png
+%%X11%%%%DATADIR%%/flags/israel-shield.png
+%%X11%%%%DATADIR%%/flags/israel.png
+%%X11%%%%DATADIR%%/flags/italy-shield.png
+%%X11%%%%DATADIR%%/flags/italy.png
+%%X11%%%%DATADIR%%/flags/japan-shield.png
+%%X11%%%%DATADIR%%/flags/japan.png
+%%X11%%%%DATADIR%%/flags/jbonai-shield.png
+%%X11%%%%DATADIR%%/flags/jbonai.png
+%%X11%%%%DATADIR%%/flags/kampuchea-shield.png
+%%X11%%%%DATADIR%%/flags/kampuchea.png
+%%X11%%%%DATADIR%%/flags/kanem-bornu-shield.png
+%%X11%%%%DATADIR%%/flags/kanem-bornu.png
+%%X11%%%%DATADIR%%/flags/kazakhstan-shield.png
+%%X11%%%%DATADIR%%/flags/kazakhstan.png
+%%X11%%%%DATADIR%%/flags/keetoowah-shield.png
+%%X11%%%%DATADIR%%/flags/keetoowah.png
+%%X11%%%%DATADIR%%/flags/kenya-shield.png
+%%X11%%%%DATADIR%%/flags/kenya.png
+%%X11%%%%DATADIR%%/flags/khwarezm-shield.png
+%%X11%%%%DATADIR%%/flags/khwarezm.png
+%%X11%%%%DATADIR%%/flags/kongo-shield.png
+%%X11%%%%DATADIR%%/flags/kongo.png
+%%X11%%%%DATADIR%%/flags/korea-shield.png
+%%X11%%%%DATADIR%%/flags/korea.png
+%%X11%%%%DATADIR%%/flags/korea_ancient-shield.png
+%%X11%%%%DATADIR%%/flags/korea_ancient.png
+%%X11%%%%DATADIR%%/flags/kurd-shield.png
+%%X11%%%%DATADIR%%/flags/kurd.png
+%%X11%%%%DATADIR%%/flags/kyrgyzstan-shield.png
+%%X11%%%%DATADIR%%/flags/kyrgyzstan.png
+%%X11%%%%DATADIR%%/flags/laos-shield.png
+%%X11%%%%DATADIR%%/flags/laos.png
+%%X11%%%%DATADIR%%/flags/latvia-shield.png
+%%X11%%%%DATADIR%%/flags/latvia.png
+%%X11%%%%DATADIR%%/flags/libya-shield.png
+%%X11%%%%DATADIR%%/flags/libya.png
+%%X11%%%%DATADIR%%/flags/lithuania-shield.png
+%%X11%%%%DATADIR%%/flags/lithuania.png
+%%X11%%%%DATADIR%%/flags/macedonia-shield.png
+%%X11%%%%DATADIR%%/flags/macedonia.png
+%%X11%%%%DATADIR%%/flags/madagascar-shield.png
+%%X11%%%%DATADIR%%/flags/madagascar.png
+%%X11%%%%DATADIR%%/flags/majapahit-shield.png
+%%X11%%%%DATADIR%%/flags/majapahit.png
+%%X11%%%%DATADIR%%/flags/malaysia-shield.png
+%%X11%%%%DATADIR%%/flags/malaysia.png
+%%X11%%%%DATADIR%%/flags/mali-shield.png
+%%X11%%%%DATADIR%%/flags/mali.png
+%%X11%%%%DATADIR%%/flags/maori-shield.png
+%%X11%%%%DATADIR%%/flags/maori.png
+%%X11%%%%DATADIR%%/flags/mapuche-shield.png
+%%X11%%%%DATADIR%%/flags/mapuche.png
+%%X11%%%%DATADIR%%/flags/mars-shield.png
+%%X11%%%%DATADIR%%/flags/mars.png
+%%X11%%%%DATADIR%%/flags/maya-shield.png
+%%X11%%%%DATADIR%%/flags/maya.png
+%%X11%%%%DATADIR%%/flags/mexico-shield.png
+%%X11%%%%DATADIR%%/flags/mexico.png
+%%X11%%%%DATADIR%%/flags/moldova-shield.png
+%%X11%%%%DATADIR%%/flags/moldova.png
+%%X11%%%%DATADIR%%/flags/mongolia-shield.png
+%%X11%%%%DATADIR%%/flags/mongolia.png
+%%X11%%%%DATADIR%%/flags/muskogee-shield.png
+%%X11%%%%DATADIR%%/flags/muskogee.png
+%%X11%%%%DATADIR%%/flags/myanmar-shield.png
+%%X11%%%%DATADIR%%/flags/myanmar.png
+%%X11%%%%DATADIR%%/flags/nato-shield.png
+%%X11%%%%DATADIR%%/flags/nato.png
+%%X11%%%%DATADIR%%/flags/netherlands-shield.png
+%%X11%%%%DATADIR%%/flags/netherlands.png
+%%X11%%%%DATADIR%%/flags/newzealand-shield.png
+%%X11%%%%DATADIR%%/flags/newzealand.png
+%%X11%%%%DATADIR%%/flags/nigeria-shield.png
+%%X11%%%%DATADIR%%/flags/nigeria.png
+%%X11%%%%DATADIR%%/flags/normandy-shield.png
+%%X11%%%%DATADIR%%/flags/normandy.png
+%%X11%%%%DATADIR%%/flags/north_korea-shield.png
+%%X11%%%%DATADIR%%/flags/north_korea.png
+%%X11%%%%DATADIR%%/flags/norway-shield.png
+%%X11%%%%DATADIR%%/flags/norway.png
+%%X11%%%%DATADIR%%/flags/nubia-shield.png
+%%X11%%%%DATADIR%%/flags/nubia.png
+%%X11%%%%DATADIR%%/flags/numidia-shield.png
+%%X11%%%%DATADIR%%/flags/numidia.png
+%%X11%%%%DATADIR%%/flags/nuu-chah-nulth-shield.png
+%%X11%%%%DATADIR%%/flags/nuu-chah-nulth.png
+%%X11%%%%DATADIR%%/flags/ottoman-shield.png
+%%X11%%%%DATADIR%%/flags/ottoman.png
+%%X11%%%%DATADIR%%/flags/pakistan-shield.png
+%%X11%%%%DATADIR%%/flags/pakistan.png
+%%X11%%%%DATADIR%%/flags/palmyra-shield.png
+%%X11%%%%DATADIR%%/flags/palmyra.png
+%%X11%%%%DATADIR%%/flags/papua_newguinea-shield.png
+%%X11%%%%DATADIR%%/flags/papua_newguinea.png
+%%X11%%%%DATADIR%%/flags/peru-shield.png
+%%X11%%%%DATADIR%%/flags/peru.png
+%%X11%%%%DATADIR%%/flags/philippines-shield.png
+%%X11%%%%DATADIR%%/flags/philippines.png
+%%X11%%%%DATADIR%%/flags/phoenicia-shield.png
+%%X11%%%%DATADIR%%/flags/phoenicia.png
+%%X11%%%%DATADIR%%/flags/pirate-shield.png
+%%X11%%%%DATADIR%%/flags/pirate.png
+%%X11%%%%DATADIR%%/flags/poland-shield.png
+%%X11%%%%DATADIR%%/flags/poland.png
+%%X11%%%%DATADIR%%/flags/polynesian-shield.png
+%%X11%%%%DATADIR%%/flags/polynesian.png
+%%X11%%%%DATADIR%%/flags/portugal-shield.png
+%%X11%%%%DATADIR%%/flags/portugal.png
+%%X11%%%%DATADIR%%/flags/prussia-shield.png
+%%X11%%%%DATADIR%%/flags/prussia.png
+%%X11%%%%DATADIR%%/flags/purhepecha-shield.png
+%%X11%%%%DATADIR%%/flags/purhepecha.png
+%%X11%%%%DATADIR%%/flags/qing-shield.png
+%%X11%%%%DATADIR%%/flags/qing.png
+%%X11%%%%DATADIR%%/flags/quebec-shield.png
+%%X11%%%%DATADIR%%/flags/quebec.png
+%%X11%%%%DATADIR%%/flags/romania-shield.png
+%%X11%%%%DATADIR%%/flags/romania.png
+%%X11%%%%DATADIR%%/flags/rome-shield.png
+%%X11%%%%DATADIR%%/flags/rome.png
+%%X11%%%%DATADIR%%/flags/russia-shield.png
+%%X11%%%%DATADIR%%/flags/russia.png
+%%X11%%%%DATADIR%%/flags/rwanda-shield.png
+%%X11%%%%DATADIR%%/flags/rwanda.png
+%%X11%%%%DATADIR%%/flags/ryukyu-shield.png
+%%X11%%%%DATADIR%%/flags/ryukyu.png
+%%X11%%%%DATADIR%%/flags/samogitia-shield.png
+%%X11%%%%DATADIR%%/flags/samogitia.png
+%%X11%%%%DATADIR%%/flags/sapmi-shield.png
+%%X11%%%%DATADIR%%/flags/sapmi.png
+%%X11%%%%DATADIR%%/flags/saxony-shield.png
+%%X11%%%%DATADIR%%/flags/saxony.png
+%%X11%%%%DATADIR%%/flags/scotland-shield.png
+%%X11%%%%DATADIR%%/flags/scotland.png
+%%X11%%%%DATADIR%%/flags/serbia-shield.png
+%%X11%%%%DATADIR%%/flags/serbia.png
+%%X11%%%%DATADIR%%/flags/silesia-shield.png
+%%X11%%%%DATADIR%%/flags/silesia.png
+%%X11%%%%DATADIR%%/flags/singapore-shield.png
+%%X11%%%%DATADIR%%/flags/singapore.png
+%%X11%%%%DATADIR%%/flags/slovakia-shield.png
+%%X11%%%%DATADIR%%/flags/slovakia.png
+%%X11%%%%DATADIR%%/flags/slovenia-shield.png
+%%X11%%%%DATADIR%%/flags/slovenia.png
+%%X11%%%%DATADIR%%/flags/south_africa-shield.png
+%%X11%%%%DATADIR%%/flags/south_africa.png
+%%X11%%%%DATADIR%%/flags/southern_cross-shield.png
+%%X11%%%%DATADIR%%/flags/southern_cross.png
+%%X11%%%%DATADIR%%/flags/soviet-shield.png
+%%X11%%%%DATADIR%%/flags/soviet.png
+%%X11%%%%DATADIR%%/flags/spain-shield.png
+%%X11%%%%DATADIR%%/flags/spain.png
+%%X11%%%%DATADIR%%/flags/srilanka-shield.png
+%%X11%%%%DATADIR%%/flags/srilanka.png
+%%X11%%%%DATADIR%%/flags/srivijaya-shield.png
+%%X11%%%%DATADIR%%/flags/srivijaya.png
+%%X11%%%%DATADIR%%/flags/stpatrick-shield.png
+%%X11%%%%DATADIR%%/flags/stpatrick.png
+%%X11%%%%DATADIR%%/flags/sudan-shield.png
+%%X11%%%%DATADIR%%/flags/sudan.png
+%%X11%%%%DATADIR%%/flags/sumeria-shield.png
+%%X11%%%%DATADIR%%/flags/sumeria.png
+%%X11%%%%DATADIR%%/flags/swaziland-shield.png
+%%X11%%%%DATADIR%%/flags/swaziland.png
+%%X11%%%%DATADIR%%/flags/sweden-shield.png
+%%X11%%%%DATADIR%%/flags/sweden.png
+%%X11%%%%DATADIR%%/flags/swiss-shield.png
+%%X11%%%%DATADIR%%/flags/swiss.png
+%%X11%%%%DATADIR%%/flags/syria-shield.png
+%%X11%%%%DATADIR%%/flags/syria.png
+%%X11%%%%DATADIR%%/flags/taino-shield.png
+%%X11%%%%DATADIR%%/flags/taino.png
+%%X11%%%%DATADIR%%/flags/tairona-shield.png
+%%X11%%%%DATADIR%%/flags/tairona.png
+%%X11%%%%DATADIR%%/flags/taiwan-shield.png
+%%X11%%%%DATADIR%%/flags/taiwan.png
+%%X11%%%%DATADIR%%/flags/tajikistan-shield.png
+%%X11%%%%DATADIR%%/flags/tajikistan.png
+%%X11%%%%DATADIR%%/flags/templar-shield.png
+%%X11%%%%DATADIR%%/flags/templar.png
+%%X11%%%%DATADIR%%/flags/texas-shield.png
+%%X11%%%%DATADIR%%/flags/texas.png
+%%X11%%%%DATADIR%%/flags/thailand-shield.png
+%%X11%%%%DATADIR%%/flags/thailand.png
+%%X11%%%%DATADIR%%/flags/thrace-shield.png
+%%X11%%%%DATADIR%%/flags/thrace.png
+%%X11%%%%DATADIR%%/flags/tibet-shield.png
+%%X11%%%%DATADIR%%/flags/tibet.png
+%%X11%%%%DATADIR%%/flags/tocharian-shield.png
+%%X11%%%%DATADIR%%/flags/tocharian.png
+%%X11%%%%DATADIR%%/flags/tunisia-shield.png
+%%X11%%%%DATADIR%%/flags/tunisia.png
+%%X11%%%%DATADIR%%/flags/tupi-shield.png
+%%X11%%%%DATADIR%%/flags/tupi.png
+%%X11%%%%DATADIR%%/flags/turkey-shield.png
+%%X11%%%%DATADIR%%/flags/turkey.png
+%%X11%%%%DATADIR%%/flags/turkmenistan-shield.png
+%%X11%%%%DATADIR%%/flags/turkmenistan.png
+%%X11%%%%DATADIR%%/flags/uae-shield.png
+%%X11%%%%DATADIR%%/flags/uae.png
+%%X11%%%%DATADIR%%/flags/ukraine-shield.png
+%%X11%%%%DATADIR%%/flags/ukraine.png
+%%X11%%%%DATADIR%%/flags/united_kingdom-shield.png
+%%X11%%%%DATADIR%%/flags/united_kingdom.png
+%%X11%%%%DATADIR%%/flags/united_nations-shield.png
+%%X11%%%%DATADIR%%/flags/united_nations.png
+%%X11%%%%DATADIR%%/flags/unknown-shield.png
+%%X11%%%%DATADIR%%/flags/unknown.png
+%%X11%%%%DATADIR%%/flags/uruguay-shield.png
+%%X11%%%%DATADIR%%/flags/uruguay.png
+%%X11%%%%DATADIR%%/flags/usa-shield.png
+%%X11%%%%DATADIR%%/flags/usa.png
+%%X11%%%%DATADIR%%/flags/uyghur-shield.png
+%%X11%%%%DATADIR%%/flags/uyghur.png
+%%X11%%%%DATADIR%%/flags/uzbekistan-shield.png
+%%X11%%%%DATADIR%%/flags/uzbekistan.png
+%%X11%%%%DATADIR%%/flags/venezuela-shield.png
+%%X11%%%%DATADIR%%/flags/venezuela.png
+%%X11%%%%DATADIR%%/flags/vietnam-shield.png
+%%X11%%%%DATADIR%%/flags/vietnam.png
+%%X11%%%%DATADIR%%/flags/viking-shield.png
+%%X11%%%%DATADIR%%/flags/viking.png
+%%X11%%%%DATADIR%%/flags/wales-shield.png
+%%X11%%%%DATADIR%%/flags/wales.png
+%%X11%%%%DATADIR%%/flags/westphalia-shield.png
+%%X11%%%%DATADIR%%/flags/westphalia.png
+%%X11%%%%DATADIR%%/flags/zulu-shield.png
+%%X11%%%%DATADIR%%/flags/zulu.png
+%%X11%%%%DATADIR%%/freeciv.rc-2.0
+%%X11%%%%DATADIR%%/gtk_menus.xml
+%%X11%%%%DATADIR%%/helpdata.txt
+%%X11%%%%DATADIR%%/hex2t/grid.png
+%%X11%%%%DATADIR%%/hex2t/grid.spec
+%%X11%%%%DATADIR%%/hex2t/items.png
+%%X11%%%%DATADIR%%/hex2t/items.spec
+%%X11%%%%DATADIR%%/hex2t/overlays.png
+%%X11%%%%DATADIR%%/hex2t/overlays.spec
+%%X11%%%%DATADIR%%/hex2t/select.png
+%%X11%%%%DATADIR%%/hex2t/select.spec
+%%X11%%%%DATADIR%%/hex2t/tiles.png
+%%X11%%%%DATADIR%%/hex2t/tiles.spec
+%%X11%%%%DATADIR%%/hex2t.tilespec
+%%X11%%%%DATADIR%%/isophex/darkness.png
+%%X11%%%%DATADIR%%/isophex/darkness.spec
+%%X11%%%%DATADIR%%/isophex/gold.spec
+%%X11%%%%DATADIR%%/isophex/grid.png
+%%X11%%%%DATADIR%%/isophex/grid.spec
+%%X11%%%%DATADIR%%/isophex/rivers.png
+%%X11%%%%DATADIR%%/isophex/rivers.spec
+%%X11%%%%DATADIR%%/isophex/terrain1.png
+%%X11%%%%DATADIR%%/isophex/terrain1.spec
+%%X11%%%%DATADIR%%/isophex/terrain2.png
+%%X11%%%%DATADIR%%/isophex/terrain2.spec
+%%X11%%%%DATADIR%%/isophex/tiles.png
+%%X11%%%%DATADIR%%/isophex/tiles.spec
+%%X11%%%%DATADIR%%/isophex/water.png
+%%X11%%%%DATADIR%%/isophex/water.spec
+%%X11%%%%DATADIR%%/isophex.tilespec
+%%X11%%%%DATADIR%%/isotrident/cities.png
+%%X11%%%%DATADIR%%/isotrident/cities.spec
+%%X11%%%%DATADIR%%/isotrident/fog.png
+%%X11%%%%DATADIR%%/isotrident/fog.spec
+%%X11%%%%DATADIR%%/isotrident/grid.png
+%%X11%%%%DATADIR%%/isotrident/grid.spec
+%%X11%%%%DATADIR%%/isotrident/morecities.png
+%%X11%%%%DATADIR%%/isotrident/morecities.spec
+%%X11%%%%DATADIR%%/isotrident/nuke.png
+%%X11%%%%DATADIR%%/isotrident/nuke.spec
+%%X11%%%%DATADIR%%/isotrident/select.png
+%%X11%%%%DATADIR%%/isotrident/select.spec
+%%X11%%%%DATADIR%%/isotrident/terrain1.png
+%%X11%%%%DATADIR%%/isotrident/terrain1.spec
+%%X11%%%%DATADIR%%/isotrident/terrain2.png
+%%X11%%%%DATADIR%%/isotrident/terrain2.spec
+%%X11%%%%DATADIR%%/isotrident/tiles.png
+%%X11%%%%DATADIR%%/isotrident/tiles.spec
+%%X11%%%%DATADIR%%/isotrident/unitextras.png
+%%X11%%%%DATADIR%%/isotrident/unitextras.spec
+%%X11%%%%DATADIR%%/isotrident/water.png
+%%X11%%%%DATADIR%%/isotrident/water.spec
+%%X11%%%%DATADIR%%/isotrident.tilespec
+%%X11%%%%DATADIR%%/misc/buildings.png
+%%X11%%%%DATADIR%%/misc/buildings.spec
+%%X11%%%%DATADIR%%/misc/chiefs.png
+%%X11%%%%DATADIR%%/misc/chiefs.spec
+%%X11%%%%DATADIR%%/misc/citybar.png
+%%X11%%%%DATADIR%%/misc/citybar.spec
+%%X11%%%%DATADIR%%/misc/cityicon.png
+%%X11%%%%DATADIR%%/misc/civicon.png
+%%X11%%%%DATADIR%%/misc/colors.png
+%%X11%%%%DATADIR%%/misc/colors.spec
+%%X11%%%%DATADIR%%/misc/colors.tilespec
+%%X11%%%%DATADIR%%/misc/cursors.png
+%%X11%%%%DATADIR%%/misc/cursors.spec
+%%X11%%%%DATADIR%%/misc/editor.png
+%%X11%%%%DATADIR%%/misc/editor.spec
+%%X11%%%%DATADIR%%/misc/flags.spec
+%%X11%%%%DATADIR%%/misc/icons.spec
+%%X11%%%%DATADIR%%/misc/intro.png
+%%X11%%%%DATADIR%%/misc/overlays.png
+%%X11%%%%DATADIR%%/misc/overlays.spec
+%%X11%%%%DATADIR%%/misc/radar.png
+%%X11%%%%DATADIR%%/misc/shields.spec
+%%X11%%%%DATADIR%%/misc/small.png
+%%X11%%%%DATADIR%%/misc/small.spec
+%%X11%%%%DATADIR%%/misc/space.png
+%%X11%%%%DATADIR%%/misc/space.spec
+%%X11%%%%DATADIR%%/misc/techs.png
+%%X11%%%%DATADIR%%/misc/techs.spec
+%%X11%%%%DATADIR%%/misc/treaty.png
+%%X11%%%%DATADIR%%/misc/treaty.spec
 %%DATADIR%%/nation/aborigines.ruleset
 %%DATADIR%%/nation/afghani.ruleset
+%%DATADIR%%/nation/ainu.ruleset
+%%DATADIR%%/nation/akwe.ruleset
 %%DATADIR%%/nation/algerian.ruleset
 %%DATADIR%%/nation/american.ruleset
 %%DATADIR%%/nation/antarctican.ruleset
@@ -480,36 +607,51 @@ share/applications/freeciv.desktop
 %%DATADIR%%/nation/assyrian.ruleset
 %%DATADIR%%/nation/australian.ruleset
 %%DATADIR%%/nation/austrian.ruleset
+%%DATADIR%%/nation/aymara.ruleset
+%%DATADIR%%/nation/azeri.ruleset
 %%DATADIR%%/nation/aztec.ruleset
 %%DATADIR%%/nation/babylonian.ruleset
 %%DATADIR%%/nation/barbarian.ruleset
+%%DATADIR%%/nation/basque.ruleset
 %%DATADIR%%/nation/bavarian.ruleset
+%%DATADIR%%/nation/belarusian.ruleset
 %%DATADIR%%/nation/belgian.ruleset
 %%DATADIR%%/nation/bengali.ruleset
 %%DATADIR%%/nation/boer.ruleset
 %%DATADIR%%/nation/bosnia.ruleset
 %%DATADIR%%/nation/brazilian.ruleset
+%%DATADIR%%/nation/breton.ruleset
 %%DATADIR%%/nation/british.ruleset
 %%DATADIR%%/nation/bulgarian.ruleset
+%%DATADIR%%/nation/burgundian.ruleset
 %%DATADIR%%/nation/burmese.ruleset
+%%DATADIR%%/nation/burundi.ruleset
 %%DATADIR%%/nation/byzantium.ruleset
+%%DATADIR%%/nation/cambodian.ruleset
 %%DATADIR%%/nation/canadian.ruleset
 %%DATADIR%%/nation/carthaginian.ruleset
 %%DATADIR%%/nation/catalan.ruleset
+%%DATADIR%%/nation/cherokee.ruleset
 %%DATADIR%%/nation/chilean.ruleset
 %%DATADIR%%/nation/chinese.ruleset
+%%DATADIR%%/nation/chola.ruleset
 %%DATADIR%%/nation/colombian.ruleset
 %%DATADIR%%/nation/confederate.ruleset
 %%DATADIR%%/nation/cornish.ruleset
+%%DATADIR%%/nation/cree.ruleset
 %%DATADIR%%/nation/croatian.ruleset
 %%DATADIR%%/nation/cuban.ruleset
 %%DATADIR%%/nation/czech.ruleset
 %%DATADIR%%/nation/danish.ruleset
+%%DATADIR%%/nation/dominican.ruleset
 %%DATADIR%%/nation/dutch.ruleset
 %%DATADIR%%/nation/egyptian.ruleset
+%%DATADIR%%/nation/emirati.ruleset
 %%DATADIR%%/nation/english.ruleset
+%%DATADIR%%/nation/esperant.ruleset
 %%DATADIR%%/nation/estonian.ruleset
 %%DATADIR%%/nation/ethiopian.ruleset
+%%DATADIR%%/nation/european.ruleset
 %%DATADIR%%/nation/filipino.ruleset
 %%DATADIR%%/nation/finnish.ruleset
 %%DATADIR%%/nation/french.ruleset
@@ -518,8 +660,13 @@ share/applications/freeciv.desktop
 %%DATADIR%%/nation/georgian.ruleset
 %%DATADIR%%/nation/german.ruleset
 %%DATADIR%%/nation/greek.ruleset
+%%DATADIR%%/nation/gupta.ruleset
+%%DATADIR%%/nation/hacker.ruleset
+%%DATADIR%%/nation/hawaiian.ruleset
 %%DATADIR%%/nation/hellenic.ruleset
+%%DATADIR%%/nation/himyarite.ruleset
 %%DATADIR%%/nation/hittite.ruleset
+%%DATADIR%%/nation/hopi.ruleset
 %%DATADIR%%/nation/hungarian.ruleset
 %%DATADIR%%/nation/icelandic.ruleset
 %%DATADIR%%/nation/illyrian.ruleset
@@ -527,43 +674,69 @@ share/applications/freeciv.desktop
 %%DATADIR%%/nation/indian.ruleset
 %%DATADIR%%/nation/indonesian.ruleset
 %%DATADIR%%/nation/inuit.ruleset
+%%DATADIR%%/nation/iranian.ruleset
 %%DATADIR%%/nation/iraqi.ruleset
 %%DATADIR%%/nation/irish.ruleset
 %%DATADIR%%/nation/iroquois.ruleset
 %%DATADIR%%/nation/israeli.ruleset
 %%DATADIR%%/nation/italian.ruleset
 %%DATADIR%%/nation/japanese.ruleset
-%%DATADIR%%/nation/kampuchean.ruleset
+%%DATADIR%%/nation/kanem-bornu.ruleset
+%%DATADIR%%/nation/kazakh.ruleset
 %%DATADIR%%/nation/kenyan.ruleset
+%%DATADIR%%/nation/khwarezmian.ruleset
+%%DATADIR%%/nation/kongo.ruleset
 %%DATADIR%%/nation/korean.ruleset
+%%DATADIR%%/nation/kurd.ruleset
+%%DATADIR%%/nation/kyrgyz.ruleset
 %%DATADIR%%/nation/lankese.ruleset
+%%DATADIR%%/nation/laotian.ruleset
 %%DATADIR%%/nation/latvian.ruleset
 %%DATADIR%%/nation/libyan.ruleset
 %%DATADIR%%/nation/lithuanian.ruleset
+%%DATADIR%%/nation/lojbanistani.ruleset
+%%DATADIR%%/nation/majapahit.ruleset
 %%DATADIR%%/nation/malagasy.ruleset
 %%DATADIR%%/nation/malaysian.ruleset
 %%DATADIR%%/nation/malian.ruleset
 %%DATADIR%%/nation/manchu.ruleset
 %%DATADIR%%/nation/maori.ruleset
+%%DATADIR%%/nation/mapuche.ruleset
 %%DATADIR%%/nation/martian.ruleset
 %%DATADIR%%/nation/mayan.ruleset
 %%DATADIR%%/nation/mexican.ruleset
+%%DATADIR%%/nation/moldovan.ruleset
 %%DATADIR%%/nation/mongol.ruleset
+%%DATADIR%%/nation/muskogee.ruleset
 %%DATADIR%%/nation/newzealand.ruleset
 %%DATADIR%%/nation/nigerian.ruleset
+%%DATADIR%%/nation/norman.ruleset
+%%DATADIR%%/nation/northkorean.ruleset
 %%DATADIR%%/nation/norwegian.ruleset
+%%DATADIR%%/nation/nubian.ruleset
+%%DATADIR%%/nation/numidian.ruleset
+%%DATADIR%%/nation/nuu-chah-nulth.ruleset
 %%DATADIR%%/nation/ottoman.ruleset
+%%DATADIR%%/nation/pakistani.ruleset
 %%DATADIR%%/nation/papuan.ruleset
 %%DATADIR%%/nation/persian.ruleset
+%%DATADIR%%/nation/peruvian.ruleset
 %%DATADIR%%/nation/phoenician.ruleset
+%%DATADIR%%/nation/pirate.ruleset
 %%DATADIR%%/nation/polish.ruleset
+%%DATADIR%%/nation/polynesian.ruleset
 %%DATADIR%%/nation/portuguese.ruleset
+%%DATADIR%%/nation/prussian.ruleset
+%%DATADIR%%/nation/purhepecha.ruleset
 %%DATADIR%%/nation/quebecois.ruleset
 %%DATADIR%%/nation/roman.ruleset
 %%DATADIR%%/nation/romanian.ruleset
 %%DATADIR%%/nation/russian.ruleset
+%%DATADIR%%/nation/rwandan.ruleset
 %%DATADIR%%/nation/ryukyuan.ruleset
 %%DATADIR%%/nation/sami.ruleset
+%%DATADIR%%/nation/samogitian.ruleset
+%%DATADIR%%/nation/saxon.ruleset
 %%DATADIR%%/nation/scottish.ruleset
 %%DATADIR%%/nation/serbian.ruleset
 %%DATADIR%%/nation/silesian.ruleset
@@ -572,21 +745,35 @@ share/applications/freeciv.desktop
 %%DATADIR%%/nation/slovakian.ruleset
 %%DATADIR%%/nation/slovenian.ruleset
 %%DATADIR%%/nation/southafrican.ruleset
+%%DATADIR%%/nation/southkorean.ruleset
 %%DATADIR%%/nation/soviet.ruleset
 %%DATADIR%%/nation/spanish.ruleset
+%%DATADIR%%/nation/srivijaya.ruleset
 %%DATADIR%%/nation/sudanese.ruleset
 %%DATADIR%%/nation/sumerian.ruleset
 %%DATADIR%%/nation/swazi.ruleset
 %%DATADIR%%/nation/swedish.ruleset
 %%DATADIR%%/nation/swiss.ruleset
+%%DATADIR%%/nation/syrian.ruleset
+%%DATADIR%%/nation/taino.ruleset
+%%DATADIR%%/nation/tairona.ruleset
 %%DATADIR%%/nation/taiwanese.ruleset
+%%DATADIR%%/nation/tajik.ruleset
+%%DATADIR%%/nation/templar.ruleset
 %%DATADIR%%/nation/texan.ruleset
 %%DATADIR%%/nation/thai.ruleset
+%%DATADIR%%/nation/thracian.ruleset
 %%DATADIR%%/nation/tibetan.ruleset
+%%DATADIR%%/nation/tocharian.ruleset
 %%DATADIR%%/nation/tunisian.ruleset
+%%DATADIR%%/nation/tupi.ruleset
 %%DATADIR%%/nation/turk.ruleset
+%%DATADIR%%/nation/turkmen.ruleset
 %%DATADIR%%/nation/ukrainian.ruleset
+%%DATADIR%%/nation/un.ruleset
+%%DATADIR%%/nation/uruguayan.ruleset
 %%DATADIR%%/nation/uyghur.ruleset
+%%DATADIR%%/nation/uzbek.ruleset
 %%DATADIR%%/nation/venezuelan.ruleset
 %%DATADIR%%/nation/vietnamese.ruleset
 %%DATADIR%%/nation/viking.ruleset
@@ -597,272 +784,312 @@ share/applications/freeciv.desktop
 %%DATADIR%%/scenario/earth-160x90-v2.sav.gz
 %%DATADIR%%/scenario/earth-80x50-v2.sav.gz
 %%DATADIR%%/scenario/europe-200x100-v2.sav.gz
+%%DATADIR%%/scenario/france-140x90-v2.sav.gz
 %%DATADIR%%/scenario/hagworld-120x60-v1.2.sav.gz
 %%DATADIR%%/scenario/iberian-peninsula-136x100-v1.0.sav.gz
+%%DATADIR%%/scenario/italy-100x100-v1.5.sav.gz
+%%DATADIR%%/scenario/japan-88x100-v1.3.sav.gz
+%%DATADIR%%/scenario/north_america_116x100-v1.2.sav.gz
 %%DATADIR%%/scenario/tutorial.sav.gz
-%%DATADIR%%/stdsounds/LrgCan.ogg
-%%DATADIR%%/stdsounds/LrgExpl.ogg
-%%DATADIR%%/stdsounds/MedCan.ogg
-%%DATADIR%%/stdsounds/MgBar1.ogg
-%%DATADIR%%/stdsounds/MgBar2.ogg
-%%DATADIR%%/stdsounds/MgHeavy.ogg
-%%DATADIR%%/stdsounds/Mortar.ogg
-%%DATADIR%%/stdsounds/SmlExpl.ogg
-%%DATADIR%%/stdsounds/Splash.ogg
-%%DATADIR%%/stdsounds/THover.ogg
-%%DATADIR%%/stdsounds/Tread.ogg
-%%DATADIR%%/stdsounds/foot3.ogg
-%%DATADIR%%/stdsounds/inh2o.ogg
-%%DATADIR%%/stdsounds/metbrk.ogg
-%%DATADIR%%/stdsounds/wall01.ogg
-%%DATADIR%%/stdsounds/woodbrk.ogg
-%%DATADIR%%/stdsounds.soundspec
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/arrow-down.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/arrow-left.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/arrow-right-norm.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/arrow-right-prelight.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/arrow-right.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/arrow-up.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/button-default.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/button-insensitive.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/button-normal.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/button-prelight.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/button-pressed.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/check1.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/check2.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/check3.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/check4.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/checklight.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/highlight.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/option1.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/option2.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/option3.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/option4.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/combo-arrow-insens.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/combo-arrow-prelight.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/combo-arrow.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/combo-inactive.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/combo-normal.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/combo-prelight.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/frame-gap-end.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/frame-gap-start.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/frame1.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/frame2.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/handle-h.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/handle-v.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/line-h.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/line-v.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/list_header-insens.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/list_header-prelight.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/list_header-pressed.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/list_header.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/menu-overlay.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/menu.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/menubar-item.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/menubar.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/menuitem.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/menuline.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/focus.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/null.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/ruler.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/panel-bg.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/panelbutton1.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/panelbutton2.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/panelbutton3.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/panelbutton4.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/progressbar-horiz-1.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/progressbar-horiz-2.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/progressbar-horiz.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/t-progressbar-horiz-2.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/t-progressbar-horiz.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/t-progressbar-vert.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/null.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/slider-horiz-prelight.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/slider-horiz.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/slider-vert-prelight.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/slider-vert.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/trough-horizontal.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/trough-vertical.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/scroll-thumb-horiz.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/scroll-thumb-vert.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/slider-horiz-insens.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/slider-horiz-prelight.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/slider-horiz.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/slider-vert-insens.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/slider-vert-prelight.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/slider-vert.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-down-insens.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-down-prelight.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-down.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-left-insens.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-left-prelight.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-left.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-right-insens.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-right-prelight.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-right.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-up-insens.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-up-prelight.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-up.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/trough-scrollbar-vert.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/entry-shadow-in.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/shadow-etched-out.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/shadow-in.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/shadow-none.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/shadow-out.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/text-entry.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/text.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/spin-down-disable.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/spin-down-prelight.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/spin-down.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/spin-up-disable.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/spin-up-prelight.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/spin-up.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/spin.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/notebook.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/null.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-bottom-active.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-bottom.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-left-active.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-left.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-right-active.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-right.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-top-active.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-top.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/toolbar.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/toolbutton-normal.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/toolbutton-prelight.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/toolbutton-pressed.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/toolbutton-toggled.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/bg.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/gtkrc
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/menubar.rc
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/panel.rc
-%%DATADIR%%/trident/auto_ll.spec
-%%DATADIR%%/trident/cities.png
-%%DATADIR%%/trident/cities.spec
-%%DATADIR%%/trident/explosions.png
-%%DATADIR%%/trident/explosions.spec
-%%DATADIR%%/trident/fog.png
-%%DATADIR%%/trident/fog.spec
-%%DATADIR%%/trident/grid.png
-%%DATADIR%%/trident/grid.spec
-%%DATADIR%%/trident/roads.png
-%%DATADIR%%/trident/roads.spec
-%%DATADIR%%/trident/select.png
-%%DATADIR%%/trident/select.spec
-%%DATADIR%%/trident/tiles.png
-%%DATADIR%%/trident/tiles.spec
-%%DATADIR%%/trident/units.png
-%%DATADIR%%/trident/units.spec
-%%DATADIR%%/trident.tilespec
-%%DATADIR%%/wonders/apollo_program.png
-%%DATADIR%%/wonders/asmiths_trading_co.png
-%%DATADIR%%/wonders/colossus.png
-%%DATADIR%%/wonders/copernicus_observatory.png
-%%DATADIR%%/wonders/cure_for_cancer.png
-%%DATADIR%%/wonders/darwins_voyage.png
-%%DATADIR%%/wonders/eiffel_tower.png
-%%DATADIR%%/wonders/great_library.png
-%%DATADIR%%/wonders/great_wall.png
-%%DATADIR%%/wonders/hanging_gardens.png
-%%DATADIR%%/wonders/hoover_dam.png
-%%DATADIR%%/wonders/isaac_newtons_college.png
-%%DATADIR%%/wonders/js_bachs_cathedral.png
-%%DATADIR%%/wonders/king_richards_crusade.png
-%%DATADIR%%/wonders/leonardos_workshop.png
-%%DATADIR%%/wonders/lighthouse.png
-%%DATADIR%%/wonders/magellans_expedition.png
-%%DATADIR%%/wonders/manhattan_project.png
-%%DATADIR%%/wonders/marco_polos_embassy.png
-%%DATADIR%%/wonders/michelangelos_chapel.png
-%%DATADIR%%/wonders/oracle.png
-%%DATADIR%%/wonders/pyramids.png
-%%DATADIR%%/wonders/seti_program.png
-%%DATADIR%%/wonders/shakespeares_theatre.png
-%%DATADIR%%/wonders/statue_of_liberty.png
-%%DATADIR%%/wonders/sun_tzus_war_academy.png
-%%DATADIR%%/wonders/united_nations.png
-%%DATADIR%%/wonders/womens_suffrage.png
-share/icons/hicolor/128x128/apps/freeciv-client.png
+%%X11%%%%DATADIR%%/stdsounds/foot3.ogg
+%%X11%%%%DATADIR%%/stdsounds/inh2o.ogg
+%%X11%%%%DATADIR%%/stdsounds/LrgCan.ogg
+%%X11%%%%DATADIR%%/stdsounds/LrgExpl.ogg
+%%X11%%%%DATADIR%%/stdsounds/MedCan.ogg
+%%X11%%%%DATADIR%%/stdsounds/metbrk.ogg
+%%X11%%%%DATADIR%%/stdsounds/MgBar1.ogg
+%%X11%%%%DATADIR%%/stdsounds/MgBar2.ogg
+%%X11%%%%DATADIR%%/stdsounds/MgHeavy.ogg
+%%X11%%%%DATADIR%%/stdsounds/Mortar.ogg
+%%X11%%%%DATADIR%%/stdsounds/SmlExpl.ogg
+%%X11%%%%DATADIR%%/stdsounds/Splash.ogg
+%%X11%%%%DATADIR%%/stdsounds/THover.ogg
+%%X11%%%%DATADIR%%/stdsounds/Tread.ogg
+%%X11%%%%DATADIR%%/stdsounds/wall01.ogg
+%%X11%%%%DATADIR%%/stdsounds/woodbrk.ogg
+%%X11%%%%DATADIR%%/stdsounds.soundspec
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/arrow-down.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/arrow-left.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/arrow-right-norm.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/arrow-right-prelight.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/arrow-right.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/arrow-up.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/button-default.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/button-insensitive.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/button-normal.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/button-prelight.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/button-pressed.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/check1.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/check2.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/check3.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/check4.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/checklight.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/highlight.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/option1.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/option2.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/option3.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/option4.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/combo-arrow-insens.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/combo-arrow-prelight.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/combo-arrow.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/combo-inactive.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/combo-normal.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/combo-prelight.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/frame-gap-end.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/frame-gap-start.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/frame1.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/frame2.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/handle-h.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/handle-v.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/line-h.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/line-v.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/list_header-insens.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/list_header-prelight.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/list_header-pressed.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/list_header.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/menu-overlay.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/menu.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/menubar-item.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/menubar.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/menuitem.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/menuline.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/focus.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/null.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/ruler.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/panel-bg.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/panelbutton1.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/panelbutton2.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/panelbutton3.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/panelbutton4.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/progressbar-horiz-1.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/progressbar-horiz-2.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/progressbar-horiz.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/t-progressbar-horiz-2.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/t-progressbar-horiz.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/t-progressbar-vert.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/null.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/slider-horiz-prelight.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/slider-horiz.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/slider-vert-prelight.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/slider-vert.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/trough-horizontal.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/trough-vertical.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/scroll-thumb-horiz.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/scroll-thumb-vert.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/slider-horiz-insens.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/slider-horiz-prelight.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/slider-horiz.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/slider-vert-insens.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/slider-vert-prelight.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/slider-vert.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-down-insens.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-down-prelight.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-down.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-left-insens.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-left-prelight.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-left.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-right-insens.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-right-prelight.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-right.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-up-insens.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-up-prelight.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-up.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/trough-scrollbar-vert.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/entry-shadow-in.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/shadow-etched-out.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/shadow-in.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/shadow-none.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/shadow-out.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/text-entry.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/text.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/spin-down-disable.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/spin-down-prelight.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/spin-down.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/spin-up-disable.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/spin-up-prelight.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/spin-up.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/spin.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/notebook.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/null.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-bottom-active.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-bottom.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-left-active.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-left.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-right-active.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-right.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-top-active.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-top.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/toolbar.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/bg.png
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/gtkrc
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/menubar.rc
+%%GTK%%%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/panel.rc
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/COPYING.DejaVu
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/COPYING.UnDotum
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/COPYING.fireflysung
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/COPYING.sazanami
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/DejaVuSans.ttf
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/UnDotum.ttf
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/backgrounds.themespec
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/bg.png
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/bg2.png
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/city.png
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/city.spec
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/city_fist.png
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/city_fist.spec
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/colors.themespec
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/dip_icons.png
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/dip_icons.spec
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/fireflysung.ttf
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/icons.png
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/icons.spec
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/intro.png
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/options_bg.png
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/sazanami-gothic.ttf
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/small_theme_buttons.png
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/small_theme_buttons.spec
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/tech_tree.png
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/tech_tree.spec
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/theme.themespec
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/theme_boxs.png
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/theme_boxs.spec
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/theme_buttons.png
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/theme_buttons.spec
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/theme_orders_buttons.png
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/theme_orders_buttons.spec
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/theme_scrolls.png
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/theme_scrolls.spec
+%%SDL%%%%DATADIR%%/themes/gui-sdl/human/world.png
+%%X11%%%%DATADIR%%/trident/auto_ll.spec
+%%X11%%%%DATADIR%%/trident/cities.png
+%%X11%%%%DATADIR%%/trident/cities.spec
+%%X11%%%%DATADIR%%/trident/earth.png
+%%X11%%%%DATADIR%%/trident/earth.spec
+%%X11%%%%DATADIR%%/trident/explosions.png
+%%X11%%%%DATADIR%%/trident/explosions.spec
+%%X11%%%%DATADIR%%/trident/fog.png
+%%X11%%%%DATADIR%%/trident/fog.spec
+%%X11%%%%DATADIR%%/trident/grid.png
+%%X11%%%%DATADIR%%/trident/grid.spec
+%%X11%%%%DATADIR%%/trident/roads.png
+%%X11%%%%DATADIR%%/trident/roads.spec
+%%X11%%%%DATADIR%%/trident/select.png
+%%X11%%%%DATADIR%%/trident/select.spec
+%%X11%%%%DATADIR%%/trident/tiles.png
+%%X11%%%%DATADIR%%/trident/tiles.spec
+%%X11%%%%DATADIR%%/trident/units.png
+%%X11%%%%DATADIR%%/trident/units.spec
+%%X11%%%%DATADIR%%/trident.tilespec
+%%X11%%%%DATADIR%%/wonders/apollo_program.png
+%%X11%%%%DATADIR%%/wonders/asmiths_trading_co.png
+%%X11%%%%DATADIR%%/wonders/colossus.png
+%%X11%%%%DATADIR%%/wonders/copernicus_observatory.png
+%%X11%%%%DATADIR%%/wonders/cure_for_cancer.png
+%%X11%%%%DATADIR%%/wonders/darwins_voyage.png
+%%X11%%%%DATADIR%%/wonders/eiffel_tower.png
+%%X11%%%%DATADIR%%/wonders/great_library.png
+%%X11%%%%DATADIR%%/wonders/great_wall.png
+%%X11%%%%DATADIR%%/wonders/hanging_gardens.png
+%%X11%%%%DATADIR%%/wonders/hoover_dam.png
+%%X11%%%%DATADIR%%/wonders/isaac_newtons_college.png
+%%X11%%%%DATADIR%%/wonders/js_bachs_cathedral.png
+%%X11%%%%DATADIR%%/wonders/king_richards_crusade.png
+%%X11%%%%DATADIR%%/wonders/leonardos_workshop.png
+%%X11%%%%DATADIR%%/wonders/lighthouse.png
+%%X11%%%%DATADIR%%/wonders/magellans_expedition.png
+%%X11%%%%DATADIR%%/wonders/manhattan_project.png
+%%X11%%%%DATADIR%%/wonders/marco_polos_embassy.png
+%%X11%%%%DATADIR%%/wonders/michelangelos_chapel.png
+%%X11%%%%DATADIR%%/wonders/oracle.png
+%%X11%%%%DATADIR%%/wonders/pyramids.png
+%%X11%%%%DATADIR%%/wonders/seti_program.png
+%%X11%%%%DATADIR%%/wonders/shakespeares_theatre.png
+%%X11%%%%DATADIR%%/wonders/statue_of_liberty.png
+%%X11%%%%DATADIR%%/wonders/sun_tzus_war_academy.png
+%%X11%%%%DATADIR%%/wonders/united_nations.png
+%%X11%%%%DATADIR%%/wonders/womens_suffrage.png
+%%X11%%share/icons/hicolor/128x128/apps/freeciv-client.png
+%%X11%%share/icons/hicolor/16x16/apps/freeciv-client.png
+%%X11%%share/icons/hicolor/32x32/apps/freeciv-client.png
+%%X11%%share/icons/hicolor/48x48/apps/freeciv-client.png
+%%X11%%share/icons/hicolor/64x64/apps/freeciv-client.png
 share/icons/hicolor/128x128/apps/freeciv-server.png
-share/icons/hicolor/16x16/apps/freeciv-client.png
 share/icons/hicolor/16x16/apps/freeciv-server.png
-share/icons/hicolor/32x32/apps/freeciv-client.png
 share/icons/hicolor/32x32/apps/freeciv-server.png
-share/icons/hicolor/48x48/apps/freeciv-client.png
 share/icons/hicolor/48x48/apps/freeciv-server.png
-share/icons/hicolor/64x64/apps/freeciv-client.png
 share/icons/hicolor/64x64/apps/freeciv-server.png
-share/locale/ar/LC_MESSAGES/freeciv.mo
-share/locale/ca/LC_MESSAGES/freeciv.mo
-share/locale/cs/LC_MESSAGES/freeciv.mo
-share/locale/da/LC_MESSAGES/freeciv.mo
-share/locale/de/LC_MESSAGES/freeciv.mo
-share/locale/el/LC_MESSAGES/freeciv.mo
-share/locale/eo/LC_MESSAGES/freeciv.mo
-share/locale/en_GB/LC_MESSAGES/freeciv.mo
-share/locale/es/LC_MESSAGES/freeciv.mo
-share/locale/et/LC_MESSAGES/freeciv.mo
-share/locale/fa/LC_MESSAGES/freeciv.mo
-share/locale/fi/LC_MESSAGES/freeciv.mo
-share/locale/fr/LC_MESSAGES/freeciv.mo
-share/locale/he/LC_MESSAGES/freeciv.mo
-share/locale/hu/LC_MESSAGES/freeciv.mo
-share/locale/it/LC_MESSAGES/freeciv.mo
-share/locale/ja/LC_MESSAGES/freeciv.mo
-share/locale/ko/LC_MESSAGES/freeciv.mo
-share/locale/lt/LC_MESSAGES/freeciv.mo
-share/locale/nb/LC_MESSAGES/freeciv.mo
-share/locale/nl/LC_MESSAGES/freeciv.mo
-share/locale/no/LC_MESSAGES/freeciv.mo
-share/locale/pl/LC_MESSAGES/freeciv.mo
-share/locale/pt/LC_MESSAGES/freeciv.mo
-share/locale/pt_BR/LC_MESSAGES/freeciv.mo
-share/locale/ro/LC_MESSAGES/freeciv.mo
-share/locale/ru/LC_MESSAGES/freeciv.mo
-share/locale/sv/LC_MESSAGES/freeciv.mo
-share/locale/tr/LC_MESSAGES/freeciv.mo
-share/locale/uk/LC_MESSAGES/freeciv.mo
-share/locale/zh_CN/LC_MESSAGES/freeciv.mo
-share/pixmaps/freeciv-client.png
-@dirrm %%DATADIR%%/amplio
-@dirrm %%DATADIR%%/buildings
+%%NLS%%share/locale/ar/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/da/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/de/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/el/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/es/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/et/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/he/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/it/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/no/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/freeciv.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/freeciv.mo
+%%X11%%share/pixmaps/freeciv-client.png
+%%X11%%@dirrm %%DATADIR%%/amplio
+%%X11%%@dirrm %%DATADIR%%/buildings
 @dirrm %%DATADIR%%/civ1
 @dirrm %%DATADIR%%/civ2
 @dirrm %%DATADIR%%/default
-@dirrm %%DATADIR%%/flags
-@dirrm %%DATADIR%%/hex2t
-@dirrm %%DATADIR%%/isophex
-@dirrm %%DATADIR%%/isotrident
-@dirrm %%DATADIR%%/misc
+%%X11%%@dirrm %%DATADIR%%/flags
+%%X11%%@dirrm %%DATADIR%%/hex2t
+%%X11%%@dirrm %%DATADIR%%/isophex
+%%X11%%@dirrm %%DATADIR%%/isotrident
+%%X11%%@dirrm %%DATADIR%%/misc
 @dirrm %%DATADIR%%/nation
 @dirrm %%DATADIR%%/scenario
-@dirrm %%DATADIR%%/stdsounds
-@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows
-@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons
-@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio
-@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo
-@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap
-@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles
-@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines
-@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders
-@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar
-@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others
-@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel
-@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar
-@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range
-@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars
-@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows
-@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin
-@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs
-@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar
-@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0
-@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv
-@dirrm %%DATADIR%%/themes/gui-gtk-2.0
-@dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%/trident
-@dirrm %%DATADIR%%/wonders
-@dirrm %%DATADIR%%
+%%X11%%@dirrm %%DATADIR%%/stdsounds
+%%GTK%%@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows
+%%GTK%%@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons
+%%GTK%%@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio
+%%GTK%%@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo
+%%GTK%%@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap
+%%GTK%%@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles
+%%GTK%%@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines
+%%GTK%%@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders
+%%GTK%%@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar
+%%GTK%%@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others
+%%GTK%%@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel
+%%GTK%%@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar
+%%GTK%%@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range
+%%GTK%%@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars
+%%GTK%%@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows
+%%GTK%%@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin
+%%GTK%%@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs
+%%GTK%%@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar
+%%GTK%%@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0
+%%GTK%%@dirrm %%DATADIR%%/themes/gui-gtk-2.0/Freeciv
+%%GTK%%@dirrm %%DATADIR%%/themes/gui-gtk-2.0
+%%SDL%%@dirrm %%DATADIR%%/themes/gui-sdl/human
+%%SDL%%@dirrm %%DATADIR%%/themes/gui-sdl
+%%X11%%@dirrm %%DATADIR%%/themes
+%%X11%%@dirrm %%DATADIR%%/trident
+%%X11%%@dirrm %%DATADIR%%/wonders
+@dirrmtry %%DATADIR%%
 @dirrmtry share/applications
diff --git a/games/freeciv/pkg-plist.nox11 b/games/freeciv/pkg-plist.nox11
deleted file mode 100644
index 8d397d56416b..000000000000
--- a/games/freeciv/pkg-plist.nox11
+++ /dev/null
@@ -1,206 +0,0 @@
-bin/civserver
-share/applications/freeciv-server.desktop
-%%DATADIR%%/civ1/buildings.ruleset
-%%DATADIR%%/civ1/effects.ruleset
-%%DATADIR%%/civ1/game.ruleset
-%%DATADIR%%/civ1/governments.ruleset
-%%DATADIR%%/civ1/nations.ruleset
-%%DATADIR%%/civ1/techs.ruleset
-%%DATADIR%%/civ1/terrain.ruleset
-%%DATADIR%%/civ1/units.ruleset
-%%DATADIR%%/civ1.serv
-%%DATADIR%%/civ2/buildings.ruleset
-%%DATADIR%%/civ2/cities.ruleset
-%%DATADIR%%/civ2/effects.ruleset
-%%DATADIR%%/civ2/game.ruleset
-%%DATADIR%%/civ2/governments.ruleset
-%%DATADIR%%/civ2/techs.ruleset
-%%DATADIR%%/civ2/terrain.ruleset
-%%DATADIR%%/civ2/units.ruleset
-%%DATADIR%%/civ2.serv
-%%DATADIR%%/default/buildings.ruleset
-%%DATADIR%%/default/cities.ruleset
-%%DATADIR%%/default/effects.ruleset
-%%DATADIR%%/default/game.ruleset
-%%DATADIR%%/default/governments.ruleset
-%%DATADIR%%/default/nations.ruleset
-%%DATADIR%%/default/script.lua
-%%DATADIR%%/default/techs.ruleset
-%%DATADIR%%/default/terrain.ruleset
-%%DATADIR%%/default/units.ruleset
-%%DATADIR%%/default.serv
-%%DATADIR%%/nation/aborigines.ruleset
-%%DATADIR%%/nation/afghani.ruleset
-%%DATADIR%%/nation/algerian.ruleset
-%%DATADIR%%/nation/american.ruleset
-%%DATADIR%%/nation/antarctican.ruleset
-%%DATADIR%%/nation/arab.ruleset
-%%DATADIR%%/nation/aramean.ruleset
-%%DATADIR%%/nation/argentine.ruleset
-%%DATADIR%%/nation/armenian.ruleset
-%%DATADIR%%/nation/assyrian.ruleset
-%%DATADIR%%/nation/australian.ruleset
-%%DATADIR%%/nation/austrian.ruleset
-%%DATADIR%%/nation/aztec.ruleset
-%%DATADIR%%/nation/babylonian.ruleset
-%%DATADIR%%/nation/barbarian.ruleset
-%%DATADIR%%/nation/bavarian.ruleset
-%%DATADIR%%/nation/belgian.ruleset
-%%DATADIR%%/nation/bengali.ruleset
-%%DATADIR%%/nation/boer.ruleset
-%%DATADIR%%/nation/bosnia.ruleset
-%%DATADIR%%/nation/brazilian.ruleset
-%%DATADIR%%/nation/british.ruleset
-%%DATADIR%%/nation/bulgarian.ruleset
-%%DATADIR%%/nation/burmese.ruleset
-%%DATADIR%%/nation/byzantium.ruleset
-%%DATADIR%%/nation/canadian.ruleset
-%%DATADIR%%/nation/carthaginian.ruleset
-%%DATADIR%%/nation/catalan.ruleset
-%%DATADIR%%/nation/chilean.ruleset
-%%DATADIR%%/nation/chinese.ruleset
-%%DATADIR%%/nation/colombian.ruleset
-%%DATADIR%%/nation/confederate.ruleset
-%%DATADIR%%/nation/cornish.ruleset
-%%DATADIR%%/nation/croatian.ruleset
-%%DATADIR%%/nation/cuban.ruleset
-%%DATADIR%%/nation/czech.ruleset
-%%DATADIR%%/nation/danish.ruleset
-%%DATADIR%%/nation/dutch.ruleset
-%%DATADIR%%/nation/egyptian.ruleset
-%%DATADIR%%/nation/english.ruleset
-%%DATADIR%%/nation/estonian.ruleset
-%%DATADIR%%/nation/ethiopian.ruleset
-%%DATADIR%%/nation/filipino.ruleset
-%%DATADIR%%/nation/finnish.ruleset
-%%DATADIR%%/nation/french.ruleset
-%%DATADIR%%/nation/galician.ruleset
-%%DATADIR%%/nation/gallic.ruleset
-%%DATADIR%%/nation/georgian.ruleset
-%%DATADIR%%/nation/german.ruleset
-%%DATADIR%%/nation/greek.ruleset
-%%DATADIR%%/nation/hellenic.ruleset
-%%DATADIR%%/nation/hittite.ruleset
-%%DATADIR%%/nation/hungarian.ruleset
-%%DATADIR%%/nation/icelandic.ruleset
-%%DATADIR%%/nation/illyrian.ruleset
-%%DATADIR%%/nation/inca.ruleset
-%%DATADIR%%/nation/indian.ruleset
-%%DATADIR%%/nation/indonesian.ruleset
-%%DATADIR%%/nation/inuit.ruleset
-%%DATADIR%%/nation/iraqi.ruleset
-%%DATADIR%%/nation/irish.ruleset
-%%DATADIR%%/nation/iroquois.ruleset
-%%DATADIR%%/nation/israeli.ruleset
-%%DATADIR%%/nation/italian.ruleset
-%%DATADIR%%/nation/japanese.ruleset
-%%DATADIR%%/nation/kampuchean.ruleset
-%%DATADIR%%/nation/kenyan.ruleset
-%%DATADIR%%/nation/korean.ruleset
-%%DATADIR%%/nation/lankese.ruleset
-%%DATADIR%%/nation/latvian.ruleset
-%%DATADIR%%/nation/libyan.ruleset
-%%DATADIR%%/nation/lithuanian.ruleset
-%%DATADIR%%/nation/malagasy.ruleset
-%%DATADIR%%/nation/malaysian.ruleset
-%%DATADIR%%/nation/malian.ruleset
-%%DATADIR%%/nation/manchu.ruleset
-%%DATADIR%%/nation/maori.ruleset
-%%DATADIR%%/nation/martian.ruleset
-%%DATADIR%%/nation/mayan.ruleset
-%%DATADIR%%/nation/mexican.ruleset
-%%DATADIR%%/nation/mongol.ruleset
-%%DATADIR%%/nation/newzealand.ruleset
-%%DATADIR%%/nation/nigerian.ruleset
-%%DATADIR%%/nation/norwegian.ruleset
-%%DATADIR%%/nation/ottoman.ruleset
-%%DATADIR%%/nation/papuan.ruleset
-%%DATADIR%%/nation/persian.ruleset
-%%DATADIR%%/nation/phoenician.ruleset
-%%DATADIR%%/nation/polish.ruleset
-%%DATADIR%%/nation/portuguese.ruleset
-%%DATADIR%%/nation/quebecois.ruleset
-%%DATADIR%%/nation/roman.ruleset
-%%DATADIR%%/nation/romanian.ruleset
-%%DATADIR%%/nation/russian.ruleset
-%%DATADIR%%/nation/ryukyuan.ruleset
-%%DATADIR%%/nation/sami.ruleset
-%%DATADIR%%/nation/scottish.ruleset
-%%DATADIR%%/nation/serbian.ruleset
-%%DATADIR%%/nation/silesian.ruleset
-%%DATADIR%%/nation/singaporean.ruleset
-%%DATADIR%%/nation/sioux.ruleset
-%%DATADIR%%/nation/slovakian.ruleset
-%%DATADIR%%/nation/slovenian.ruleset
-%%DATADIR%%/nation/southafrican.ruleset
-%%DATADIR%%/nation/soviet.ruleset
-%%DATADIR%%/nation/spanish.ruleset
-%%DATADIR%%/nation/sudanese.ruleset
-%%DATADIR%%/nation/sumerian.ruleset
-%%DATADIR%%/nation/swazi.ruleset
-%%DATADIR%%/nation/swedish.ruleset
-%%DATADIR%%/nation/swiss.ruleset
-%%DATADIR%%/nation/taiwanese.ruleset
-%%DATADIR%%/nation/texan.ruleset
-%%DATADIR%%/nation/thai.ruleset
-%%DATADIR%%/nation/tibetan.ruleset
-%%DATADIR%%/nation/tunisian.ruleset
-%%DATADIR%%/nation/turk.ruleset
-%%DATADIR%%/nation/ukrainian.ruleset
-%%DATADIR%%/nation/uyghur.ruleset
-%%DATADIR%%/nation/venezuelan.ruleset
-%%DATADIR%%/nation/vietnamese.ruleset
-%%DATADIR%%/nation/viking.ruleset
-%%DATADIR%%/nation/welsh.ruleset
-%%DATADIR%%/nation/westphalian.ruleset
-%%DATADIR%%/nation/zulu.ruleset
-%%DATADIR%%/scenario/british-isles-85x80-v2.80.sav.gz
-%%DATADIR%%/scenario/earth-160x90-v2.sav.gz
-%%DATADIR%%/scenario/earth-80x50-v2.sav.gz
-%%DATADIR%%/scenario/europe-200x100-v2.sav.gz
-%%DATADIR%%/scenario/hagworld-120x60-v1.2.sav.gz
-%%DATADIR%%/scenario/iberian-peninsula-136x100-v1.0.sav.gz
-%%DATADIR%%/scenario/tutorial.sav.gz
-share/icons/hicolor/128x128/apps/freeciv-server.png
-share/icons/hicolor/16x16/apps/freeciv-server.png
-share/icons/hicolor/32x32/apps/freeciv-server.png
-share/icons/hicolor/48x48/apps/freeciv-server.png
-share/icons/hicolor/64x64/apps/freeciv-server.png
-share/locale/ar/LC_MESSAGES/freeciv.mo
-share/locale/ca/LC_MESSAGES/freeciv.mo
-share/locale/cs/LC_MESSAGES/freeciv.mo
-share/locale/da/LC_MESSAGES/freeciv.mo
-share/locale/de/LC_MESSAGES/freeciv.mo
-share/locale/el/LC_MESSAGES/freeciv.mo
-share/locale/en_GB/LC_MESSAGES/freeciv.mo
-share/locale/es/LC_MESSAGES/freeciv.mo
-share/locale/et/LC_MESSAGES/freeciv.mo
-share/locale/eo/LC_MESSAGES/freeciv.mo
-share/locale/fa/LC_MESSAGES/freeciv.mo
-share/locale/fi/LC_MESSAGES/freeciv.mo
-share/locale/fr/LC_MESSAGES/freeciv.mo
-share/locale/he/LC_MESSAGES/freeciv.mo
-share/locale/hu/LC_MESSAGES/freeciv.mo
-share/locale/it/LC_MESSAGES/freeciv.mo
-share/locale/ja/LC_MESSAGES/freeciv.mo
-share/locale/ko/LC_MESSAGES/freeciv.mo
-share/locale/lt/LC_MESSAGES/freeciv.mo
-share/locale/nb/LC_MESSAGES/freeciv.mo
-share/locale/nl/LC_MESSAGES/freeciv.mo
-share/locale/no/LC_MESSAGES/freeciv.mo
-share/locale/pl/LC_MESSAGES/freeciv.mo
-share/locale/pt/LC_MESSAGES/freeciv.mo
-share/locale/pt_BR/LC_MESSAGES/freeciv.mo
-share/locale/ro/LC_MESSAGES/freeciv.mo
-share/locale/ru/LC_MESSAGES/freeciv.mo
-share/locale/sv/LC_MESSAGES/freeciv.mo
-share/locale/tr/LC_MESSAGES/freeciv.mo
-share/locale/uk/LC_MESSAGES/freeciv.mo
-share/locale/zh_CN/LC_MESSAGES/freeciv.mo
-@dirrm %%DATADIR%%/civ1
-@dirrm %%DATADIR%%/civ2
-@dirrm %%DATADIR%%/default
-@dirrm %%DATADIR%%/nation
-@dirrm %%DATADIR%%/scenario
-@dirrm %%DATADIR%%
-@dirrmtry share/applications