Update to Freeciv 2.5. The qt client would be qt5; it is not enabled

in pkgsrc yet.

Upstream ChangeLog is at http://freeciv.wikia.com/wiki/NEWS-2.5.0,
excerpt:
 What's changed since 2.4

 The main changes in Freeciv 2.5 are the inclusion of the 'civ2civ3'
 ruleset, a new Qt client, and much more flexibility for those
 creating their own rulesets. The AI has also had some improvements.

 As is usual for major releases, 2.5 clients cannot interoperate with
 pre-2.5 servers, and vice versa. Pre-2.5 savegames can however be
 loaded into 2.5, and in most cases, the supplied rulesets have not
 changed so much as to make it difficult to complete a game started
 with 2.4.x's rules.

25 files changed, 1377 insertions, 810 deletions

diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile
index 3db008a127b..d2a60a152c0 100644
--- a/games/freeciv-client/Makefile
+++ b/games/freeciv-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.67 2015/04/25 14:22:55 tnn Exp $
+# $NetBSD: Makefile,v 1.68 2015/04/26 19:19:42 spz Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	11
 COMMENT=	Freeciv client
 
 DEPENDS+=	freeciv-share>=${FC_VERS}:../../games/freeciv-share
@@ -9,11 +8,26 @@ DEPENDS+=	freeciv-share>=${FC_VERS}:../../games/freeciv-share
 CONFLICTS=	freeciv-client-gtk<=1.11.4
 
 USE_TOOLS+=		pkg-config
-CONFIGURE_ARGS+=	--disable-make-data
 CONFIGURE_ARGS+=	--disable-server
 
 .include "../../games/freeciv-share/suppress_installation.mk"
 
+SUBST_CLASSES+=			themesonly
+SUBST_STAGE.themesonly=		pre-configure
+SUBST_FILES.themesonly=		data/Makefile.in
+SUBST_SED.themesonly+=		-e 's|SUBDIRS = icons.*|SUBDIRS = themes|'
+SUBST_SED.themesonly+=		-e 's|^	isotrident trident|DONT_SUBDIRS =|'
+SUBST_SED.themesonly+=		-e 's|install-data-am: install-data-local|install-data-am: \# install-data-local|'
+SUBST_MESSAGE.themesonly=	Suppressing installation of non-gui-relevant data
+
+SUBST_CLASSES+=			themesonly2
+SUBST_STAGE.themesonly2=	post-configure
+SUBST_FILES.themesonly2=	data/Makefile
+SUBST_SED.themesonly2+=		-e 's|SUBDIRS = icons.*|SUBDIRS = themes|'
+SUBST_SED.themesonly2+=		-e 's|^	isotrident trident|DONT_SUBDIRS =|'
+SUBST_MESSAGE.themesonly2=	Suppressing installation of non-gui-relevant data
+
+
 .include "../../games/freeciv-share/Makefile.common"
 
 .include "options.mk"
diff --git a/games/freeciv-client/PLIST b/games/freeciv-client/PLIST
deleted file mode 100644
index 6711b94c57f..00000000000
--- a/games/freeciv-client/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2012/07/31 15:49:37 prlw1 Exp $
-bin/freeciv-gtk2
-bin/freeciv-modpack
-share/applications/freeciv-modpack.desktop
-share/applications/freeciv.desktop
diff --git a/games/freeciv-client/PLIST.gtk2 b/games/freeciv-client/PLIST.gtk2
new file mode 100644
index 00000000000..192b5a1cbcf
--- /dev/null
+++ b/games/freeciv-client/PLIST.gtk2
@@ -0,0 +1,125 @@
+@comment $NetBSD: PLIST.gtk2,v 1.1 2015/04/26 19:19:42 spz Exp $
+bin/freeciv-gtk2
+bin/freeciv-mp-gtk2
+share/appdata/freeciv-gtk2.appdata.xml
+share/appdata/freeciv-mp-gtk2.appdata.xml
+share/applications/freeciv-gtk2.desktop
+share/applications/freeciv-mp-gtk2.desktop
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/arrow-down.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/arrow-left.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/arrow-right-norm.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/arrow-right-prelight.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/arrow-right.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/arrow-up.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/button-default.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/button-insensitive.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/button-normal.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/button-prelight.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/button-pressed.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/check1.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/check2.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/check3.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/check4.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/checklight.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/highlight.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/option1.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/option2.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/option3.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/option4.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/combo-arrow-insens.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/combo-arrow-prelight.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/combo-arrow.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/combo-inactive.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/combo-normal.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/combo-prelight.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/frame-gap-end.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/frame-gap-start.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/frame1.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/frame2.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/handle-h.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/handle-v.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/line-h.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/line-v.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/list_header-insens.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/list_header-prelight.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/list_header-pressed.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/list_header.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/menu-overlay.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/menu.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/menubar-item.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/menubar.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/menuitem.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/menuline.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/focus.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/null.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/ruler.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/panel-bg.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/panelbutton1.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/panelbutton2.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/panelbutton3.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/panelbutton4.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/progressbar-horiz-1.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/progressbar-horiz-2.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/progressbar-horiz.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/t-progressbar-horiz-2.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/t-progressbar-horiz.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/t-progressbar-vert.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/null.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/slider-horiz-prelight.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/slider-horiz.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/slider-vert-prelight.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/slider-vert.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/trough-horizontal.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/trough-vertical.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/scroll-thumb-horiz.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/scroll-thumb-vert.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/slider-horiz-insens.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/slider-horiz-prelight.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/slider-horiz.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/slider-vert-insens.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/slider-vert-prelight.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/slider-vert.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-down-insens.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-down-prelight.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-down.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-left-insens.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-left-prelight.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-left.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-right-insens.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-right-prelight.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-right.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-up-insens.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-up-prelight.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper-up.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/stepper.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/trough-scrollbar-vert.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/entry-shadow-in.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/shadow-etched-out.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/shadow-in.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/shadow-none.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/shadow-out.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/text-entry.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/text.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/spin-down-disable.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/spin-down-prelight.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/spin-down.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/spin-up-disable.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/spin-up-prelight.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/spin-up.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/spin.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/notebook.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/null.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-bottom-active.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-bottom.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-left-active.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-left.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-right-active.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-right.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-top-active.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-top.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/toolbar.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/bg.png
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/gtkrc
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/menubar.rc
+share/freeciv/themes/gui-gtk-2.0/Freeciv/gtk-2.0/panel.rc
diff --git a/games/freeciv-client/PLIST.gtk3 b/games/freeciv-client/PLIST.gtk3
new file mode 100644
index 00000000000..5b36ab1390a
--- /dev/null
+++ b/games/freeciv-client/PLIST.gtk3
@@ -0,0 +1,123 @@
+@comment $NetBSD: PLIST.gtk3,v 1.1 2015/04/26 19:19:42 spz Exp $
+bin/freeciv-gtk3
+bin/freeciv-mp-gtk3
+share/appdata/freeciv-gtk3.appdata.xml
+share/appdata/freeciv-mp-gtk3.appdata.xml
+share/applications/freeciv-mp-gtk3.desktop
+share/applications/freeciv.desktop
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Arrows/arrow-down.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Arrows/arrow-left.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Arrows/arrow-right-norm.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Arrows/arrow-right-prelight.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Arrows/arrow-right.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Arrows/arrow-up.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Buttons/button-default.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Buttons/button-insensitive.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Buttons/button-normal.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Buttons/button-prelight.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Buttons/button-pressed.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Check-Radio/check1.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Check-Radio/check2.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Check-Radio/check3.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Check-Radio/check4.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Check-Radio/checklight.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Check-Radio/highlight.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Check-Radio/option1.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Check-Radio/option2.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Check-Radio/option3.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Check-Radio/option4.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Combo/combo-arrow-insens.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Combo/combo-arrow-prelight.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Combo/combo-arrow.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Combo/combo-inactive.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Combo/combo-normal.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Combo/combo-prelight.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Frame-Gap/frame-gap-end.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Frame-Gap/frame-gap-start.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Frame-Gap/frame1.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Frame-Gap/frame2.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Handles/handle-h.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Handles/handle-v.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Lines/line-h.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Lines/line-v.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/ListHeaders/list_header-insens.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/ListHeaders/list_header-prelight.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/ListHeaders/list_header-pressed.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/ListHeaders/list_header.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Menu-Menubar/menu-overlay.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Menu-Menubar/menu.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Menu-Menubar/menubar-item.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Menu-Menubar/menubar.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Menu-Menubar/menuitem.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Menu-Menubar/menuline.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Others/focus.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Others/null.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Others/ruler.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Panel/panel-bg.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Panel/panelbutton1.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Panel/panelbutton2.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Panel/panelbutton3.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Panel/panelbutton4.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/ProgressBar/progressbar-horiz-1.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/ProgressBar/progressbar-horiz-2.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/ProgressBar/progressbar-horiz.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/ProgressBar/t-progressbar-horiz-2.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/ProgressBar/t-progressbar-horiz.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/ProgressBar/t-progressbar-vert.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Range/null.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Range/slider-horiz-prelight.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Range/slider-horiz.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Range/slider-vert-prelight.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Range/slider-vert.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Range/trough-horizontal.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Range/trough-vertical.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Scrollbars/scroll-thumb-horiz.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Scrollbars/scroll-thumb-vert.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Scrollbars/slider-horiz-insens.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Scrollbars/slider-horiz-prelight.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Scrollbars/slider-horiz.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Scrollbars/slider-vert-insens.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Scrollbars/slider-vert-prelight.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Scrollbars/slider-vert.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Scrollbars/stepper-down-insens.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Scrollbars/stepper-down-prelight.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Scrollbars/stepper-down.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Scrollbars/stepper-left-insens.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Scrollbars/stepper-left-prelight.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Scrollbars/stepper-left.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Scrollbars/stepper-right-insens.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Scrollbars/stepper-right-prelight.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Scrollbars/stepper-right.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Scrollbars/stepper-up-insens.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Scrollbars/stepper-up-prelight.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Scrollbars/stepper-up.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Scrollbars/stepper.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Scrollbars/trough-scrollbar-horiz.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Scrollbars/trough-scrollbar-vert.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Shadows/entry-shadow-in.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Shadows/shadow-etched-out.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Shadows/shadow-in.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Shadows/shadow-none.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Shadows/shadow-out.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Shadows/text-entry.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Shadows/text.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Spin/spin-down-disable.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Spin/spin-down-prelight.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Spin/spin-down.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Spin/spin-up-disable.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Spin/spin-up-prelight.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Spin/spin-up.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Spin/spin.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Tabs/null.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Tabs/tab-bottom-active.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Tabs/tab-bottom.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Tabs/tab-left-active.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Tabs/tab-left.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Tabs/tab-right-active.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Tabs/tab-right.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Tabs/tab-top-active.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Tabs/tab-top.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/Toolbar/toolbar.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/bg.png
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/gtk.css
+share/freeciv/themes/gui-gtk-3.0/Freeciv/gtk-3.0/menubar.css
diff --git a/games/freeciv-client/PLIST.sdl b/games/freeciv-client/PLIST.sdl
new file mode 100644
index 00000000000..38e8d69e826
--- /dev/null
+++ b/games/freeciv-client/PLIST.sdl
@@ -0,0 +1,35 @@
+@comment $NetBSD: PLIST.sdl,v 1.1 2015/04/26 19:19:42 spz Exp $
+bin/freeciv-mp-cli
+bin/freeciv-sdl
+share/appdata/freeciv-sdl.appdata.xml
+share/applications/freeciv-sdl.desktop
+share/freeciv/themes/gui-sdl/human/COPYING.DejaVu
+share/freeciv/themes/gui-sdl/human/DejaVuSans.ttf
+share/freeciv/themes/gui-sdl/human/backgrounds.themespec
+share/freeciv/themes/gui-sdl/human/bg.png
+share/freeciv/themes/gui-sdl/human/bg2.png
+share/freeciv/themes/gui-sdl/human/city.png
+share/freeciv/themes/gui-sdl/human/city.spec
+share/freeciv/themes/gui-sdl/human/city_fist.png
+share/freeciv/themes/gui-sdl/human/city_fist.spec
+share/freeciv/themes/gui-sdl/human/colors.themespec
+share/freeciv/themes/gui-sdl/human/dip_icons.png
+share/freeciv/themes/gui-sdl/human/dip_icons.spec
+share/freeciv/themes/gui-sdl/human/icons.png
+share/freeciv/themes/gui-sdl/human/icons.spec
+share/freeciv/themes/gui-sdl/human/intro.png
+share/freeciv/themes/gui-sdl/human/options_bg.png
+share/freeciv/themes/gui-sdl/human/small_theme_buttons.png
+share/freeciv/themes/gui-sdl/human/small_theme_buttons.spec
+share/freeciv/themes/gui-sdl/human/tech_tree.png
+share/freeciv/themes/gui-sdl/human/tech_tree.spec
+share/freeciv/themes/gui-sdl/human/theme.themespec
+share/freeciv/themes/gui-sdl/human/theme_boxs.png
+share/freeciv/themes/gui-sdl/human/theme_boxs.spec
+share/freeciv/themes/gui-sdl/human/theme_buttons.png
+share/freeciv/themes/gui-sdl/human/theme_buttons.spec
+share/freeciv/themes/gui-sdl/human/theme_orders_buttons.png
+share/freeciv/themes/gui-sdl/human/theme_orders_buttons.spec
+share/freeciv/themes/gui-sdl/human/theme_scrolls.png
+share/freeciv/themes/gui-sdl/human/theme_scrolls.spec
+share/freeciv/themes/gui-sdl/human/world.png
diff --git a/games/freeciv-client/PLIST.xaw b/games/freeciv-client/PLIST.xaw
new file mode 100644
index 00000000000..7886c564416
--- /dev/null
+++ b/games/freeciv-client/PLIST.xaw
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.xaw,v 1.1 2015/04/26 19:19:42 spz Exp $
+bin/freeciv-mp-cli
+bin/freeciv-xaw
diff --git a/games/freeciv-client/options.mk b/games/freeciv-client/options.mk
index ea21ef5390a..454bbd677e6 100644
--- a/games/freeciv-client/options.mk
+++ b/games/freeciv-client/options.mk
@@ -1,31 +1,57 @@
-# $NetBSD: options.mk,v 1.6 2009/01/17 22:09:39 shattered Exp $
+# $NetBSD: options.mk,v 1.7 2015/04/26 19:19:42 spz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.freeciv-client
 PKG_OPTIONS_REQUIRED_GROUPS=	backend
-PKG_OPTIONS_GROUP.backend=	gtk2 xaw xaw3d sdl
+#PKG_OPTIONS_GROUP.backend=	gtk2 gtk3 qt5 sdl xaw xaw3d
+PKG_OPTIONS_GROUP.backend=	gtk2 gtk3 sdl xaw xaw3d
 PKG_SUGGESTED_OPTIONS=		gtk2
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgtk2)
 CONFIGURE_ARGS+=	--enable-client=gtk2
+CONFIGURE_ARGS+=	--enable-fcmp=gtk2
 .include "../../x11/gtk2/buildlink3.mk"
+PLIST_SRC=		${PKGDIR}/PLIST.gtk2
 .endif
 
-.if !empty(PKG_OPTIONS:Mxaw)
-CONFIGURE_ARGS+=	--enable-client=xaw
-.include "../../mk/xaw.buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mgtk3)
+CONFIGURE_ARGS+=	--enable-client=gtk3
+CONFIGURE_ARGS+=	--enable-fcmp=gtk3
+.include "../../x11/gtk3/buildlink3.mk"
+PLIST_SRC=		${PKGDIR}/PLIST.gtk3
 .endif
 
-.if !empty(PKG_OPTIONS:Mxaw3d)
-CONFIGURE_ARGS+=	--enable-client=xaw3d
-.include "../../x11/Xaw3d/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mqt5)
+CONFIGURE_ARGS+=	--enable-client=qt
+CONFIGURE_ARGS+=	--enable-fcmp=qt
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+PLIST_SRC=		${PKGDIR}/PLIST.qt
 .endif
 
 .if !empty(PKG_OPTIONS:Msdl)
 CONFIGURE_ARGS+=	--enable-client=sdl
-#CONFIGURE_ARGS+=	--enable-ftwl=sdl
+CONFIGURE_ARGS+=	--enable-fcmp=cli
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
+.include "../../devel/SDL_gfx/buildlink3.mk"
+.include "../../devel/SDL_ttf/buildlink3.mk"
+PLIST_SRC=		${PKGDIR}/PLIST.sdl
+.endif
+
+.if !empty(PKG_OPTIONS:Mxaw)
+CONFIGURE_ARGS+=	--enable-client=xaw
+CONFIGURE_ARGS+=	--enable-fcmp=cli
+CONFIGURE_ARGS+=	--with-xaw
+.include "../../mk/xaw.buildlink3.mk"
+PLIST_SRC=		${PKGDIR}/PLIST.xaw
+.endif
+
+.if !empty(PKG_OPTIONS:Mxaw3d)
+CONFIGURE_ARGS+=	--enable-client=xaw
+CONFIGURE_ARGS+=	--enable-fcmp=cli
+CONFIGURE_ARGS+=	--with-xaw3d
+.include "../../x11/Xaw3d/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
+PLIST_SRC=		${PKGDIR}/PLIST.xaw
 .endif
diff --git a/games/freeciv-server/Makefile b/games/freeciv-server/Makefile
index 23aa9c0c006..851418dc1e6 100644
--- a/games/freeciv-server/Makefile
+++ b/games/freeciv-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2013/08/30 22:34:18 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2015/04/26 19:19:42 spz Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	1
 COMMENT=	Freeciv game server
 
 DEPENDS+=	freeciv-share>=${FC_VERS}:../../games/freeciv-share
@@ -11,9 +10,9 @@ USE_TOOLS+=	automake autoconf
 pre-configure:
 	cd ${WRKSRC} && autoreconf -i
 
+CONFIGURE_ARGS+=	--disable-client
+CONFIGURE_ARGS+=	--disable-fcmp
 CONFIGURE_ARGS+=	--disable-make-data
-CONFIGURE_ARGS+=	--enable-client=no
-CONFIGURE_ARGS+=	--disable-gtktest
 CONFIGURE_ARGS+=	--with-readline
 
 # Uses rl_filename_completion_function() which was introduced in readline-4.2
diff --git a/games/freeciv-server/PLIST b/games/freeciv-server/PLIST
index 0a820f5a627..c7fa5509654 100644
--- a/games/freeciv-server/PLIST
+++ b/games/freeciv-server/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2010/06/21 07:53:14 spz Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/04/26 19:19:42 spz Exp $
 bin/freeciv-server
 lib/libfreeciv-srv.la
+share/appdata/freeciv-server.appdata.xml
 share/applications/freeciv-server.desktop
diff --git a/games/freeciv-share/Makefile b/games/freeciv-share/Makefile
index b8f6eceea91..04e9ce1017f 100644
--- a/games/freeciv-share/Makefile
+++ b/games/freeciv-share/Makefile
@@ -1,13 +1,20 @@
-# $NetBSD: Makefile,v 1.23 2012/10/06 11:54:38 asau Exp $
+# $NetBSD: Makefile,v 1.24 2015/04/26 19:19:42 spz Exp $
 
 PKGNAME=	${DISTNAME:S/-/-share-/}
-PKGREVISION=	1
+#PKGREVISION=	0
 COMMENT=	Machine independent files for Freeciv
 
 .include "../../games/freeciv-share/Makefile.common"
 
 CONFIGURE_ARGS+=	--disable-server
-CONFIGURE_ARGS+=	--enable-client=no
+CONFIGURE_ARGS+=	--disable-fcmp
+CONFIGURE_ARGS+=	--disable-client
 CONFIGURE_ARGS+=	--enable-make-data
 
+SUBST_CLASSES+=			suppressguidata
+SUBST_STAGE.suppressguidata=	pre-configure
+SUBST_FILES.suppressguidata=	data/Makefile.in
+SUBST_SED.suppressguidata=	-e 's|themes wonders|wonders|g'
+SUBST_MESSAGE.suppressguidata=	Suppressing installation of gui themes
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common
index 95ddb4b5187..a4298b6d139 100644
--- a/games/freeciv-share/Makefile.common
+++ b/games/freeciv-share/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.44 2015/03/17 14:05:01 tnn Exp $
+# $NetBSD: Makefile.common,v 1.45 2015/04/26 19:19:42 spz Exp $
 
 # used by games/freeciv-share/Makefile
 # used by games/freeciv-client/Makefile
 # used by games/freeciv-server/Makefile
 
 DISTNAME=	freeciv-${FC_VERS}
-FC_VERS=	2.3.2
+FC_VERS=	2.5.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=freeciv/}
 EXTRACT_SUFX=	.tar.bz2
@@ -38,6 +38,7 @@ SUBST_SED.data+=	-e "s|@CLIENT_GUI_XAW_TRUE@||g"
 SUBST_SED.data+=	-e "s|@CLIENT_GUI_GTK_2_0_TRUE@||g"
 SUBST_MESSAGE.data=	Fixing installation of data files.
 
+.include "../../www/curl/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/games/freeciv-share/PLIST b/games/freeciv-share/PLIST
index c373c4bcd72..0ff336094ff 100644
--- a/games/freeciv-share/PLIST
+++ b/games/freeciv-share/PLIST
@@ -1,11 +1,51 @@
-@comment $NetBSD: PLIST,v 1.12 2012/07/31 15:49:37 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.13 2015/04/26 19:19:42 spz Exp $
+etc/freeciv/database.lua
 lib/libfreeciv.la
 man/man6/freeciv-client.6
 man/man6/freeciv-gtk2.6
+man/man6/freeciv-gtk3.6
+man/man6/freeciv-manual.6
 man/man6/freeciv-modpack.6
+man/man6/freeciv-mp-cli.6
+man/man6/freeciv-mp-gtk2.6
+man/man6/freeciv-mp-gtk3.6
+man/man6/freeciv-mp-qt.6
+man/man6/freeciv-qt.6
 man/man6/freeciv-sdl.6
 man/man6/freeciv-server.6
 man/man6/freeciv-xaw.6
+share/doc/freeciv/ABOUT-NLS
+share/doc/freeciv/AUTHORS
+share/doc/freeciv/BUGS
+share/doc/freeciv/COPYING
+share/doc/freeciv/ChangeLog
+share/doc/freeciv/CodingStyle
+share/doc/freeciv/FAQ
+share/doc/freeciv/HACKING
+share/doc/freeciv/HOWTOPLAY
+share/doc/freeciv/INSTALL
+share/doc/freeciv/INSTALL.Cygwin
+share/doc/freeciv/NEWS
+share/doc/freeciv/NEWS-2.5
+share/doc/freeciv/README.AI
+share/doc/freeciv/README.AI_modules
+share/doc/freeciv/README.SDLClient
+share/doc/freeciv/README.agents
+share/doc/freeciv/README.attributes
+share/doc/freeciv/README.cma
+share/doc/freeciv/README.delta
+share/doc/freeciv/README.effects
+share/doc/freeciv/README.fcdb
+share/doc/freeciv/README.graphics
+share/doc/freeciv/README.nations
+share/doc/freeciv/README.packaging
+share/doc/freeciv/README.ruleset_civ2civ3
+share/doc/freeciv/README.ruleset_experimental
+share/doc/freeciv/README.ruleset_multiplayer
+share/doc/freeciv/README.rulesets
+share/doc/freeciv/README.scorelog
+share/doc/freeciv/README.sound
+share/doc/freeciv/TODO
 share/freeciv/Freeciv
 share/freeciv/amplio2.tilespec
 share/freeciv/amplio2/ancientcities.png
@@ -18,6 +58,8 @@ share/freeciv/amplio2/grid.png
 share/freeciv/amplio2/grid.spec
 share/freeciv/amplio2/hills.png
 share/freeciv/amplio2/hills.spec
+share/freeciv/amplio2/maglev.png
+share/freeciv/amplio2/maglev.spec
 share/freeciv/amplio2/medievalcities.png
 share/freeciv/amplio2/medievalcities.spec
 share/freeciv/amplio2/moderncities.png
@@ -39,6 +81,8 @@ share/freeciv/amplio2/tiles.png
 share/freeciv/amplio2/tiles.spec
 share/freeciv/amplio2/units.png
 share/freeciv/amplio2/units.spec
+share/freeciv/amplio2/veterancy.png
+share/freeciv/amplio2/veterancy.spec
 share/freeciv/amplio2/water.png
 share/freeciv/amplio2/water.spec
 share/freeciv/buildings/airport.png
@@ -81,6 +125,9 @@ share/freeciv/buildings/super_highways.png
 share/freeciv/buildings/supermarket.png
 share/freeciv/buildings/temple.png
 share/freeciv/buildings/university.png
+share/freeciv/cimpletoon.tilespec
+share/freeciv/cimpletoon/orient_units.png
+share/freeciv/cimpletoon/orient_units.spec
 share/freeciv/civ1.serv
 share/freeciv/civ1/buildings.ruleset
 share/freeciv/civ1/cities.ruleset
@@ -88,6 +135,7 @@ share/freeciv/civ1/effects.ruleset
 share/freeciv/civ1/game.ruleset
 share/freeciv/civ1/governments.ruleset
 share/freeciv/civ1/nations.ruleset
+share/freeciv/civ1/script.lua
 share/freeciv/civ1/techs.ruleset
 share/freeciv/civ1/terrain.ruleset
 share/freeciv/civ1/units.ruleset
@@ -98,29 +146,43 @@ share/freeciv/civ2/effects.ruleset
 share/freeciv/civ2/game.ruleset
 share/freeciv/civ2/governments.ruleset
 share/freeciv/civ2/nations.ruleset
+share/freeciv/civ2/script.lua
 share/freeciv/civ2/techs.ruleset
 share/freeciv/civ2/terrain.ruleset
 share/freeciv/civ2/units.ruleset
+share/freeciv/civ2civ3.serv
+share/freeciv/civ2civ3/buildings.ruleset
+share/freeciv/civ2civ3/cities.ruleset
+share/freeciv/civ2civ3/effects.ruleset
+share/freeciv/civ2civ3/game.ruleset
+share/freeciv/civ2civ3/governments.ruleset
+share/freeciv/civ2civ3/nations.ruleset
+share/freeciv/civ2civ3/script.lua
+share/freeciv/civ2civ3/techs.ruleset
+share/freeciv/civ2civ3/terrain.ruleset
+share/freeciv/civ2civ3/units.ruleset
+share/freeciv/classic.serv
+share/freeciv/classic/buildings.ruleset
+share/freeciv/classic/cities.ruleset
+share/freeciv/classic/effects.ruleset
+share/freeciv/classic/game.ruleset
+share/freeciv/classic/governments.ruleset
+share/freeciv/classic/nations.ruleset
+share/freeciv/classic/script.lua
+share/freeciv/classic/techs.ruleset
+share/freeciv/classic/terrain.ruleset
+share/freeciv/classic/units.ruleset
 share/freeciv/default.serv
 share/freeciv/default/ai_effects.ruleset
-share/freeciv/default/buildings.ruleset
-share/freeciv/default/cities.ruleset
 share/freeciv/default/default.lua
-share/freeciv/default/effects.ruleset
-share/freeciv/default/game.ruleset
-share/freeciv/default/governments.ruleset
-share/freeciv/default/nations.ruleset
-share/freeciv/default/script.lua
-share/freeciv/default/techs.ruleset
-share/freeciv/default/terrain.ruleset
-share/freeciv/default/units.ruleset
+share/freeciv/default/nationlist.ruleset
 share/freeciv/experimental.serv
-share/freeciv/experimental/ai_effects.ruleset
 share/freeciv/experimental/buildings.ruleset
 share/freeciv/experimental/cities.ruleset
 share/freeciv/experimental/effects.ruleset
 share/freeciv/experimental/game.ruleset
 share/freeciv/experimental/governments.ruleset
+share/freeciv/experimental/nations.ruleset
 share/freeciv/experimental/script.lua
 share/freeciv/experimental/techs.ruleset
 share/freeciv/experimental/terrain.ruleset
@@ -141,10 +203,22 @@ share/freeciv/flags/aceh-large.png
 share/freeciv/flags/aceh-shield-large.png
 share/freeciv/flags/aceh-shield.png
 share/freeciv/flags/aceh.png
+share/freeciv/flags/acre-large.png
+share/freeciv/flags/acre-shield-large.png
+share/freeciv/flags/acre-shield.png
+share/freeciv/flags/acre.png
+share/freeciv/flags/adygea-large.png
+share/freeciv/flags/adygea-shield-large.png
+share/freeciv/flags/adygea-shield.png
+share/freeciv/flags/adygea.png
 share/freeciv/flags/afghanistan-large.png
 share/freeciv/flags/afghanistan-shield-large.png
 share/freeciv/flags/afghanistan-shield.png
 share/freeciv/flags/afghanistan.png
+share/freeciv/flags/africa-large.png
+share/freeciv/flags/africa-shield-large.png
+share/freeciv/flags/africa-shield.png
+share/freeciv/flags/africa.png
 share/freeciv/flags/ainu-large.png
 share/freeciv/flags/ainu-shield-large.png
 share/freeciv/flags/ainu-shield.png
@@ -153,6 +227,10 @@ share/freeciv/flags/akwe-large.png
 share/freeciv/flags/akwe-shield-large.png
 share/freeciv/flags/akwe-shield.png
 share/freeciv/flags/akwe.png
+share/freeciv/flags/aland-large.png
+share/freeciv/flags/aland-shield-large.png
+share/freeciv/flags/aland-shield.png
+share/freeciv/flags/aland.png
 share/freeciv/flags/albania-large.png
 share/freeciv/flags/albania-shield-large.png
 share/freeciv/flags/albania-shield.png
@@ -169,6 +247,10 @@ share/freeciv/flags/almohad-large.png
 share/freeciv/flags/almohad-shield-large.png
 share/freeciv/flags/almohad-shield.png
 share/freeciv/flags/almohad.png
+share/freeciv/flags/alsace-large.png
+share/freeciv/flags/alsace-shield-large.png
+share/freeciv/flags/alsace-shield.png
+share/freeciv/flags/alsace.png
 share/freeciv/flags/amazigh-large.png
 share/freeciv/flags/amazigh-shield-large.png
 share/freeciv/flags/amazigh-shield.png
@@ -185,6 +267,10 @@ share/freeciv/flags/angola-large.png
 share/freeciv/flags/angola-shield-large.png
 share/freeciv/flags/angola-shield.png
 share/freeciv/flags/angola.png
+share/freeciv/flags/anhalt-large.png
+share/freeciv/flags/anhalt-shield-large.png
+share/freeciv/flags/anhalt-shield.png
+share/freeciv/flags/anhalt.png
 share/freeciv/flags/anishinaabe-large.png
 share/freeciv/flags/anishinaabe-shield-large.png
 share/freeciv/flags/anishinaabe-shield.png
@@ -197,6 +283,10 @@ share/freeciv/flags/antarctica_alt-large.png
 share/freeciv/flags/antarctica_alt-shield-large.png
 share/freeciv/flags/antarctica_alt-shield.png
 share/freeciv/flags/antarctica_alt.png
+share/freeciv/flags/antigua_and_barbuda-large.png
+share/freeciv/flags/antigua_and_barbuda-shield-large.png
+share/freeciv/flags/antigua_and_barbuda-shield.png
+share/freeciv/flags/antigua_and_barbuda.png
 share/freeciv/flags/apache-large.png
 share/freeciv/flags/apache-shield-large.png
 share/freeciv/flags/apache-shield.png
@@ -225,6 +315,10 @@ share/freeciv/flags/ashanti-large.png
 share/freeciv/flags/ashanti-shield-large.png
 share/freeciv/flags/ashanti-shield.png
 share/freeciv/flags/ashanti.png
+share/freeciv/flags/assam-large.png
+share/freeciv/flags/assam-shield-large.png
+share/freeciv/flags/assam-shield.png
+share/freeciv/flags/assam.png
 share/freeciv/flags/assyria-large.png
 share/freeciv/flags/assyria-shield-large.png
 share/freeciv/flags/assyria-shield.png
@@ -245,6 +339,10 @@ share/freeciv/flags/austria-large.png
 share/freeciv/flags/austria-shield-large.png
 share/freeciv/flags/austria-shield.png
 share/freeciv/flags/austria.png
+share/freeciv/flags/avar-large.png
+share/freeciv/flags/avar-shield-large.png
+share/freeciv/flags/avar-shield.png
+share/freeciv/flags/avar.png
 share/freeciv/flags/aymara-large.png
 share/freeciv/flags/aymara-shield-large.png
 share/freeciv/flags/aymara-shield.png
@@ -265,10 +363,22 @@ share/freeciv/flags/baden-large.png
 share/freeciv/flags/baden-shield-large.png
 share/freeciv/flags/baden-shield.png
 share/freeciv/flags/baden.png
+share/freeciv/flags/bahamas-large.png
+share/freeciv/flags/bahamas-shield-large.png
+share/freeciv/flags/bahamas-shield.png
+share/freeciv/flags/bahamas.png
+share/freeciv/flags/bahrain-large.png
+share/freeciv/flags/bahrain-shield-large.png
+share/freeciv/flags/bahrain-shield.png
+share/freeciv/flags/bahrain.png
 share/freeciv/flags/bangladesh-large.png
 share/freeciv/flags/bangladesh-shield-large.png
 share/freeciv/flags/bangladesh-shield.png
 share/freeciv/flags/bangladesh.png
+share/freeciv/flags/barbados-large.png
+share/freeciv/flags/barbados-shield-large.png
+share/freeciv/flags/barbados-shield.png
+share/freeciv/flags/barbados.png
 share/freeciv/flags/barbarian-large.png
 share/freeciv/flags/barbarian-shield-large.png
 share/freeciv/flags/barbarian-shield.png
@@ -285,10 +395,26 @@ share/freeciv/flags/belarus-large.png
 share/freeciv/flags/belarus-shield-large.png
 share/freeciv/flags/belarus-shield.png
 share/freeciv/flags/belarus.png
+share/freeciv/flags/belgic-large.png
+share/freeciv/flags/belgic-shield-large.png
+share/freeciv/flags/belgic-shield.png
+share/freeciv/flags/belgic.png
 share/freeciv/flags/belgium-large.png
 share/freeciv/flags/belgium-shield-large.png
 share/freeciv/flags/belgium-shield.png
 share/freeciv/flags/belgium.png
+share/freeciv/flags/belize-large.png
+share/freeciv/flags/belize-shield-large.png
+share/freeciv/flags/belize-shield.png
+share/freeciv/flags/belize.png
+share/freeciv/flags/bengal-large.png
+share/freeciv/flags/bengal-shield-large.png
+share/freeciv/flags/bengal-shield.png
+share/freeciv/flags/bengal.png
+share/freeciv/flags/benin-large.png
+share/freeciv/flags/benin-shield-large.png
+share/freeciv/flags/benin-shield.png
+share/freeciv/flags/benin.png
 share/freeciv/flags/benin_ancient-large.png
 share/freeciv/flags/benin_ancient-shield-large.png
 share/freeciv/flags/benin_ancient-shield.png
@@ -305,10 +431,18 @@ share/freeciv/flags/boer-large.png
 share/freeciv/flags/boer-shield-large.png
 share/freeciv/flags/boer-shield.png
 share/freeciv/flags/boer.png
+share/freeciv/flags/boii-large.png
+share/freeciv/flags/boii-shield-large.png
+share/freeciv/flags/boii-shield.png
+share/freeciv/flags/boii.png
 share/freeciv/flags/bolivia-large.png
 share/freeciv/flags/bolivia-shield-large.png
 share/freeciv/flags/bolivia-shield.png
 share/freeciv/flags/bolivia.png
+share/freeciv/flags/bophuthatswana-large.png
+share/freeciv/flags/bophuthatswana-shield-large.png
+share/freeciv/flags/bophuthatswana-shield.png
+share/freeciv/flags/bophuthatswana.png
 share/freeciv/flags/bosnia-large.png
 share/freeciv/flags/bosnia-shield-large.png
 share/freeciv/flags/bosnia-shield.png
@@ -337,10 +471,18 @@ share/freeciv/flags/brittany-large.png
 share/freeciv/flags/brittany-shield-large.png
 share/freeciv/flags/brittany-shield.png
 share/freeciv/flags/brittany.png
+share/freeciv/flags/brunei-large.png
+share/freeciv/flags/brunei-shield-large.png
+share/freeciv/flags/brunei-shield.png
+share/freeciv/flags/brunei.png
 share/freeciv/flags/bulgaria-large.png
 share/freeciv/flags/bulgaria-shield-large.png
 share/freeciv/flags/bulgaria-shield.png
 share/freeciv/flags/bulgaria.png
+share/freeciv/flags/burgundic-large.png
+share/freeciv/flags/burgundic-shield-large.png
+share/freeciv/flags/burgundic-shield.png
+share/freeciv/flags/burgundic.png
 share/freeciv/flags/burgundy-large.png
 share/freeciv/flags/burgundy-shield-large.png
 share/freeciv/flags/burgundy-shield.png
@@ -353,6 +495,10 @@ share/freeciv/flags/burundi-large.png
 share/freeciv/flags/burundi-shield-large.png
 share/freeciv/flags/burundi-shield.png
 share/freeciv/flags/burundi.png
+share/freeciv/flags/buryatia-large.png
+share/freeciv/flags/buryatia-shield-large.png
+share/freeciv/flags/buryatia-shield.png
+share/freeciv/flags/buryatia.png
 share/freeciv/flags/byzantium-large.png
 share/freeciv/flags/byzantium-shield-large.png
 share/freeciv/flags/byzantium-shield.png
@@ -377,10 +523,26 @@ share/freeciv/flags/canada_old-large.png
 share/freeciv/flags/canada_old-shield-large.png
 share/freeciv/flags/canada_old-shield.png
 share/freeciv/flags/canada_old.png
+share/freeciv/flags/canar-large.png
+share/freeciv/flags/canar-shield-large.png
+share/freeciv/flags/canar-shield.png
+share/freeciv/flags/canar.png
+share/freeciv/flags/cantonese-large.png
+share/freeciv/flags/cantonese-shield-large.png
+share/freeciv/flags/cantonese-shield.png
+share/freeciv/flags/cantonese.png
+share/freeciv/flags/cape_verde-large.png
+share/freeciv/flags/cape_verde-shield-large.png
+share/freeciv/flags/cape_verde-shield.png
+share/freeciv/flags/cape_verde.png
 share/freeciv/flags/car-large.png
 share/freeciv/flags/car-shield-large.png
 share/freeciv/flags/car-shield.png
 share/freeciv/flags/car.png
+share/freeciv/flags/carantanian-large.png
+share/freeciv/flags/carantanian-shield-large.png
+share/freeciv/flags/carantanian-shield.png
+share/freeciv/flags/carantanian.png
 share/freeciv/flags/cartago-large.png
 share/freeciv/flags/cartago-shield-large.png
 share/freeciv/flags/cartago-shield.png
@@ -397,10 +559,22 @@ share/freeciv/flags/celtiberian-large.png
 share/freeciv/flags/celtiberian-shield-large.png
 share/freeciv/flags/celtiberian-shield.png
 share/freeciv/flags/celtiberian.png
+share/freeciv/flags/celtic-large.png
+share/freeciv/flags/celtic-shield-large.png
+share/freeciv/flags/celtic-shield.png
+share/freeciv/flags/celtic.png
 share/freeciv/flags/central_america-large.png
 share/freeciv/flags/central_america-shield-large.png
 share/freeciv/flags/central_america-shield.png
 share/freeciv/flags/central_america.png
+share/freeciv/flags/central_lithuania-large.png
+share/freeciv/flags/central_lithuania-shield-large.png
+share/freeciv/flags/central_lithuania-shield.png
+share/freeciv/flags/central_lithuania.png
+share/freeciv/flags/chad-large.png
+share/freeciv/flags/chad-shield-large.png
+share/freeciv/flags/chad-shield.png
+share/freeciv/flags/chad.png
 share/freeciv/flags/cham-large.png
 share/freeciv/flags/cham-shield-large.png
 share/freeciv/flags/cham-shield.png
@@ -417,6 +591,14 @@ share/freeciv/flags/cheyenne-large.png
 share/freeciv/flags/cheyenne-shield-large.png
 share/freeciv/flags/cheyenne-shield.png
 share/freeciv/flags/cheyenne.png
+share/freeciv/flags/chiapas-large.png
+share/freeciv/flags/chiapas-shield-large.png
+share/freeciv/flags/chiapas-shield.png
+share/freeciv/flags/chiapas.png
+share/freeciv/flags/chickasaw-large.png
+share/freeciv/flags/chickasaw-shield-large.png
+share/freeciv/flags/chickasaw-shield.png
+share/freeciv/flags/chickasaw.png
 share/freeciv/flags/chile-large.png
 share/freeciv/flags/chile-shield-large.png
 share/freeciv/flags/chile-shield.png
@@ -429,14 +611,30 @@ share/freeciv/flags/china-large.png
 share/freeciv/flags/china-shield-large.png
 share/freeciv/flags/china-shield.png
 share/freeciv/flags/china.png
+share/freeciv/flags/choctaw-large.png
+share/freeciv/flags/choctaw-shield-large.png
+share/freeciv/flags/choctaw-shield.png
+share/freeciv/flags/choctaw.png
 share/freeciv/flags/chola-large.png
 share/freeciv/flags/chola-shield-large.png
 share/freeciv/flags/chola-shield.png
 share/freeciv/flags/chola.png
+share/freeciv/flags/chrobatian-large.png
+share/freeciv/flags/chrobatian-shield-large.png
+share/freeciv/flags/chrobatian-shield.png
+share/freeciv/flags/chrobatian.png
 share/freeciv/flags/chumash-large.png
 share/freeciv/flags/chumash-shield-large.png
 share/freeciv/flags/chumash-shield.png
 share/freeciv/flags/chumash.png
+share/freeciv/flags/chuvashia-large.png
+share/freeciv/flags/chuvashia-shield-large.png
+share/freeciv/flags/chuvashia-shield.png
+share/freeciv/flags/chuvashia.png
+share/freeciv/flags/clatsop-large.png
+share/freeciv/flags/clatsop-shield-large.png
+share/freeciv/flags/clatsop-shield.png
+share/freeciv/flags/clatsop.png
 share/freeciv/flags/colombia-large.png
 share/freeciv/flags/colombia-shield-large.png
 share/freeciv/flags/colombia-shield.png
@@ -445,6 +643,10 @@ share/freeciv/flags/comanche-large.png
 share/freeciv/flags/comanche-shield-large.png
 share/freeciv/flags/comanche-shield.png
 share/freeciv/flags/comanche.png
+share/freeciv/flags/comoros-large.png
+share/freeciv/flags/comoros-shield-large.png
+share/freeciv/flags/comoros-shield.png
+share/freeciv/flags/comoros.png
 share/freeciv/flags/constantine-large.png
 share/freeciv/flags/constantine-shield-large.png
 share/freeciv/flags/constantine-shield.png
@@ -469,6 +671,10 @@ share/freeciv/flags/courland-large.png
 share/freeciv/flags/courland-shield-large.png
 share/freeciv/flags/courland-shield.png
 share/freeciv/flags/courland.png
+share/freeciv/flags/crete-large.png
+share/freeciv/flags/crete-shield-large.png
+share/freeciv/flags/crete-shield.png
+share/freeciv/flags/crete.png
 share/freeciv/flags/crimean_tatar-large.png
 share/freeciv/flags/crimean_tatar-shield-large.png
 share/freeciv/flags/crimean_tatar-shield.png
@@ -481,18 +687,38 @@ share/freeciv/flags/cuba-large.png
 share/freeciv/flags/cuba-shield-large.png
 share/freeciv/flags/cuba-shield.png
 share/freeciv/flags/cuba.png
+share/freeciv/flags/cuyavia-large.png
+share/freeciv/flags/cuyavia-shield-large.png
+share/freeciv/flags/cuyavia-shield.png
+share/freeciv/flags/cuyavia.png
 share/freeciv/flags/cyprus-large.png
 share/freeciv/flags/cyprus-shield-large.png
 share/freeciv/flags/cyprus-shield.png
 share/freeciv/flags/cyprus.png
+share/freeciv/flags/cyrenaica-large.png
+share/freeciv/flags/cyrenaica-shield-large.png
+share/freeciv/flags/cyrenaica-shield.png
+share/freeciv/flags/cyrenaica.png
 share/freeciv/flags/czech-large.png
 share/freeciv/flags/czech-shield-large.png
 share/freeciv/flags/czech-shield.png
 share/freeciv/flags/czech.png
+share/freeciv/flags/czechoslovakia-large.png
+share/freeciv/flags/czechoslovakia-shield-large.png
+share/freeciv/flags/czechoslovakia-shield.png
+share/freeciv/flags/czechoslovakia.png
+share/freeciv/flags/dacian-large.png
+share/freeciv/flags/dacian-shield-large.png
+share/freeciv/flags/dacian-shield.png
+share/freeciv/flags/dacian.png
 share/freeciv/flags/dahomey-large.png
 share/freeciv/flags/dahomey-shield-large.png
 share/freeciv/flags/dahomey-shield.png
 share/freeciv/flags/dahomey.png
+share/freeciv/flags/darfur-large.png
+share/freeciv/flags/darfur-shield-large.png
+share/freeciv/flags/darfur-shield.png
+share/freeciv/flags/darfur.png
 share/freeciv/flags/ddr-large.png
 share/freeciv/flags/ddr-shield-large.png
 share/freeciv/flags/ddr-shield.png
@@ -501,6 +727,14 @@ share/freeciv/flags/denmark-large.png
 share/freeciv/flags/denmark-shield-large.png
 share/freeciv/flags/denmark-shield.png
 share/freeciv/flags/denmark.png
+share/freeciv/flags/dgb-large.png
+share/freeciv/flags/dgb-shield-large.png
+share/freeciv/flags/dgb-shield.png
+share/freeciv/flags/dgb.png
+share/freeciv/flags/djibouti-large.png
+share/freeciv/flags/djibouti-shield-large.png
+share/freeciv/flags/djibouti-shield.png
+share/freeciv/flags/djibouti.png
 share/freeciv/flags/dominica-large.png
 share/freeciv/flags/dominica-shield-large.png
 share/freeciv/flags/dominica-shield.png
@@ -545,6 +779,14 @@ share/freeciv/flags/england-large.png
 share/freeciv/flags/england-shield-large.png
 share/freeciv/flags/england-shield.png
 share/freeciv/flags/england.png
+share/freeciv/flags/epirus-large.png
+share/freeciv/flags/epirus-shield-large.png
+share/freeciv/flags/epirus-shield.png
+share/freeciv/flags/epirus.png
+share/freeciv/flags/equatorial_guinea-large.png
+share/freeciv/flags/equatorial_guinea-shield-large.png
+share/freeciv/flags/equatorial_guinea-shield.png
+share/freeciv/flags/equatorial_guinea.png
 share/freeciv/flags/eritrea-large.png
 share/freeciv/flags/eritrea-shield-large.png
 share/freeciv/flags/eritrea-shield.png
@@ -561,6 +803,10 @@ share/freeciv/flags/ethiopia-large.png
 share/freeciv/flags/ethiopia-shield-large.png
 share/freeciv/flags/ethiopia-shield.png
 share/freeciv/flags/ethiopia.png
+share/freeciv/flags/ethiopia_old-large.png
+share/freeciv/flags/ethiopia_old-shield-large.png
+share/freeciv/flags/ethiopia_old-shield.png
+share/freeciv/flags/ethiopia_old.png
 share/freeciv/flags/etruscan-large.png
 share/freeciv/flags/etruscan-shield-large.png
 share/freeciv/flags/etruscan-shield.png
@@ -573,6 +819,14 @@ share/freeciv/flags/euskadi-large.png
 share/freeciv/flags/euskadi-shield-large.png
 share/freeciv/flags/euskadi-shield.png
 share/freeciv/flags/euskadi.png
+share/freeciv/flags/evenkia-large.png
+share/freeciv/flags/evenkia-shield-large.png
+share/freeciv/flags/evenkia-shield.png
+share/freeciv/flags/evenkia.png
+share/freeciv/flags/faroes-large.png
+share/freeciv/flags/faroes-shield-large.png
+share/freeciv/flags/faroes-shield.png
+share/freeciv/flags/faroes.png
 share/freeciv/flags/fiji-large.png
 share/freeciv/flags/fiji-shield-large.png
 share/freeciv/flags/fiji-shield.png
@@ -585,6 +839,14 @@ share/freeciv/flags/flanders-large.png
 share/freeciv/flags/flanders-shield-large.png
 share/freeciv/flags/flanders-shield.png
 share/freeciv/flags/flanders.png
+share/freeciv/flags/florence-large.png
+share/freeciv/flags/florence-shield-large.png
+share/freeciv/flags/florence-shield.png
+share/freeciv/flags/florence.png
+share/freeciv/flags/formosan-large.png
+share/freeciv/flags/formosan-shield-large.png
+share/freeciv/flags/formosan-shield.png
+share/freeciv/flags/formosan.png
 share/freeciv/flags/france-large.png
 share/freeciv/flags/france-shield-large.png
 share/freeciv/flags/france-shield.png
@@ -597,10 +859,22 @@ share/freeciv/flags/franconia-large.png
 share/freeciv/flags/franconia-shield-large.png
 share/freeciv/flags/franconia-shield.png
 share/freeciv/flags/franconia.png
+share/freeciv/flags/french_polynesia-large.png
+share/freeciv/flags/french_polynesia-shield-large.png
+share/freeciv/flags/french_polynesia-shield.png
+share/freeciv/flags/french_polynesia.png
 share/freeciv/flags/frisia-large.png
 share/freeciv/flags/frisia-shield-large.png
 share/freeciv/flags/frisia-shield.png
 share/freeciv/flags/frisia.png
+share/freeciv/flags/friuli-large.png
+share/freeciv/flags/friuli-shield-large.png
+share/freeciv/flags/friuli-shield.png
+share/freeciv/flags/friuli.png
+share/freeciv/flags/gabon-large.png
+share/freeciv/flags/gabon-shield-large.png
+share/freeciv/flags/gabon-shield.png
+share/freeciv/flags/gabon.png
 share/freeciv/flags/gael-large.png
 share/freeciv/flags/gael-shield-large.png
 share/freeciv/flags/gael-shield.png
@@ -609,6 +883,10 @@ share/freeciv/flags/galicia-large.png
 share/freeciv/flags/galicia-shield-large.png
 share/freeciv/flags/galicia-shield.png
 share/freeciv/flags/galicia.png
+share/freeciv/flags/gambia-large.png
+share/freeciv/flags/gambia-shield-large.png
+share/freeciv/flags/gambia-shield.png
+share/freeciv/flags/gambia.png
 share/freeciv/flags/gaul-large.png
 share/freeciv/flags/gaul-shield-large.png
 share/freeciv/flags/gaul-shield.png
@@ -617,6 +895,14 @@ share/freeciv/flags/georgia-large.png
 share/freeciv/flags/georgia-shield-large.png
 share/freeciv/flags/georgia-shield.png
 share/freeciv/flags/georgia.png
+share/freeciv/flags/gepid-large.png
+share/freeciv/flags/gepid-shield-large.png
+share/freeciv/flags/gepid-shield.png
+share/freeciv/flags/gepid.png
+share/freeciv/flags/germanic-large.png
+share/freeciv/flags/germanic-shield-large.png
+share/freeciv/flags/germanic-shield.png
+share/freeciv/flags/germanic.png
 share/freeciv/flags/germany-large.png
 share/freeciv/flags/germany-shield-large.png
 share/freeciv/flags/germany-shield.png
@@ -625,10 +911,26 @@ share/freeciv/flags/ghana-large.png
 share/freeciv/flags/ghana-shield-large.png
 share/freeciv/flags/ghana-shield.png
 share/freeciv/flags/ghana.png
+share/freeciv/flags/ghana_ancient-large.png
+share/freeciv/flags/ghana_ancient-shield-large.png
+share/freeciv/flags/ghana_ancient-shield.png
+share/freeciv/flags/ghana_ancient.png
+share/freeciv/flags/ghaznavid-large.png
+share/freeciv/flags/ghaznavid-shield-large.png
+share/freeciv/flags/ghaznavid-shield.png
+share/freeciv/flags/ghaznavid.png
 share/freeciv/flags/gokturk-large.png
 share/freeciv/flags/gokturk-shield-large.png
 share/freeciv/flags/gokturk-shield.png
 share/freeciv/flags/gokturk.png
+share/freeciv/flags/golden_horde-large.png
+share/freeciv/flags/golden_horde-shield-large.png
+share/freeciv/flags/golden_horde-shield.png
+share/freeciv/flags/golden_horde.png
+share/freeciv/flags/gothic-large.png
+share/freeciv/flags/gothic-shield-large.png
+share/freeciv/flags/gothic-shield.png
+share/freeciv/flags/gothic.png
 share/freeciv/flags/greater_poland-large.png
 share/freeciv/flags/greater_poland-shield-large.png
 share/freeciv/flags/greater_poland-shield.png
@@ -649,6 +951,10 @@ share/freeciv/flags/grenada-large.png
 share/freeciv/flags/grenada-shield-large.png
 share/freeciv/flags/grenada-shield.png
 share/freeciv/flags/grenada.png
+share/freeciv/flags/grisons-large.png
+share/freeciv/flags/grisons-shield-large.png
+share/freeciv/flags/grisons-shield.png
+share/freeciv/flags/grisons.png
 share/freeciv/flags/guanche-large.png
 share/freeciv/flags/guanche-shield-large.png
 share/freeciv/flags/guanche-shield.png
@@ -661,6 +967,14 @@ share/freeciv/flags/guatemala-large.png
 share/freeciv/flags/guatemala-shield-large.png
 share/freeciv/flags/guatemala-shield.png
 share/freeciv/flags/guatemala.png
+share/freeciv/flags/guinea-bissau-large.png
+share/freeciv/flags/guinea-bissau-shield-large.png
+share/freeciv/flags/guinea-bissau-shield.png
+share/freeciv/flags/guinea-bissau.png
+share/freeciv/flags/guinea-large.png
+share/freeciv/flags/guinea-shield-large.png
+share/freeciv/flags/guinea-shield.png
+share/freeciv/flags/guinea.png
 share/freeciv/flags/gupta-large.png
 share/freeciv/flags/gupta-shield-large.png
 share/freeciv/flags/gupta-shield.png
@@ -697,6 +1011,14 @@ share/freeciv/flags/hawaii-large.png
 share/freeciv/flags/hawaii-shield-large.png
 share/freeciv/flags/hawaii-shield.png
 share/freeciv/flags/hawaii.png
+share/freeciv/flags/helvetii-large.png
+share/freeciv/flags/helvetii-shield-large.png
+share/freeciv/flags/helvetii-shield.png
+share/freeciv/flags/helvetii.png
+share/freeciv/flags/hephthalite-large.png
+share/freeciv/flags/hephthalite-shield-large.png
+share/freeciv/flags/hephthalite-shield.png
+share/freeciv/flags/hephthalite.png
 share/freeciv/flags/hesse-large.png
 share/freeciv/flags/hesse-shield-large.png
 share/freeciv/flags/hesse-shield.png
@@ -725,6 +1047,10 @@ share/freeciv/flags/hungary-large.png
 share/freeciv/flags/hungary-shield-large.png
 share/freeciv/flags/hungary-shield.png
 share/freeciv/flags/hungary.png
+share/freeciv/flags/hunnic-large.png
+share/freeciv/flags/hunnic-shield-large.png
+share/freeciv/flags/hunnic-shield.png
+share/freeciv/flags/hunnic.png
 share/freeciv/flags/iberian-large.png
 share/freeciv/flags/iberian-shield-large.png
 share/freeciv/flags/iberian-shield.png
@@ -745,6 +1071,10 @@ share/freeciv/flags/india-large.png
 share/freeciv/flags/india-shield-large.png
 share/freeciv/flags/india-shield.png
 share/freeciv/flags/india.png
+share/freeciv/flags/indoeuropean-large.png
+share/freeciv/flags/indoeuropean-shield-large.png
+share/freeciv/flags/indoeuropean-shield.png
+share/freeciv/flags/indoeuropean.png
 share/freeciv/flags/indonesia-large.png
 share/freeciv/flags/indonesia-shield-large.png
 share/freeciv/flags/indonesia-shield.png
@@ -781,6 +1111,14 @@ share/freeciv/flags/israel-large.png
 share/freeciv/flags/israel-shield-large.png
 share/freeciv/flags/israel-shield.png
 share/freeciv/flags/israel.png
+share/freeciv/flags/israel_ancient-large.png
+share/freeciv/flags/israel_ancient-shield-large.png
+share/freeciv/flags/israel_ancient-shield.png
+share/freeciv/flags/israel_ancient.png
+share/freeciv/flags/italian_greek-large.png
+share/freeciv/flags/italian_greek-shield-large.png
+share/freeciv/flags/italian_greek-shield.png
+share/freeciv/flags/italian_greek.png
 share/freeciv/flags/italy-large.png
 share/freeciv/flags/italy-shield-large.png
 share/freeciv/flags/italy-shield.png
@@ -789,6 +1127,10 @@ share/freeciv/flags/ivory_coast-large.png
 share/freeciv/flags/ivory_coast-shield-large.png
 share/freeciv/flags/ivory_coast-shield.png
 share/freeciv/flags/ivory_coast.png
+share/freeciv/flags/jaffna-large.png
+share/freeciv/flags/jaffna-shield-large.png
+share/freeciv/flags/jaffna-shield.png
+share/freeciv/flags/jaffna.png
 share/freeciv/flags/jamaica-large.png
 share/freeciv/flags/jamaica-shield-large.png
 share/freeciv/flags/jamaica-shield.png
@@ -801,10 +1143,18 @@ share/freeciv/flags/jbonai-large.png
 share/freeciv/flags/jbonai-shield-large.png
 share/freeciv/flags/jbonai-shield.png
 share/freeciv/flags/jbonai.png
+share/freeciv/flags/jerusalem-large.png
+share/freeciv/flags/jerusalem-shield-large.png
+share/freeciv/flags/jerusalem-shield.png
+share/freeciv/flags/jerusalem.png
 share/freeciv/flags/jolof-large.png
 share/freeciv/flags/jolof-shield-large.png
 share/freeciv/flags/jolof-shield.png
 share/freeciv/flags/jolof.png
+share/freeciv/flags/jordan-large.png
+share/freeciv/flags/jordan-shield-large.png
+share/freeciv/flags/jordan-shield.png
+share/freeciv/flags/jordan.png
 share/freeciv/flags/kalmykia-large.png
 share/freeciv/flags/kalmykia-shield-large.png
 share/freeciv/flags/kalmykia-shield.png
@@ -821,10 +1171,22 @@ share/freeciv/flags/karelia-large.png
 share/freeciv/flags/karelia-shield-large.png
 share/freeciv/flags/karelia-shield.png
 share/freeciv/flags/karelia.png
+share/freeciv/flags/karen-large.png
+share/freeciv/flags/karen-shield-large.png
+share/freeciv/flags/karen-shield.png
+share/freeciv/flags/karen.png
 share/freeciv/flags/kashmir-large.png
 share/freeciv/flags/kashmir-shield-large.png
 share/freeciv/flags/kashmir-shield.png
 share/freeciv/flags/kashmir.png
+share/freeciv/flags/kashubia-large.png
+share/freeciv/flags/kashubia-shield-large.png
+share/freeciv/flags/kashubia-shield.png
+share/freeciv/flags/kashubia.png
+share/freeciv/flags/katanga-large.png
+share/freeciv/flags/katanga-shield-large.png
+share/freeciv/flags/katanga-shield.png
+share/freeciv/flags/katanga.png
 share/freeciv/flags/kazakhstan-large.png
 share/freeciv/flags/kazakhstan-shield-large.png
 share/freeciv/flags/kazakhstan-shield.png
@@ -841,6 +1203,14 @@ share/freeciv/flags/khazaria-large.png
 share/freeciv/flags/khazaria-shield-large.png
 share/freeciv/flags/khazaria-shield.png
 share/freeciv/flags/khazaria.png
+share/freeciv/flags/khmer-large.png
+share/freeciv/flags/khmer-shield-large.png
+share/freeciv/flags/khmer-shield.png
+share/freeciv/flags/khmer.png
+share/freeciv/flags/khoisan-large.png
+share/freeciv/flags/khoisan-shield-large.png
+share/freeciv/flags/khoisan-shield.png
+share/freeciv/flags/khoisan.png
 share/freeciv/flags/khwarezm-large.png
 share/freeciv/flags/khwarezm-shield-large.png
 share/freeciv/flags/khwarezm-shield.png
@@ -849,6 +1219,14 @@ share/freeciv/flags/kiev-large.png
 share/freeciv/flags/kiev-shield-large.png
 share/freeciv/flags/kiev-shield.png
 share/freeciv/flags/kiev.png
+share/freeciv/flags/kiribati-large.png
+share/freeciv/flags/kiribati-shield-large.png
+share/freeciv/flags/kiribati-shield.png
+share/freeciv/flags/kiribati.png
+share/freeciv/flags/komi-large.png
+share/freeciv/flags/komi-shield-large.png
+share/freeciv/flags/komi-shield.png
+share/freeciv/flags/komi.png
 share/freeciv/flags/kongo-large.png
 share/freeciv/flags/kongo-shield-large.png
 share/freeciv/flags/kongo-shield.png
@@ -865,10 +1243,22 @@ share/freeciv/flags/kosovo-large.png
 share/freeciv/flags/kosovo-shield-large.png
 share/freeciv/flags/kosovo-shield.png
 share/freeciv/flags/kosovo.png
+share/freeciv/flags/kuna_yala-large.png
+share/freeciv/flags/kuna_yala-shield-large.png
+share/freeciv/flags/kuna_yala-shield.png
+share/freeciv/flags/kuna_yala.png
 share/freeciv/flags/kurd-large.png
 share/freeciv/flags/kurd-shield-large.png
 share/freeciv/flags/kurd-shield.png
 share/freeciv/flags/kurd.png
+share/freeciv/flags/kushan-large.png
+share/freeciv/flags/kushan-shield-large.png
+share/freeciv/flags/kushan-shield.png
+share/freeciv/flags/kushan.png
+share/freeciv/flags/kuwait-large.png
+share/freeciv/flags/kuwait-shield-large.png
+share/freeciv/flags/kuwait-shield.png
+share/freeciv/flags/kuwait.png
 share/freeciv/flags/kyrgyzstan-large.png
 share/freeciv/flags/kyrgyzstan-shield-large.png
 share/freeciv/flags/kyrgyzstan-shield.png
@@ -881,6 +1271,10 @@ share/freeciv/flags/laos-large.png
 share/freeciv/flags/laos-shield-large.png
 share/freeciv/flags/laos-shield.png
 share/freeciv/flags/laos.png
+share/freeciv/flags/latin_empire-large.png
+share/freeciv/flags/latin_empire-shield-large.png
+share/freeciv/flags/latin_empire-shield.png
+share/freeciv/flags/latin_empire.png
 share/freeciv/flags/latvia-large.png
 share/freeciv/flags/latvia-shield-large.png
 share/freeciv/flags/latvia-shield.png
@@ -897,34 +1291,82 @@ share/freeciv/flags/leon-large.png
 share/freeciv/flags/leon-shield-large.png
 share/freeciv/flags/leon-shield.png
 share/freeciv/flags/leon.png
+share/freeciv/flags/lesotho-large.png
+share/freeciv/flags/lesotho-shield-large.png
+share/freeciv/flags/lesotho-shield.png
+share/freeciv/flags/lesotho.png
+share/freeciv/flags/lesotho_old-large.png
+share/freeciv/flags/lesotho_old-shield-large.png
+share/freeciv/flags/lesotho_old-shield.png
+share/freeciv/flags/lesotho_old.png
+share/freeciv/flags/liberia-large.png
+share/freeciv/flags/liberia-shield-large.png
+share/freeciv/flags/liberia-shield.png
+share/freeciv/flags/liberia.png
+share/freeciv/flags/liburnian-large.png
+share/freeciv/flags/liburnian-shield-large.png
+share/freeciv/flags/liburnian-shield.png
+share/freeciv/flags/liburnian.png
 share/freeciv/flags/libya-large.png
 share/freeciv/flags/libya-shield-large.png
 share/freeciv/flags/libya-shield.png
 share/freeciv/flags/libya.png
+share/freeciv/flags/libya_old-large.png
+share/freeciv/flags/libya_old-shield-large.png
+share/freeciv/flags/libya_old-shield.png
+share/freeciv/flags/libya_old.png
 share/freeciv/flags/liechtenstein-large.png
 share/freeciv/flags/liechtenstein-shield-large.png
 share/freeciv/flags/liechtenstein-shield.png
 share/freeciv/flags/liechtenstein.png
+share/freeciv/flags/liguria-large.png
+share/freeciv/flags/liguria-shield-large.png
+share/freeciv/flags/liguria-shield.png
+share/freeciv/flags/liguria.png
+share/freeciv/flags/ligurian-large.png
+share/freeciv/flags/ligurian-shield-large.png
+share/freeciv/flags/ligurian-shield.png
+share/freeciv/flags/ligurian.png
 share/freeciv/flags/lipkatatar-large.png
 share/freeciv/flags/lipkatatar-shield-large.png
 share/freeciv/flags/lipkatatar-shield.png
 share/freeciv/flags/lipkatatar.png
+share/freeciv/flags/lippe-large.png
+share/freeciv/flags/lippe-shield-large.png
+share/freeciv/flags/lippe-shield.png
+share/freeciv/flags/lippe.png
 share/freeciv/flags/lithuania-large.png
 share/freeciv/flags/lithuania-shield-large.png
 share/freeciv/flags/lithuania-shield.png
 share/freeciv/flags/lithuania.png
+share/freeciv/flags/lombardy-large.png
+share/freeciv/flags/lombardy-shield-large.png
+share/freeciv/flags/lombardy-shield.png
+share/freeciv/flags/lombardy.png
 share/freeciv/flags/lorraine-large.png
 share/freeciv/flags/lorraine-shield-large.png
 share/freeciv/flags/lorraine-shield.png
 share/freeciv/flags/lorraine.png
+share/freeciv/flags/luna-large.png
+share/freeciv/flags/luna-shield-large.png
+share/freeciv/flags/luna-shield.png
+share/freeciv/flags/luna.png
 share/freeciv/flags/lusatia-large.png
 share/freeciv/flags/lusatia-shield-large.png
 share/freeciv/flags/lusatia-shield.png
 share/freeciv/flags/lusatia.png
+share/freeciv/flags/luwian-large.png
+share/freeciv/flags/luwian-shield-large.png
+share/freeciv/flags/luwian-shield.png
+share/freeciv/flags/luwian.png
 share/freeciv/flags/luxembourg-large.png
 share/freeciv/flags/luxembourg-shield-large.png
 share/freeciv/flags/luxembourg-shield.png
 share/freeciv/flags/luxembourg.png
+share/freeciv/flags/lycian-large.png
+share/freeciv/flags/lycian-shield-large.png
+share/freeciv/flags/lycian-shield.png
+share/freeciv/flags/lycian.png
 share/freeciv/flags/maasai-large.png
 share/freeciv/flags/maasai-shield-large.png
 share/freeciv/flags/maasai-shield.png
@@ -953,6 +1395,10 @@ share/freeciv/flags/malaysia-large.png
 share/freeciv/flags/malaysia-shield-large.png
 share/freeciv/flags/malaysia-shield.png
 share/freeciv/flags/malaysia.png
+share/freeciv/flags/maldives-large.png
+share/freeciv/flags/maldives-shield-large.png
+share/freeciv/flags/maldives-shield.png
+share/freeciv/flags/maldives.png
 share/freeciv/flags/mali-large.png
 share/freeciv/flags/mali-shield-large.png
 share/freeciv/flags/mali-shield.png
@@ -965,6 +1411,10 @@ share/freeciv/flags/malta-large.png
 share/freeciv/flags/malta-shield-large.png
 share/freeciv/flags/malta-shield.png
 share/freeciv/flags/malta.png
+share/freeciv/flags/mamluk-large.png
+share/freeciv/flags/mamluk-shield-large.png
+share/freeciv/flags/mamluk-shield.png
+share/freeciv/flags/mamluk.png
 share/freeciv/flags/man-large.png
 share/freeciv/flags/man-shield-large.png
 share/freeciv/flags/man-shield.png
@@ -981,10 +1431,26 @@ share/freeciv/flags/mapuche-large.png
 share/freeciv/flags/mapuche-shield-large.png
 share/freeciv/flags/mapuche-shield.png
 share/freeciv/flags/mapuche.png
+share/freeciv/flags/marathi-large.png
+share/freeciv/flags/marathi-shield-large.png
+share/freeciv/flags/marathi-shield.png
+share/freeciv/flags/marathi.png
 share/freeciv/flags/mars-large.png
 share/freeciv/flags/mars-shield-large.png
 share/freeciv/flags/mars-shield.png
 share/freeciv/flags/mars.png
+share/freeciv/flags/marshall_islands-large.png
+share/freeciv/flags/marshall_islands-shield-large.png
+share/freeciv/flags/marshall_islands-shield.png
+share/freeciv/flags/marshall_islands.png
+share/freeciv/flags/mauritania-large.png
+share/freeciv/flags/mauritania-shield-large.png
+share/freeciv/flags/mauritania-shield.png
+share/freeciv/flags/mauritania.png
+share/freeciv/flags/mauritius-large.png
+share/freeciv/flags/mauritius-shield-large.png
+share/freeciv/flags/mauritius-shield.png
+share/freeciv/flags/mauritius.png
 share/freeciv/flags/maya-large.png
 share/freeciv/flags/maya-shield-large.png
 share/freeciv/flags/maya-shield.png
@@ -997,6 +1463,14 @@ share/freeciv/flags/mecklenburg-large.png
 share/freeciv/flags/mecklenburg-shield-large.png
 share/freeciv/flags/mecklenburg-shield.png
 share/freeciv/flags/mecklenburg.png
+share/freeciv/flags/median-large.png
+share/freeciv/flags/median-shield-large.png
+share/freeciv/flags/median-shield.png
+share/freeciv/flags/median.png
+share/freeciv/flags/messapian-large.png
+share/freeciv/flags/messapian-shield-large.png
+share/freeciv/flags/messapian-shield.png
+share/freeciv/flags/messapian.png
 share/freeciv/flags/metis-large.png
 share/freeciv/flags/metis-shield-large.png
 share/freeciv/flags/metis-shield.png
@@ -1021,6 +1495,10 @@ share/freeciv/flags/miskito-large.png
 share/freeciv/flags/miskito-shield-large.png
 share/freeciv/flags/miskito-shield.png
 share/freeciv/flags/miskito.png
+share/freeciv/flags/mitanni-large.png
+share/freeciv/flags/mitanni-shield-large.png
+share/freeciv/flags/mitanni-shield.png
+share/freeciv/flags/mitanni.png
 share/freeciv/flags/mixtec-large.png
 share/freeciv/flags/mixtec-shield-large.png
 share/freeciv/flags/mixtec-shield.png
@@ -1029,6 +1507,14 @@ share/freeciv/flags/moldova-large.png
 share/freeciv/flags/moldova-shield-large.png
 share/freeciv/flags/moldova-shield.png
 share/freeciv/flags/moldova.png
+share/freeciv/flags/moluccas-large.png
+share/freeciv/flags/moluccas-shield-large.png
+share/freeciv/flags/moluccas-shield.png
+share/freeciv/flags/moluccas.png
+share/freeciv/flags/mon-large.png
+share/freeciv/flags/mon-shield-large.png
+share/freeciv/flags/mon-shield.png
+share/freeciv/flags/mon.png
 share/freeciv/flags/monaco_alternative-large.png
 share/freeciv/flags/monaco_alternative-shield-large.png
 share/freeciv/flags/monaco_alternative-shield.png
@@ -1053,6 +1539,10 @@ share/freeciv/flags/morocco-large.png
 share/freeciv/flags/morocco-shield-large.png
 share/freeciv/flags/morocco-shield.png
 share/freeciv/flags/morocco.png
+share/freeciv/flags/moscow-large.png
+share/freeciv/flags/moscow-shield-large.png
+share/freeciv/flags/moscow-shield.png
+share/freeciv/flags/moscow.png
 share/freeciv/flags/mozambique-large.png
 share/freeciv/flags/mozambique-shield-large.png
 share/freeciv/flags/mozambique-shield.png
@@ -1073,6 +1563,10 @@ share/freeciv/flags/myanmar-large.png
 share/freeciv/flags/myanmar-shield-large.png
 share/freeciv/flags/myanmar-shield.png
 share/freeciv/flags/myanmar.png
+share/freeciv/flags/nagorno_karabakh-large.png
+share/freeciv/flags/nagorno_karabakh-shield-large.png
+share/freeciv/flags/nagorno_karabakh-shield.png
+share/freeciv/flags/nagorno_karabakh.png
 share/freeciv/flags/namibia-large.png
 share/freeciv/flags/namibia-shield-large.png
 share/freeciv/flags/namibia-shield.png
@@ -1085,10 +1579,18 @@ share/freeciv/flags/nato-large.png
 share/freeciv/flags/nato-shield-large.png
 share/freeciv/flags/nato-shield.png
 share/freeciv/flags/nato.png
+share/freeciv/flags/nauru-large.png
+share/freeciv/flags/nauru-shield-large.png
+share/freeciv/flags/nauru-shield.png
+share/freeciv/flags/nauru.png
 share/freeciv/flags/navajo-large.png
 share/freeciv/flags/navajo-shield-large.png
 share/freeciv/flags/navajo-shield.png
 share/freeciv/flags/navajo.png
+share/freeciv/flags/nenetsia-large.png
+share/freeciv/flags/nenetsia-shield-large.png
+share/freeciv/flags/nenetsia-shield.png
+share/freeciv/flags/nenetsia.png
 share/freeciv/flags/nepal-large.png
 share/freeciv/flags/nepal-shield-large.png
 share/freeciv/flags/nepal-shield.png
@@ -1101,6 +1603,10 @@ share/freeciv/flags/netherlands-large.png
 share/freeciv/flags/netherlands-shield-large.png
 share/freeciv/flags/netherlands-shield.png
 share/freeciv/flags/netherlands.png
+share/freeciv/flags/netherlands_antilles-large.png
+share/freeciv/flags/netherlands_antilles-shield-large.png
+share/freeciv/flags/netherlands_antilles-shield.png
+share/freeciv/flags/netherlands_antilles.png
 share/freeciv/flags/newfoundland-large.png
 share/freeciv/flags/newfoundland-shield-large.png
 share/freeciv/flags/newfoundland-shield.png
@@ -1141,6 +1647,10 @@ share/freeciv/flags/norway-large.png
 share/freeciv/flags/norway-shield-large.png
 share/freeciv/flags/norway-shield.png
 share/freeciv/flags/norway.png
+share/freeciv/flags/novgorod-large.png
+share/freeciv/flags/novgorod-shield-large.png
+share/freeciv/flags/novgorod-shield.png
+share/freeciv/flags/novgorod.png
 share/freeciv/flags/nubia-large.png
 share/freeciv/flags/nubia-shield-large.png
 share/freeciv/flags/nubia-shield.png
@@ -1189,6 +1699,10 @@ share/freeciv/flags/oz-large.png
 share/freeciv/flags/oz-shield-large.png
 share/freeciv/flags/oz-shield.png
 share/freeciv/flags/oz.png
+share/freeciv/flags/paeonia-large.png
+share/freeciv/flags/paeonia-shield-large.png
+share/freeciv/flags/paeonia-shield.png
+share/freeciv/flags/paeonia.png
 share/freeciv/flags/pakistan-large.png
 share/freeciv/flags/pakistan-shield-large.png
 share/freeciv/flags/pakistan-shield.png
@@ -1217,10 +1731,18 @@ share/freeciv/flags/paraguay-large.png
 share/freeciv/flags/paraguay-shield-large.png
 share/freeciv/flags/paraguay-shield.png
 share/freeciv/flags/paraguay.png
+share/freeciv/flags/parthia-large.png
+share/freeciv/flags/parthia-shield-large.png
+share/freeciv/flags/parthia-shield.png
+share/freeciv/flags/parthia.png
 share/freeciv/flags/pashtun-large.png
 share/freeciv/flags/pashtun-shield-large.png
 share/freeciv/flags/pashtun-shield.png
 share/freeciv/flags/pashtun.png
+share/freeciv/flags/pelasgian-large.png
+share/freeciv/flags/pelasgian-shield-large.png
+share/freeciv/flags/pelasgian-shield.png
+share/freeciv/flags/pelasgian.png
 share/freeciv/flags/peru-large.png
 share/freeciv/flags/peru-shield-large.png
 share/freeciv/flags/peru-shield.png
@@ -1233,6 +1755,14 @@ share/freeciv/flags/phoenicia-large.png
 share/freeciv/flags/phoenicia-shield-large.png
 share/freeciv/flags/phoenicia-shield.png
 share/freeciv/flags/phoenicia.png
+share/freeciv/flags/phrygian-large.png
+share/freeciv/flags/phrygian-shield-large.png
+share/freeciv/flags/phrygian-shield.png
+share/freeciv/flags/phrygian.png
+share/freeciv/flags/pict-large.png
+share/freeciv/flags/pict-shield-large.png
+share/freeciv/flags/pict-shield.png
+share/freeciv/flags/pict.png
 share/freeciv/flags/piedmont-large.png
 share/freeciv/flags/piedmont-shield-large.png
 share/freeciv/flags/piedmont-shield.png
@@ -1261,6 +1791,10 @@ share/freeciv/flags/portugal-large.png
 share/freeciv/flags/portugal-shield-large.png
 share/freeciv/flags/portugal-shield.png
 share/freeciv/flags/portugal.png
+share/freeciv/flags/prusai-large.png
+share/freeciv/flags/prusai-shield-large.png
+share/freeciv/flags/prusai-shield.png
+share/freeciv/flags/prusai.png
 share/freeciv/flags/prussia-large.png
 share/freeciv/flags/prussia-shield-large.png
 share/freeciv/flags/prussia-shield.png
@@ -1273,6 +1807,10 @@ share/freeciv/flags/purhepecha-large.png
 share/freeciv/flags/purhepecha-shield-large.png
 share/freeciv/flags/purhepecha-shield.png
 share/freeciv/flags/purhepecha.png
+share/freeciv/flags/qatar-large.png
+share/freeciv/flags/qatar-shield-large.png
+share/freeciv/flags/qatar-shield.png
+share/freeciv/flags/qatar.png
 share/freeciv/flags/qing-large.png
 share/freeciv/flags/qing-shield-large.png
 share/freeciv/flags/qing-shield.png
@@ -1281,10 +1819,22 @@ share/freeciv/flags/quebec-large.png
 share/freeciv/flags/quebec-shield-large.png
 share/freeciv/flags/quebec-shield.png
 share/freeciv/flags/quebec.png
+share/freeciv/flags/r_congo-large.png
+share/freeciv/flags/r_congo-shield-large.png
+share/freeciv/flags/r_congo-shield.png
+share/freeciv/flags/r_congo.png
+share/freeciv/flags/rapa_nui-large.png
+share/freeciv/flags/rapa_nui-shield-large.png
+share/freeciv/flags/rapa_nui-shield.png
+share/freeciv/flags/rapa_nui.png
 share/freeciv/flags/raramuri-large.png
 share/freeciv/flags/raramuri-shield-large.png
 share/freeciv/flags/raramuri-shield.png
 share/freeciv/flags/raramuri.png
+share/freeciv/flags/rhineland-large.png
+share/freeciv/flags/rhineland-shield-large.png
+share/freeciv/flags/rhineland-shield.png
+share/freeciv/flags/rhineland.png
 share/freeciv/flags/rif-large.png
 share/freeciv/flags/rif-shield-large.png
 share/freeciv/flags/rif-shield.png
@@ -1301,6 +1851,10 @@ share/freeciv/flags/russia-large.png
 share/freeciv/flags/russia-shield-large.png
 share/freeciv/flags/russia-shield.png
 share/freeciv/flags/russia.png
+share/freeciv/flags/rusyn-large.png
+share/freeciv/flags/rusyn-shield-large.png
+share/freeciv/flags/rusyn-shield.png
+share/freeciv/flags/rusyn.png
 share/freeciv/flags/rvn-large.png
 share/freeciv/flags/rvn-shield-large.png
 share/freeciv/flags/rvn-shield.png
@@ -1313,14 +1867,42 @@ share/freeciv/flags/ryukyu-large.png
 share/freeciv/flags/ryukyu-shield-large.png
 share/freeciv/flags/ryukyu-shield.png
 share/freeciv/flags/ryukyu.png
+share/freeciv/flags/sabinium-large.png
+share/freeciv/flags/sabinium-shield-large.png
+share/freeciv/flags/sabinium-shield.png
+share/freeciv/flags/sabinium.png
 share/freeciv/flags/sadr-large.png
 share/freeciv/flags/sadr-shield-large.png
 share/freeciv/flags/sadr-shield.png
 share/freeciv/flags/sadr.png
+share/freeciv/flags/saint_kitts_and_nevis-large.png
+share/freeciv/flags/saint_kitts_and_nevis-shield-large.png
+share/freeciv/flags/saint_kitts_and_nevis-shield.png
+share/freeciv/flags/saint_kitts_and_nevis.png
+share/freeciv/flags/saint_lucia-large.png
+share/freeciv/flags/saint_lucia-shield-large.png
+share/freeciv/flags/saint_lucia-shield.png
+share/freeciv/flags/saint_lucia.png
+share/freeciv/flags/saka-large.png
+share/freeciv/flags/saka-shield-large.png
+share/freeciv/flags/saka-shield.png
+share/freeciv/flags/saka.png
 share/freeciv/flags/sakha-large.png
 share/freeciv/flags/sakha-shield-large.png
 share/freeciv/flags/sakha-shield.png
 share/freeciv/flags/sakha.png
+share/freeciv/flags/salish-large.png
+share/freeciv/flags/salish-shield-large.png
+share/freeciv/flags/salish-shield.png
+share/freeciv/flags/salish.png
+share/freeciv/flags/samnium-large.png
+share/freeciv/flags/samnium-shield-large.png
+share/freeciv/flags/samnium-shield.png
+share/freeciv/flags/samnium.png
+share/freeciv/flags/samoa-large.png
+share/freeciv/flags/samoa-shield-large.png
+share/freeciv/flags/samoa-shield.png
+share/freeciv/flags/samoa.png
 share/freeciv/flags/samogitia-large.png
 share/freeciv/flags/samogitia-shield-large.png
 share/freeciv/flags/samogitia-shield.png
@@ -1329,10 +1911,18 @@ share/freeciv/flags/san_marino-large.png
 share/freeciv/flags/san_marino-shield-large.png
 share/freeciv/flags/san_marino-shield.png
 share/freeciv/flags/san_marino.png
+share/freeciv/flags/sao_tome_and_principe-large.png
+share/freeciv/flags/sao_tome_and_principe-shield-large.png
+share/freeciv/flags/sao_tome_and_principe-shield.png
+share/freeciv/flags/sao_tome_and_principe.png
 share/freeciv/flags/sapmi-large.png
 share/freeciv/flags/sapmi-shield-large.png
 share/freeciv/flags/sapmi-shield.png
 share/freeciv/flags/sapmi.png
+share/freeciv/flags/sardinia-large.png
+share/freeciv/flags/sardinia-shield-large.png
+share/freeciv/flags/sardinia-shield.png
+share/freeciv/flags/sardinia.png
 share/freeciv/flags/sarmatia-large.png
 share/freeciv/flags/sarmatia-shield-large.png
 share/freeciv/flags/sarmatia-shield.png
@@ -1349,6 +1939,10 @@ share/freeciv/flags/saxony-large.png
 share/freeciv/flags/saxony-shield-large.png
 share/freeciv/flags/saxony-shield.png
 share/freeciv/flags/saxony.png
+share/freeciv/flags/scania-large.png
+share/freeciv/flags/scania-shield-large.png
+share/freeciv/flags/scania-shield.png
+share/freeciv/flags/scania.png
 share/freeciv/flags/schleswig-holstein-large.png
 share/freeciv/flags/schleswig-holstein-shield-large.png
 share/freeciv/flags/schleswig-holstein-shield.png
@@ -1357,6 +1951,10 @@ share/freeciv/flags/scotland-large.png
 share/freeciv/flags/scotland-shield-large.png
 share/freeciv/flags/scotland-shield.png
 share/freeciv/flags/scotland.png
+share/freeciv/flags/scottishgaelic-large.png
+share/freeciv/flags/scottishgaelic-shield-large.png
+share/freeciv/flags/scottishgaelic-shield.png
+share/freeciv/flags/scottishgaelic.png
 share/freeciv/flags/scythia-large.png
 share/freeciv/flags/scythia-shield-large.png
 share/freeciv/flags/scythia-shield.png
@@ -1365,6 +1963,14 @@ share/freeciv/flags/seleucid-large.png
 share/freeciv/flags/seleucid-shield-large.png
 share/freeciv/flags/seleucid-shield.png
 share/freeciv/flags/seleucid.png
+share/freeciv/flags/seljuk-large.png
+share/freeciv/flags/seljuk-shield-large.png
+share/freeciv/flags/seljuk-shield.png
+share/freeciv/flags/seljuk.png
+share/freeciv/flags/seminole-large.png
+share/freeciv/flags/seminole-shield-large.png
+share/freeciv/flags/seminole-shield.png
+share/freeciv/flags/seminole.png
 share/freeciv/flags/senegal-large.png
 share/freeciv/flags/senegal-shield-large.png
 share/freeciv/flags/senegal-shield.png
@@ -1373,10 +1979,22 @@ share/freeciv/flags/serbia-large.png
 share/freeciv/flags/serbia-shield-large.png
 share/freeciv/flags/serbia-shield.png
 share/freeciv/flags/serbia.png
+share/freeciv/flags/seychelles-large.png
+share/freeciv/flags/seychelles-shield-large.png
+share/freeciv/flags/seychelles-shield.png
+share/freeciv/flags/seychelles.png
+share/freeciv/flags/shan-large.png
+share/freeciv/flags/shan-shield-large.png
+share/freeciv/flags/shan-shield.png
+share/freeciv/flags/shan.png
 share/freeciv/flags/shawnee-large.png
 share/freeciv/flags/shawnee-shield-large.png
 share/freeciv/flags/shawnee-shield.png
 share/freeciv/flags/shawnee.png
+share/freeciv/flags/sherpa-large.png
+share/freeciv/flags/sherpa-shield-large.png
+share/freeciv/flags/sherpa-shield.png
+share/freeciv/flags/sherpa.png
 share/freeciv/flags/siberia-large.png
 share/freeciv/flags/siberia-shield-large.png
 share/freeciv/flags/siberia-shield.png
@@ -1385,6 +2003,10 @@ share/freeciv/flags/sicily-large.png
 share/freeciv/flags/sicily-shield-large.png
 share/freeciv/flags/sicily-shield.png
 share/freeciv/flags/sicily.png
+share/freeciv/flags/sierra_leone-large.png
+share/freeciv/flags/sierra_leone-shield-large.png
+share/freeciv/flags/sierra_leone-shield.png
+share/freeciv/flags/sierra_leone.png
 share/freeciv/flags/sikh-large.png
 share/freeciv/flags/sikh-shield-large.png
 share/freeciv/flags/sikh-shield.png
@@ -1401,6 +2023,10 @@ share/freeciv/flags/singapore-large.png
 share/freeciv/flags/singapore-shield-large.png
 share/freeciv/flags/singapore-shield.png
 share/freeciv/flags/singapore.png
+share/freeciv/flags/sinhalese-large.png
+share/freeciv/flags/sinhalese-shield-large.png
+share/freeciv/flags/sinhalese-shield.png
+share/freeciv/flags/sinhalese.png
 share/freeciv/flags/slavic-large.png
 share/freeciv/flags/slavic-shield-large.png
 share/freeciv/flags/slavic-shield.png
@@ -1413,10 +2039,22 @@ share/freeciv/flags/slovenia-large.png
 share/freeciv/flags/slovenia-shield-large.png
 share/freeciv/flags/slovenia-shield.png
 share/freeciv/flags/slovenia.png
+share/freeciv/flags/sokoto-large.png
+share/freeciv/flags/sokoto-shield-large.png
+share/freeciv/flags/sokoto-shield.png
+share/freeciv/flags/sokoto.png
+share/freeciv/flags/solomon_islands-large.png
+share/freeciv/flags/solomon_islands-shield-large.png
+share/freeciv/flags/solomon_islands-shield.png
+share/freeciv/flags/solomon_islands.png
 share/freeciv/flags/somalia-large.png
 share/freeciv/flags/somalia-shield-large.png
 share/freeciv/flags/somalia-shield.png
 share/freeciv/flags/somalia.png
+share/freeciv/flags/somaliland-large.png
+share/freeciv/flags/somaliland-shield-large.png
+share/freeciv/flags/somaliland-shield.png
+share/freeciv/flags/somaliland.png
 share/freeciv/flags/songhai-large.png
 share/freeciv/flags/songhai-shield-large.png
 share/freeciv/flags/songhai-shield.png
@@ -1433,6 +2071,10 @@ share/freeciv/flags/southern_cross-large.png
 share/freeciv/flags/southern_cross-shield-large.png
 share/freeciv/flags/southern_cross-shield.png
 share/freeciv/flags/southern_cross.png
+share/freeciv/flags/southern_sudan-large.png
+share/freeciv/flags/southern_sudan-shield-large.png
+share/freeciv/flags/southern_sudan-shield.png
+share/freeciv/flags/southern_sudan.png
 share/freeciv/flags/soviet-large.png
 share/freeciv/flags/soviet-shield-large.png
 share/freeciv/flags/soviet-shield.png
@@ -1457,6 +2099,10 @@ share/freeciv/flags/sudan-large.png
 share/freeciv/flags/sudan-shield-large.png
 share/freeciv/flags/sudan-shield.png
 share/freeciv/flags/sudan.png
+share/freeciv/flags/suebian-large.png
+share/freeciv/flags/suebian-shield-large.png
+share/freeciv/flags/suebian-shield.png
+share/freeciv/flags/suebian.png
 share/freeciv/flags/sumeria-large.png
 share/freeciv/flags/sumeria-shield-large.png
 share/freeciv/flags/sumeria-shield.png
@@ -1469,6 +2115,10 @@ share/freeciv/flags/svg-large.png
 share/freeciv/flags/svg-shield-large.png
 share/freeciv/flags/svg-shield.png
 share/freeciv/flags/svg.png
+share/freeciv/flags/swahili-large.png
+share/freeciv/flags/swahili-shield-large.png
+share/freeciv/flags/swahili-shield.png
+share/freeciv/flags/swahili.png
 share/freeciv/flags/swaziland-large.png
 share/freeciv/flags/swaziland-shield-large.png
 share/freeciv/flags/swaziland-shield.png
@@ -1477,10 +2127,10 @@ share/freeciv/flags/sweden-large.png
 share/freeciv/flags/sweden-shield-large.png
 share/freeciv/flags/sweden-shield.png
 share/freeciv/flags/sweden.png
-share/freeciv/flags/swiss-large.png
-share/freeciv/flags/swiss-shield-large.png
-share/freeciv/flags/swiss-shield.png
-share/freeciv/flags/swiss.png
+share/freeciv/flags/switzerland-large.png
+share/freeciv/flags/switzerland-shield-large.png
+share/freeciv/flags/switzerland-shield.png
+share/freeciv/flags/switzerland.png
 share/freeciv/flags/syria-large.png
 share/freeciv/flags/syria-shield-large.png
 share/freeciv/flags/syria-shield.png
@@ -1501,6 +2151,10 @@ share/freeciv/flags/tajikistan-large.png
 share/freeciv/flags/tajikistan-shield-large.png
 share/freeciv/flags/tajikistan-shield.png
 share/freeciv/flags/tajikistan.png
+share/freeciv/flags/tanganyika-large.png
+share/freeciv/flags/tanganyika-shield-large.png
+share/freeciv/flags/tanganyika-shield.png
+share/freeciv/flags/tanganyika.png
 share/freeciv/flags/tannu_tuva-large.png
 share/freeciv/flags/tannu_tuva-shield-large.png
 share/freeciv/flags/tannu_tuva-shield.png
@@ -1533,6 +2187,10 @@ share/freeciv/flags/thrace-large.png
 share/freeciv/flags/thrace-shield-large.png
 share/freeciv/flags/thrace-shield.png
 share/freeciv/flags/thrace.png
+share/freeciv/flags/thuringia-large.png
+share/freeciv/flags/thuringia-shield-large.png
+share/freeciv/flags/thuringia-shield.png
+share/freeciv/flags/thuringia.png
 share/freeciv/flags/tibet-large.png
 share/freeciv/flags/tibet-shield-large.png
 share/freeciv/flags/tibet-shield.png
@@ -1557,10 +2215,30 @@ share/freeciv/flags/tonga-large.png
 share/freeciv/flags/tonga-shield-large.png
 share/freeciv/flags/tonga-shield.png
 share/freeciv/flags/tonga.png
+share/freeciv/flags/transnistria-large.png
+share/freeciv/flags/transnistria-shield-large.png
+share/freeciv/flags/transnistria-shield.png
+share/freeciv/flags/transnistria.png
 share/freeciv/flags/transylvania-large.png
 share/freeciv/flags/transylvania-shield-large.png
 share/freeciv/flags/transylvania-shield.png
 share/freeciv/flags/transylvania.png
+share/freeciv/flags/trebizond-large.png
+share/freeciv/flags/trebizond-shield-large.png
+share/freeciv/flags/trebizond-shield.png
+share/freeciv/flags/trebizond.png
+share/freeciv/flags/trinidad_and_tobago-large.png
+share/freeciv/flags/trinidad_and_tobago-shield-large.png
+share/freeciv/flags/trinidad_and_tobago-shield.png
+share/freeciv/flags/trinidad_and_tobago.png
+share/freeciv/flags/trnc-large.png
+share/freeciv/flags/trnc-shield-large.png
+share/freeciv/flags/trnc-shield.png
+share/freeciv/flags/trnc.png
+share/freeciv/flags/tuareg-large.png
+share/freeciv/flags/tuareg-shield-large.png
+share/freeciv/flags/tuareg-shield.png
+share/freeciv/flags/tuareg.png
 share/freeciv/flags/tunisia-large.png
 share/freeciv/flags/tunisia-shield-large.png
 share/freeciv/flags/tunisia-shield.png
@@ -1609,6 +2287,10 @@ share/freeciv/flags/unknown-large.png
 share/freeciv/flags/unknown-shield-large.png
 share/freeciv/flags/unknown-shield.png
 share/freeciv/flags/unknown.png
+share/freeciv/flags/urartu-large.png
+share/freeciv/flags/urartu-shield-large.png
+share/freeciv/flags/urartu-shield.png
+share/freeciv/flags/urartu.png
 share/freeciv/flags/uruguay-large.png
 share/freeciv/flags/uruguay-shield-large.png
 share/freeciv/flags/uruguay-shield.png
@@ -1637,10 +2319,30 @@ share/freeciv/flags/vandal-large.png
 share/freeciv/flags/vandal-shield-large.png
 share/freeciv/flags/vandal-shield.png
 share/freeciv/flags/vandal.png
+share/freeciv/flags/vanuatu-large.png
+share/freeciv/flags/vanuatu-shield-large.png
+share/freeciv/flags/vanuatu-shield.png
+share/freeciv/flags/vanuatu.png
 share/freeciv/flags/vatican-large.png
 share/freeciv/flags/vatican-shield-large.png
 share/freeciv/flags/vatican-shield.png
 share/freeciv/flags/vatican.png
+share/freeciv/flags/vedic-large.png
+share/freeciv/flags/vedic-shield-large.png
+share/freeciv/flags/vedic-shield.png
+share/freeciv/flags/vedic.png
+share/freeciv/flags/veletian-large.png
+share/freeciv/flags/veletian-shield-large.png
+share/freeciv/flags/veletian-shield.png
+share/freeciv/flags/veletian.png
+share/freeciv/flags/venda-large.png
+share/freeciv/flags/venda-shield-large.png
+share/freeciv/flags/venda-shield.png
+share/freeciv/flags/venda.png
+share/freeciv/flags/venetic-large.png
+share/freeciv/flags/venetic-shield-large.png
+share/freeciv/flags/venetic-shield.png
+share/freeciv/flags/venetic.png
 share/freeciv/flags/venezuela-large.png
 share/freeciv/flags/venezuela-shield-large.png
 share/freeciv/flags/venezuela-shield.png
@@ -1665,6 +2367,22 @@ share/freeciv/flags/visigoth-large.png
 share/freeciv/flags/visigoth-shield-large.png
 share/freeciv/flags/visigoth-shield.png
 share/freeciv/flags/visigoth.png
+share/freeciv/flags/vistulan-large.png
+share/freeciv/flags/vistulan-shield-large.png
+share/freeciv/flags/vistulan-shield.png
+share/freeciv/flags/vistulan.png
+share/freeciv/flags/volapuk-large.png
+share/freeciv/flags/volapuk-shield-large.png
+share/freeciv/flags/volapuk-shield.png
+share/freeciv/flags/volapuk.png
+share/freeciv/flags/volga_bulgar-large.png
+share/freeciv/flags/volga_bulgar-shield-large.png
+share/freeciv/flags/volga_bulgar-shield.png
+share/freeciv/flags/volga_bulgar.png
+share/freeciv/flags/volga_german-large.png
+share/freeciv/flags/volga_german-shield-large.png
+share/freeciv/flags/volga_german-shield.png
+share/freeciv/flags/volga_german.png
 share/freeciv/flags/wales-large.png
 share/freeciv/flags/wales-shield-large.png
 share/freeciv/flags/wales-shield.png
@@ -1677,6 +2395,10 @@ share/freeciv/flags/west_indies_federation-large.png
 share/freeciv/flags/west_indies_federation-shield-large.png
 share/freeciv/flags/west_indies_federation-shield.png
 share/freeciv/flags/west_indies_federation.png
+share/freeciv/flags/west_papua-large.png
+share/freeciv/flags/west_papua-shield-large.png
+share/freeciv/flags/west_papua-shield.png
+share/freeciv/flags/west_papua.png
 share/freeciv/flags/westphalia-large.png
 share/freeciv/flags/westphalia-shield-large.png
 share/freeciv/flags/westphalia-shield.png
@@ -1685,6 +2407,14 @@ share/freeciv/flags/wuerttemberg-large.png
 share/freeciv/flags/wuerttemberg-shield-large.png
 share/freeciv/flags/wuerttemberg-shield.png
 share/freeciv/flags/wuerttemberg.png
+share/freeciv/flags/xhosa-large.png
+share/freeciv/flags/xhosa-shield-large.png
+share/freeciv/flags/xhosa-shield.png
+share/freeciv/flags/xhosa.png
+share/freeciv/flags/xiongnu-large.png
+share/freeciv/flags/xiongnu-shield-large.png
+share/freeciv/flags/xiongnu-shield.png
+share/freeciv/flags/xiongnu.png
 share/freeciv/flags/yemen-large.png
 share/freeciv/flags/yemen-shield-large.png
 share/freeciv/flags/yemen-shield.png
@@ -1697,10 +2427,22 @@ share/freeciv/flags/yugoslavia-large.png
 share/freeciv/flags/yugoslavia-shield-large.png
 share/freeciv/flags/yugoslavia-shield.png
 share/freeciv/flags/yugoslavia.png
+share/freeciv/flags/zambia-large.png
+share/freeciv/flags/zambia-shield-large.png
+share/freeciv/flags/zambia-shield.png
+share/freeciv/flags/zambia.png
+share/freeciv/flags/zanzibar-large.png
+share/freeciv/flags/zanzibar-shield-large.png
+share/freeciv/flags/zanzibar-shield.png
+share/freeciv/flags/zanzibar.png
 share/freeciv/flags/zapotec-large.png
 share/freeciv/flags/zapotec-shield-large.png
 share/freeciv/flags/zapotec-shield.png
 share/freeciv/flags/zapotec.png
+share/freeciv/flags/zhuang-large.png
+share/freeciv/flags/zhuang-shield-large.png
+share/freeciv/flags/zhuang-shield.png
+share/freeciv/flags/zhuang.png
 share/freeciv/flags/zimbabwe-large.png
 share/freeciv/flags/zimbabwe-shield-large.png
 share/freeciv/flags/zimbabwe-shield.png
@@ -1764,8 +2506,6 @@ share/freeciv/misc/citybar.png
 share/freeciv/misc/citybar.spec
 share/freeciv/misc/cityicon.png
 share/freeciv/misc/civicon.png
-share/freeciv/misc/colors.png
-share/freeciv/misc/colors.spec
 share/freeciv/misc/colors.tilespec
 share/freeciv/misc/cursors.png
 share/freeciv/misc/cursors.spec
@@ -1773,6 +2513,8 @@ share/freeciv/misc/editor.png
 share/freeciv/misc/editor.spec
 share/freeciv/misc/flags-large.spec
 share/freeciv/misc/flags.spec
+share/freeciv/misc/governments.png
+share/freeciv/misc/governments.spec
 share/freeciv/misc/icons.spec
 share/freeciv/misc/intro.png
 share/freeciv/misc/mpicon.png
@@ -1785,40 +2527,50 @@ share/freeciv/misc/small.png
 share/freeciv/misc/small.spec
 share/freeciv/misc/space.png
 share/freeciv/misc/space.spec
+share/freeciv/misc/specialists.png
+share/freeciv/misc/specialists.spec
 share/freeciv/misc/techs.png
 share/freeciv/misc/techs.spec
 share/freeciv/misc/treaty.png
 share/freeciv/misc/treaty.spec
 share/freeciv/misc/wonders-large.spec
 share/freeciv/multiplayer.serv
-share/freeciv/multiplayer/ai_effects.ruleset
 share/freeciv/multiplayer/buildings.ruleset
 share/freeciv/multiplayer/cities.ruleset
 share/freeciv/multiplayer/effects.ruleset
 share/freeciv/multiplayer/game.ruleset
 share/freeciv/multiplayer/governments.ruleset
+share/freeciv/multiplayer/nations.ruleset
 share/freeciv/multiplayer/script.lua
 share/freeciv/multiplayer/techs.ruleset
 share/freeciv/multiplayer/terrain.ruleset
 share/freeciv/multiplayer/units.ruleset
 share/freeciv/nation/abkhaz.ruleset
 share/freeciv/nation/aborigines.ruleset
+share/freeciv/nation/abyssinian.ruleset
 share/freeciv/nation/acadian.ruleset
 share/freeciv/nation/acehnese.ruleset
+share/freeciv/nation/acrean.ruleset
 share/freeciv/nation/afghani.ruleset
+share/freeciv/nation/african.ruleset
 share/freeciv/nation/ainu.ruleset
 share/freeciv/nation/akwe.ruleset
 share/freeciv/nation/alandalus.ruleset
+share/freeciv/nation/alander.ruleset
 share/freeciv/nation/albanian.ruleset
 share/freeciv/nation/aleut.ruleset
 share/freeciv/nation/algerian.ruleset
+share/freeciv/nation/alsatian.ruleset
 share/freeciv/nation/amazigh.ruleset
 share/freeciv/nation/amazonian.ruleset
 share/freeciv/nation/american.ruleset
 share/freeciv/nation/andorran.ruleset
 share/freeciv/nation/angolan.ruleset
+share/freeciv/nation/anhaltian.ruleset
 share/freeciv/nation/anishinaabe.ruleset
 share/freeciv/nation/antarctican.ruleset
+share/freeciv/nation/antiguan.ruleset
+share/freeciv/nation/antillean.ruleset
 share/freeciv/nation/apache.ruleset
 share/freeciv/nation/arab.ruleset
 share/freeciv/nation/aragonese.ruleset
@@ -1826,77 +2578,116 @@ share/freeciv/nation/aramean.ruleset
 share/freeciv/nation/argentine.ruleset
 share/freeciv/nation/armenian.ruleset
 share/freeciv/nation/ashanti.ruleset
+share/freeciv/nation/assamese.ruleset
 share/freeciv/nation/assyrian.ruleset
 share/freeciv/nation/asturian.ruleset
 share/freeciv/nation/atlantean.ruleset
 share/freeciv/nation/australian.ruleset
 share/freeciv/nation/austrian.ruleset
+share/freeciv/nation/avar.ruleset
 share/freeciv/nation/aymara.ruleset
 share/freeciv/nation/azeri.ruleset
 share/freeciv/nation/aztec.ruleset
 share/freeciv/nation/babylonian.ruleset
 share/freeciv/nation/badian.ruleset
+share/freeciv/nation/bahamian.ruleset
+share/freeciv/nation/bahraini.ruleset
+share/freeciv/nation/bangladeshi.ruleset
+share/freeciv/nation/barbadian.ruleset
 share/freeciv/nation/barbarian.ruleset
 share/freeciv/nation/bashkir.ruleset
 share/freeciv/nation/basque.ruleset
 share/freeciv/nation/bavarian.ruleset
 share/freeciv/nation/belarusian.ruleset
 share/freeciv/nation/belgian.ruleset
+share/freeciv/nation/belgic.ruleset
+share/freeciv/nation/belizean.ruleset
 share/freeciv/nation/bengali.ruleset
 share/freeciv/nation/benin.ruleset
+share/freeciv/nation/beninese.ruleset
 share/freeciv/nation/bhutanese.ruleset
 share/freeciv/nation/biafran.ruleset
+share/freeciv/nation/bissauguinean.ruleset
 share/freeciv/nation/boer.ruleset
+share/freeciv/nation/boian.ruleset
 share/freeciv/nation/bolivian.ruleset
 share/freeciv/nation/bosnia.ruleset
 share/freeciv/nation/bosporan.ruleset
+share/freeciv/nation/botswanan.ruleset
 share/freeciv/nation/brandenburgian.ruleset
 share/freeciv/nation/brazilian.ruleset
 share/freeciv/nation/breton.ruleset
 share/freeciv/nation/british.ruleset
 share/freeciv/nation/briton.ruleset
+share/freeciv/nation/bruneian.ruleset
 share/freeciv/nation/bulgarian.ruleset
 share/freeciv/nation/burgundian.ruleset
+share/freeciv/nation/burgundic.ruleset
 share/freeciv/nation/burkinabe.ruleset
 share/freeciv/nation/burmese.ruleset
 share/freeciv/nation/burundi.ruleset
+share/freeciv/nation/buryat.ruleset
 share/freeciv/nation/byzantium.ruleset
 share/freeciv/nation/californian.ruleset
 share/freeciv/nation/cambodian.ruleset
 share/freeciv/nation/cameroonian.ruleset
 share/freeciv/nation/canadian.ruleset
+share/freeciv/nation/canari.ruleset
+share/freeciv/nation/cantonese.ruleset
+share/freeciv/nation/capeverdean.ruleset
+share/freeciv/nation/carantanian.ruleset
 share/freeciv/nation/carthaginian.ruleset
 share/freeciv/nation/castilian.ruleset
 share/freeciv/nation/catalan.ruleset
 share/freeciv/nation/celtiberian.ruleset
+share/freeciv/nation/celtic.ruleset
 share/freeciv/nation/centralafrican.ruleset
 share/freeciv/nation/centralamerican.ruleset
+share/freeciv/nation/centrallithuanian.ruleset
+share/freeciv/nation/chadian.ruleset
 share/freeciv/nation/cham.ruleset
 share/freeciv/nation/chananean.ruleset
 share/freeciv/nation/chechen.ruleset
 share/freeciv/nation/cherokee.ruleset
+share/freeciv/nation/chiapanec.ruleset
+share/freeciv/nation/chickasaw.ruleset
 share/freeciv/nation/chilean.ruleset
 share/freeciv/nation/chimu.ruleset
 share/freeciv/nation/chinese.ruleset
+share/freeciv/nation/chinook.ruleset
+share/freeciv/nation/choctaw.ruleset
 share/freeciv/nation/chola.ruleset
+share/freeciv/nation/chrobatian.ruleset
 share/freeciv/nation/chumash.ruleset
+share/freeciv/nation/chuvash.ruleset
+share/freeciv/nation/circassian.ruleset
 share/freeciv/nation/colombian.ruleset
 share/freeciv/nation/comanche.ruleset
+share/freeciv/nation/comorian.ruleset
 share/freeciv/nation/confederate.ruleset
 share/freeciv/nation/congolese.ruleset
+share/freeciv/nation/congolesebrazzaville.ruleset
 share/freeciv/nation/cornish.ruleset
 share/freeciv/nation/corsican.ruleset
 share/freeciv/nation/cossack.ruleset
 share/freeciv/nation/costarican.ruleset
 share/freeciv/nation/cree.ruleset
+share/freeciv/nation/cretan.ruleset
 share/freeciv/nation/crimeantatar.ruleset
 share/freeciv/nation/croatian.ruleset
+share/freeciv/nation/crusader.ruleset
 share/freeciv/nation/cuban.ruleset
 share/freeciv/nation/curonian.ruleset
+share/freeciv/nation/cuyavian.ruleset
 share/freeciv/nation/cypriot.ruleset
+share/freeciv/nation/cyrenaican.ruleset
 share/freeciv/nation/czech.ruleset
+share/freeciv/nation/czechoslovak.ruleset
+share/freeciv/nation/dacian.ruleset
 share/freeciv/nation/dahomean.ruleset
 share/freeciv/nation/danish.ruleset
+share/freeciv/nation/darfuri.ruleset
+share/freeciv/nation/djiboutian.ruleset
 share/freeciv/nation/dominican.ruleset
 share/freeciv/nation/dominicano.ruleset
 share/freeciv/nation/dryad.ruleset
@@ -1909,26 +2700,45 @@ share/freeciv/nation/egyptianarab.ruleset
 share/freeciv/nation/elamite.ruleset
 share/freeciv/nation/emirati.ruleset
 share/freeciv/nation/english.ruleset
+share/freeciv/nation/epirote.ruleset
+share/freeciv/nation/equatoguinean.ruleset
 share/freeciv/nation/eritrean.ruleset
 share/freeciv/nation/esperant.ruleset
 share/freeciv/nation/estonian.ruleset
 share/freeciv/nation/ethiopian.ruleset
 share/freeciv/nation/etruscan.ruleset
 share/freeciv/nation/european.ruleset
+share/freeciv/nation/evenki.ruleset
+share/freeciv/nation/faroese.ruleset
 share/freeciv/nation/fijian.ruleset
 share/freeciv/nation/filipino.ruleset
 share/freeciv/nation/finnish.ruleset
 share/freeciv/nation/flemish.ruleset
+share/freeciv/nation/florentine.ruleset
+share/freeciv/nation/formosan.ruleset
 share/freeciv/nation/franconian.ruleset
+share/freeciv/nation/frankish.ruleset
 share/freeciv/nation/french.ruleset
 share/freeciv/nation/frisian.ruleset
+share/freeciv/nation/friulian.ruleset
+share/freeciv/nation/fulani.ruleset
+share/freeciv/nation/gabonese.ruleset
 share/freeciv/nation/gaelic.ruleset
 share/freeciv/nation/galician.ruleset
 share/freeciv/nation/gallic.ruleset
+share/freeciv/nation/gambian.ruleset
+share/freeciv/nation/genoese.ruleset
 share/freeciv/nation/georgian.ruleset
+share/freeciv/nation/gepid.ruleset
 share/freeciv/nation/german.ruleset
+share/freeciv/nation/germanbelgian.ruleset
+share/freeciv/nation/germanic.ruleset
+share/freeciv/nation/ghana.ruleset
 share/freeciv/nation/ghanaian.ruleset
+share/freeciv/nation/ghaznavid.ruleset
 share/freeciv/nation/gokturk.ruleset
+share/freeciv/nation/goldenhorde.ruleset
+share/freeciv/nation/gothic.ruleset
 share/freeciv/nation/greaterpolish.ruleset
 share/freeciv/nation/greek.ruleset
 share/freeciv/nation/greenlander.ruleset
@@ -1936,6 +2746,7 @@ share/freeciv/nation/grenadian.ruleset
 share/freeciv/nation/guanche.ruleset
 share/freeciv/nation/guarani.ruleset
 share/freeciv/nation/guatemalan.ruleset
+share/freeciv/nation/guinean.ruleset
 share/freeciv/nation/gupta.ruleset
 share/freeciv/nation/guyanese.ruleset
 share/freeciv/nation/hacker.ruleset
@@ -1946,6 +2757,8 @@ share/freeciv/nation/hansa.ruleset
 share/freeciv/nation/hasinay.ruleset
 share/freeciv/nation/hawaiian.ruleset
 share/freeciv/nation/hellenic.ruleset
+share/freeciv/nation/helvetian.ruleset
+share/freeciv/nation/hephthalite.ruleset
 share/freeciv/nation/hessian.ruleset
 share/freeciv/nation/himyarite.ruleset
 share/freeciv/nation/hittite.ruleset
@@ -1954,11 +2767,13 @@ share/freeciv/nation/holysee.ruleset
 share/freeciv/nation/honduran.ruleset
 share/freeciv/nation/hopi.ruleset
 share/freeciv/nation/hungarian.ruleset
+share/freeciv/nation/hunnic.ruleset
 share/freeciv/nation/iberian.ruleset
 share/freeciv/nation/icelandic.ruleset
 share/freeciv/nation/illyrian.ruleset
 share/freeciv/nation/inca.ruleset
 share/freeciv/nation/indian.ruleset
+share/freeciv/nation/indoeuropean.ruleset
 share/freeciv/nation/indonesian.ruleset
 share/freeciv/nation/inuit.ruleset
 share/freeciv/nation/iranian.ruleset
@@ -1966,37 +2781,62 @@ share/freeciv/nation/iraqi.ruleset
 share/freeciv/nation/irish.ruleset
 share/freeciv/nation/iroquois.ruleset
 share/freeciv/nation/israeli.ruleset
+share/freeciv/nation/israelite.ruleset
 share/freeciv/nation/italian.ruleset
+share/freeciv/nation/italiangreek.ruleset
 share/freeciv/nation/ivoirian.ruleset
+share/freeciv/nation/jaffna.ruleset
 share/freeciv/nation/jamaican.ruleset
 share/freeciv/nation/japanese.ruleset
 share/freeciv/nation/jolof.ruleset
+share/freeciv/nation/jordanian.ruleset
 share/freeciv/nation/kalmyk.ruleset
 share/freeciv/nation/kanem-bornu.ruleset
+share/freeciv/nation/karabakhi.ruleset
 share/freeciv/nation/karelian.ruleset
+share/freeciv/nation/karen.ruleset
 share/freeciv/nation/kashmiri.ruleset
+share/freeciv/nation/kashubian.ruleset
+share/freeciv/nation/katangan.ruleset
 share/freeciv/nation/kazakh.ruleset
 share/freeciv/nation/kenyan.ruleset
 share/freeciv/nation/khazar.ruleset
+share/freeciv/nation/khmer.ruleset
+share/freeciv/nation/khoisan.ruleset
 share/freeciv/nation/khwarezmian.ruleset
+share/freeciv/nation/kiribati.ruleset
+share/freeciv/nation/kittitian.ruleset
+share/freeciv/nation/komi.ruleset
 share/freeciv/nation/kongo.ruleset
 share/freeciv/nation/korean.ruleset
 share/freeciv/nation/kosovar.ruleset
+share/freeciv/nation/kuna.ruleset
 share/freeciv/nation/kurd.ruleset
+share/freeciv/nation/kushan.ruleset
+share/freeciv/nation/kuwaiti.ruleset
 share/freeciv/nation/kyrgyz.ruleset
+share/freeciv/nation/langobardic.ruleset
 share/freeciv/nation/lankese.ruleset
 share/freeciv/nation/laotian.ruleset
+share/freeciv/nation/latin.ruleset
 share/freeciv/nation/latvian.ruleset
 share/freeciv/nation/lebanese.ruleset
 share/freeciv/nation/lendian.ruleset
 share/freeciv/nation/leonese.ruleset
+share/freeciv/nation/lesothoan.ruleset
+share/freeciv/nation/liberian.ruleset
+share/freeciv/nation/liburnian.ruleset
 share/freeciv/nation/libyan.ruleset
 share/freeciv/nation/liechtensteiner.ruleset
+share/freeciv/nation/ligurian.ruleset
 share/freeciv/nation/lipkatatar.ruleset
+share/freeciv/nation/lippe.ruleset
 share/freeciv/nation/lithuanian.ruleset
 share/freeciv/nation/lojbanistani.ruleset
 share/freeciv/nation/lorrain.ruleset
+share/freeciv/nation/luwian.ruleset
 share/freeciv/nation/luxembourgish.ruleset
+share/freeciv/nation/lycian.ruleset
 share/freeciv/nation/maasai.ruleset
 share/freeciv/nation/macedon.ruleset
 share/freeciv/nation/macedonian.ruleset
@@ -2004,17 +2844,25 @@ share/freeciv/nation/majapahit.ruleset
 share/freeciv/nation/malagasy.ruleset
 share/freeciv/nation/malawian.ruleset
 share/freeciv/nation/malaysian.ruleset
+share/freeciv/nation/maldivian.ruleset
 share/freeciv/nation/mali.ruleset
 share/freeciv/nation/malian.ruleset
 share/freeciv/nation/maltese.ruleset
+share/freeciv/nation/mamluk.ruleset
 share/freeciv/nation/manchu.ruleset
 share/freeciv/nation/manx.ruleset
 share/freeciv/nation/maori.ruleset
 share/freeciv/nation/mapuche.ruleset
+share/freeciv/nation/marathi.ruleset
+share/freeciv/nation/marshallese.ruleset
 share/freeciv/nation/martian.ruleset
+share/freeciv/nation/mauritanian.ruleset
+share/freeciv/nation/mauritian.ruleset
 share/freeciv/nation/mayan.ruleset
 share/freeciv/nation/mazovian.ruleset
 share/freeciv/nation/mecklenburgian.ruleset
+share/freeciv/nation/median.ruleset
+share/freeciv/nation/messapian.ruleset
 share/freeciv/nation/metis.ruleset
 share/freeciv/nation/mexican.ruleset
 share/freeciv/nation/miao.ruleset
@@ -2022,22 +2870,27 @@ share/freeciv/nation/micronesian.ruleset
 share/freeciv/nation/mikmaq.ruleset
 share/freeciv/nation/milanese.ruleset
 share/freeciv/nation/miskito.ruleset
+share/freeciv/nation/mitanni.ruleset
 share/freeciv/nation/mixtec.ruleset
 share/freeciv/nation/moldovan.ruleset
+share/freeciv/nation/moluccan.ruleset
+share/freeciv/nation/mon.ruleset
 share/freeciv/nation/monegasque.ruleset
 share/freeciv/nation/mongol.ruleset
 share/freeciv/nation/montenegrin.ruleset
 share/freeciv/nation/moravian.ruleset
 share/freeciv/nation/mordvin.ruleset
 share/freeciv/nation/moroccan.ruleset
-share/freeciv/nation/motswana.ruleset
 share/freeciv/nation/mozambican.ruleset
 share/freeciv/nation/mughal.ruleset
+share/freeciv/nation/muscovite.ruleset
 share/freeciv/nation/muskogee.ruleset
 share/freeciv/nation/mwiska.ruleset
 share/freeciv/nation/namibian.ruleset
+share/freeciv/nation/nauruan.ruleset
 share/freeciv/nation/navajo.ruleset
 share/freeciv/nation/neapolitan.ruleset
+share/freeciv/nation/nenets.ruleset
 share/freeciv/nation/nepali.ruleset
 share/freeciv/nation/nestorian.ruleset
 share/freeciv/nation/newfoundland.ruleset
@@ -2050,95 +2903,134 @@ share/freeciv/nation/norman.ruleset
 share/freeciv/nation/northkorean.ruleset
 share/freeciv/nation/northumbrian.ruleset
 share/freeciv/nation/norwegian.ruleset
+share/freeciv/nation/novgorodian.ruleset
 share/freeciv/nation/nubian.ruleset
 share/freeciv/nation/numidian.ruleset
 share/freeciv/nation/nuu-chah-nulth.ruleset
 share/freeciv/nation/occitan.ruleset
 share/freeciv/nation/ohlone.ruleset
 share/freeciv/nation/oldenburgian.ruleset
+share/freeciv/nation/oldprussian.ruleset
 share/freeciv/nation/omani.ruleset
 share/freeciv/nation/ossetian.ruleset
 share/freeciv/nation/ostrogothic.ruleset
 share/freeciv/nation/otomi.ruleset
 share/freeciv/nation/ottoman.ruleset
 share/freeciv/nation/ozite.ruleset
+share/freeciv/nation/paeonian.ruleset
 share/freeciv/nation/pakistani.ruleset
 share/freeciv/nation/palatinate.ruleset
 share/freeciv/nation/palestinian.ruleset
 share/freeciv/nation/palmyrene.ruleset
 share/freeciv/nation/panamanian.ruleset
 share/freeciv/nation/papuan.ruleset
+share/freeciv/nation/papuanewguinean.ruleset
 share/freeciv/nation/paraguayan.ruleset
+share/freeciv/nation/parthian.ruleset
 share/freeciv/nation/pashtun.ruleset
+share/freeciv/nation/pelasgian.ruleset
 share/freeciv/nation/persian.ruleset
 share/freeciv/nation/peruvian.ruleset
 share/freeciv/nation/phoenician.ruleset
+share/freeciv/nation/phrygian.ruleset
+share/freeciv/nation/pictish.ruleset
 share/freeciv/nation/piedmontese.ruleset
 share/freeciv/nation/pirate.ruleset
 share/freeciv/nation/polish.ruleset
 share/freeciv/nation/polynesian.ruleset
+share/freeciv/nation/pontic.ruleset
 share/freeciv/nation/portuguese.ruleset
 share/freeciv/nation/prussian.ruleset
 share/freeciv/nation/puertorican.ruleset
 share/freeciv/nation/purhepecha.ruleset
+share/freeciv/nation/qatari.ruleset
 share/freeciv/nation/quebecois.ruleset
+share/freeciv/nation/rapanui.ruleset
 share/freeciv/nation/raramuri.ruleset
+share/freeciv/nation/rhenish.ruleset
 share/freeciv/nation/riffian.ruleset
 share/freeciv/nation/riograndense.ruleset
 share/freeciv/nation/roman.ruleset
 share/freeciv/nation/romanian.ruleset
+share/freeciv/nation/romansh.ruleset
 share/freeciv/nation/russian.ruleset
+share/freeciv/nation/rusyn.ruleset
 share/freeciv/nation/ruthenian.ruleset
 share/freeciv/nation/rwandan.ruleset
 share/freeciv/nation/ryukyuan.ruleset
+share/freeciv/nation/sabine.ruleset
 share/freeciv/nation/sahrawi.ruleset
+share/freeciv/nation/saintlucian.ruleset
+share/freeciv/nation/saka.ruleset
+share/freeciv/nation/salishan.ruleset
 share/freeciv/nation/salvadoran.ruleset
 share/freeciv/nation/sami.ruleset
 share/freeciv/nation/sammarinese.ruleset
+share/freeciv/nation/samnite.ruleset
+share/freeciv/nation/samoan.ruleset
 share/freeciv/nation/samogitian.ruleset
+share/freeciv/nation/santomean.ruleset
+share/freeciv/nation/sardinian.ruleset
 share/freeciv/nation/sarmatian.ruleset
 share/freeciv/nation/saudi.ruleset
 share/freeciv/nation/savoyard.ruleset
 share/freeciv/nation/saxon.ruleset
+share/freeciv/nation/scanian.ruleset
 share/freeciv/nation/schleswig-holsteinian.ruleset
 share/freeciv/nation/scottish.ruleset
+share/freeciv/nation/scottishgaelic.ruleset
 share/freeciv/nation/scythian.ruleset
 share/freeciv/nation/seleucid.ruleset
+share/freeciv/nation/seljuk.ruleset
+share/freeciv/nation/seminole.ruleset
 share/freeciv/nation/senegalese.ruleset
 share/freeciv/nation/serbian.ruleset
+share/freeciv/nation/seychellois.ruleset
+share/freeciv/nation/shan.ruleset
 share/freeciv/nation/shawnee.ruleset
+share/freeciv/nation/sherpa.ruleset
 share/freeciv/nation/siberian.ruleset
 share/freeciv/nation/sicilian.ruleset
+share/freeciv/nation/sierraleonean.ruleset
 share/freeciv/nation/sikh.ruleset
 share/freeciv/nation/sikkimese.ruleset
 share/freeciv/nation/silesian.ruleset
 share/freeciv/nation/singaporean.ruleset
+share/freeciv/nation/sinhalese.ruleset
 share/freeciv/nation/sioux.ruleset
 share/freeciv/nation/slavic.ruleset
 share/freeciv/nation/slovakian.ruleset
 share/freeciv/nation/slovenian.ruleset
+share/freeciv/nation/solomonislander.ruleset
 share/freeciv/nation/somali.ruleset
+share/freeciv/nation/somaliland.ruleset
 share/freeciv/nation/songhai.ruleset
 share/freeciv/nation/sorbian.ruleset
+share/freeciv/nation/sotho.ruleset
 share/freeciv/nation/southafrican.ruleset
 share/freeciv/nation/southamerican.ruleset
 share/freeciv/nation/southkorean.ruleset
+share/freeciv/nation/southsudanese.ruleset
 share/freeciv/nation/southvietnamese.ruleset
 share/freeciv/nation/southyemeni.ruleset
 share/freeciv/nation/soviet.ruleset
 share/freeciv/nation/spanish.ruleset
 share/freeciv/nation/srivijaya.ruleset
 share/freeciv/nation/sudanese.ruleset
+share/freeciv/nation/suebian.ruleset
 share/freeciv/nation/sumerian.ruleset
 share/freeciv/nation/surinamese.ruleset
+share/freeciv/nation/swahili.ruleset
 share/freeciv/nation/swazi.ruleset
 share/freeciv/nation/swedish.ruleset
 share/freeciv/nation/swiss.ruleset
 share/freeciv/nation/syrian.ruleset
+share/freeciv/nation/tahitian.ruleset
 share/freeciv/nation/taino.ruleset
 share/freeciv/nation/tairona.ruleset
 share/freeciv/nation/taiwanese.ruleset
 share/freeciv/nation/tajik.ruleset
+share/freeciv/nation/tanganyikan.ruleset
 share/freeciv/nation/tanzanian.ruleset
 share/freeciv/nation/tatar.ruleset
 share/freeciv/nation/templar.ruleset
@@ -2146,59 +3038,81 @@ share/freeciv/nation/teutonic.ruleset
 share/freeciv/nation/texan.ruleset
 share/freeciv/nation/thai.ruleset
 share/freeciv/nation/thracian.ruleset
+share/freeciv/nation/thuringian.ruleset
 share/freeciv/nation/tibetan.ruleset
 share/freeciv/nation/timurid.ruleset
 share/freeciv/nation/tocharian.ruleset
 share/freeciv/nation/togolese.ruleset
 share/freeciv/nation/toltec.ruleset
 share/freeciv/nation/tongan.ruleset
+share/freeciv/nation/transnistrian.ruleset
 share/freeciv/nation/transylvanian.ruleset
+share/freeciv/nation/trinidadian.ruleset
+share/freeciv/nation/tswana.ruleset
+share/freeciv/nation/tuareg.ruleset
 share/freeciv/nation/tunisian.ruleset
 share/freeciv/nation/tupi.ruleset
 share/freeciv/nation/turk.ruleset
+share/freeciv/nation/turkishcypriot.ruleset
 share/freeciv/nation/turkmen.ruleset
 share/freeciv/nation/tuvan.ruleset
 share/freeciv/nation/tyrolian.ruleset
 share/freeciv/nation/ugandan.ruleset
 share/freeciv/nation/ukrainian.ruleset
 share/freeciv/nation/un.ruleset
+share/freeciv/nation/urartian.ruleset
 share/freeciv/nation/uruguayan.ruleset
 share/freeciv/nation/uyghur.ruleset
 share/freeciv/nation/uzbek.ruleset
 share/freeciv/nation/vampire.ruleset
 share/freeciv/nation/vandalic.ruleset
+share/freeciv/nation/vanuatuan.ruleset
+share/freeciv/nation/vedic.ruleset
+share/freeciv/nation/veletian.ruleset
+share/freeciv/nation/venda.ruleset
 share/freeciv/nation/venetian.ruleset
+share/freeciv/nation/venetic.ruleset
 share/freeciv/nation/venezuelan.ruleset
 share/freeciv/nation/vermont.ruleset
 share/freeciv/nation/vietnamese.ruleset
 share/freeciv/nation/viking.ruleset
 share/freeciv/nation/vincentian.ruleset
 share/freeciv/nation/visigothic.ruleset
+share/freeciv/nation/vistulan.ruleset
+share/freeciv/nation/volapuk.ruleset
+share/freeciv/nation/volgabulgar.ruleset
+share/freeciv/nation/volgagerman.ruleset
 share/freeciv/nation/walloon.ruleset
 share/freeciv/nation/welsh.ruleset
+share/freeciv/nation/werewolf.ruleset
 share/freeciv/nation/westernpomeranian.ruleset
 share/freeciv/nation/westernroman.ruleset
 share/freeciv/nation/westindian.ruleset
 share/freeciv/nation/westphalian.ruleset
 share/freeciv/nation/wuerttembergian.ruleset
+share/freeciv/nation/xhosa.ruleset
+share/freeciv/nation/xiongnu.ruleset
 share/freeciv/nation/yakut.ruleset
 share/freeciv/nation/yemeni.ruleset
 share/freeciv/nation/yucatecan.ruleset
 share/freeciv/nation/yugoslav.ruleset
+share/freeciv/nation/zambian.ruleset
+share/freeciv/nation/zanzibari.ruleset
 share/freeciv/nation/zapotec.ruleset
+share/freeciv/nation/zhuang.ruleset
 share/freeciv/nation/zimbabwean.ruleset
 share/freeciv/nation/zulu.ruleset
-share/freeciv/scenario/british-isles-85x80-v2.80.sav.gz
-share/freeciv/scenario/earth-160x90-v2.sav.gz
-share/freeciv/scenario/earth-80x50-v3.sav.gz
-share/freeciv/scenario/europe-200x100-v2.sav.gz
-share/freeciv/scenario/france-140x90-v2.sav.gz
-share/freeciv/scenario/hagworld-120x60-v1.2.sav.gz
-share/freeciv/scenario/iberian-peninsula-136x100-v1.0.sav.gz
-share/freeciv/scenario/italy-100x100-v1.5.sav.gz
-share/freeciv/scenario/japan-88x100-v1.3.sav.gz
-share/freeciv/scenario/north_america_116x100-v1.2.sav.gz
-share/freeciv/scenario/tutorial.sav.gz
+share/freeciv/scenarios/british-isles-85x80-v2.80.sav.gz
+share/freeciv/scenarios/earth-160x90-v2.sav.gz
+share/freeciv/scenarios/earth-80x50-v3.sav.gz
+share/freeciv/scenarios/europe-200x100-v2.sav.gz
+share/freeciv/scenarios/france-140x90-v2.sav.gz
+share/freeciv/scenarios/hagworld-120x60-v1.2.sav.gz
+share/freeciv/scenarios/iberian-peninsula-136x100-v1.0.sav.gz
+share/freeciv/scenarios/italy-100x100-v1.5.sav.gz
+share/freeciv/scenarios/japan-88x100-v1.3.sav.gz
+share/freeciv/scenarios/north_america_116x100-v1.2.sav.gz
+share/freeciv/scenarios/tutorial.sav.gz
 share/freeciv/stdsounds.soundspec
 share/freeciv/stdsounds/LrgCan.ogg
 share/freeciv/stdsounds/LrgExpl.ogg
@@ -2212,6 +3126,7 @@ share/freeciv/stdsounds/Splash.ogg
 share/freeciv/stdsounds/THover.ogg
 share/freeciv/stdsounds/Tread.ogg
 share/freeciv/stdsounds/foot3.ogg
+share/freeciv/stdsounds/illegal.ogg
 share/freeciv/stdsounds/inh2o.ogg
 share/freeciv/stdsounds/metbrk.ogg
 share/freeciv/stdsounds/wall01.ogg
@@ -2247,6 +3162,7 @@ share/freeciv/wonders/great_library.png
 share/freeciv/wonders/great_wall.png
 share/freeciv/wonders/hanging_gardens.png
 share/freeciv/wonders/hoover_dam.png
+share/freeciv/wonders/internet.png
 share/freeciv/wonders/isaac_newtons_college.png
 share/freeciv/wonders/js_bachs_cathedral.png
 share/freeciv/wonders/king_richards_crusade.png
@@ -2255,51 +3171,95 @@ share/freeciv/wonders/lighthouse.png
 share/freeciv/wonders/magellans_expedition.png
 share/freeciv/wonders/manhattan_project.png
 share/freeciv/wonders/marco_polos_embassy.png
+share/freeciv/wonders/mausoleum_of_halicarnassus.png
 share/freeciv/wonders/michelangelos_chapel.png
 share/freeciv/wonders/oracle.png
 share/freeciv/wonders/pyramids.png
 share/freeciv/wonders/seti_program.png
 share/freeciv/wonders/shakespeares_theatre.png
 share/freeciv/wonders/statue_of_liberty.png
+share/freeciv/wonders/statue_of_zeus.png
 share/freeciv/wonders/sun_tzus_war_academy.png
+share/freeciv/wonders/temple_of_artemis.png
 share/freeciv/wonders/united_nations.png
 share/freeciv/wonders/womens_suffrage.png
+share/locale/ar/LC_MESSAGES/freeciv-nations.mo
 share/locale/ar/LC_MESSAGES/freeciv.mo
+share/locale/bg/LC_MESSAGES/freeciv-nations.mo
+share/locale/bg/LC_MESSAGES/freeciv.mo
+share/locale/ca/LC_MESSAGES/freeciv-nations.mo
 share/locale/ca/LC_MESSAGES/freeciv.mo
+share/locale/cs/LC_MESSAGES/freeciv-nations.mo
 share/locale/cs/LC_MESSAGES/freeciv.mo
+share/locale/da/LC_MESSAGES/freeciv-nations.mo
 share/locale/da/LC_MESSAGES/freeciv.mo
+share/locale/de/LC_MESSAGES/freeciv-nations.mo
 share/locale/de/LC_MESSAGES/freeciv.mo
+share/locale/el/LC_MESSAGES/freeciv-nations.mo
 share/locale/el/LC_MESSAGES/freeciv.mo
+share/locale/en_GB/LC_MESSAGES/freeciv-nations.mo
 share/locale/en_GB/LC_MESSAGES/freeciv.mo
+share/locale/eo/LC_MESSAGES/freeciv-nations.mo
 share/locale/eo/LC_MESSAGES/freeciv.mo
+share/locale/es/LC_MESSAGES/freeciv-nations.mo
 share/locale/es/LC_MESSAGES/freeciv.mo
+share/locale/et/LC_MESSAGES/freeciv-nations.mo
 share/locale/et/LC_MESSAGES/freeciv.mo
+share/locale/fa/LC_MESSAGES/freeciv-nations.mo
 share/locale/fa/LC_MESSAGES/freeciv.mo
+share/locale/fi/LC_MESSAGES/freeciv-nations.mo
 share/locale/fi/LC_MESSAGES/freeciv.mo
+share/locale/fr/LC_MESSAGES/freeciv-nations.mo
 share/locale/fr/LC_MESSAGES/freeciv.mo
+share/locale/ga/LC_MESSAGES/freeciv-nations.mo
 share/locale/ga/LC_MESSAGES/freeciv.mo
+share/locale/gd/LC_MESSAGES/freeciv-nations.mo
 share/locale/gd/LC_MESSAGES/freeciv.mo
+share/locale/he/LC_MESSAGES/freeciv-nations.mo
 share/locale/he/LC_MESSAGES/freeciv.mo
+share/locale/hu/LC_MESSAGES/freeciv-nations.mo
 share/locale/hu/LC_MESSAGES/freeciv.mo
+share/locale/id/LC_MESSAGES/freeciv-nations.mo
+share/locale/id/LC_MESSAGES/freeciv.mo
+share/locale/it/LC_MESSAGES/freeciv-nations.mo
 share/locale/it/LC_MESSAGES/freeciv.mo
+share/locale/ja/LC_MESSAGES/freeciv-nations.mo
 share/locale/ja/LC_MESSAGES/freeciv.mo
+share/locale/ko/LC_MESSAGES/freeciv-nations.mo
 share/locale/ko/LC_MESSAGES/freeciv.mo
+share/locale/lt/LC_MESSAGES/freeciv-nations.mo
 share/locale/lt/LC_MESSAGES/freeciv.mo
+share/locale/nb/LC_MESSAGES/freeciv-nations.mo
 share/locale/nb/LC_MESSAGES/freeciv.mo
+share/locale/nl/LC_MESSAGES/freeciv-nations.mo
 share/locale/nl/LC_MESSAGES/freeciv.mo
-share/locale/no/LC_MESSAGES/freeciv.mo
+share/locale/pl/LC_MESSAGES/freeciv-nations.mo
 share/locale/pl/LC_MESSAGES/freeciv.mo
+share/locale/pt/LC_MESSAGES/freeciv-nations.mo
 share/locale/pt/LC_MESSAGES/freeciv.mo
+share/locale/pt_BR/LC_MESSAGES/freeciv-nations.mo
 share/locale/pt_BR/LC_MESSAGES/freeciv.mo
+share/locale/ro/LC_MESSAGES/freeciv-nations.mo
 share/locale/ro/LC_MESSAGES/freeciv.mo
+share/locale/ru/LC_MESSAGES/freeciv-nations.mo
 share/locale/ru/LC_MESSAGES/freeciv.mo
+share/locale/sr/LC_MESSAGES/freeciv-nations.mo
+share/locale/sr/LC_MESSAGES/freeciv.mo
+share/locale/sv/LC_MESSAGES/freeciv-nations.mo
 share/locale/sv/LC_MESSAGES/freeciv.mo
+share/locale/tr/LC_MESSAGES/freeciv-nations.mo
 share/locale/tr/LC_MESSAGES/freeciv.mo
+share/locale/uk/LC_MESSAGES/freeciv-nations.mo
 share/locale/uk/LC_MESSAGES/freeciv.mo
+share/locale/zh_CN/LC_MESSAGES/freeciv-nations.mo
 share/locale/zh_CN/LC_MESSAGES/freeciv.mo
+share/locale/zh_TW/LC_MESSAGES/freeciv-nations.mo
+share/locale/zh_TW/LC_MESSAGES/freeciv.mo
 share/pixmaps/freeciv-client.png
 @pkgdir share/icons/hicolor/64x64/apps
 @pkgdir share/icons/hicolor/48x48/apps
 @pkgdir share/icons/hicolor/32x32/apps
 @pkgdir share/icons/hicolor/16x16/apps
 @pkgdir share/icons/hicolor/128x128/apps
+@pkgdir share/applications
+@pkgdir share/appdata
diff --git a/games/freeciv-share/distinfo b/games/freeciv-share/distinfo
index 6fe852c6dd4..1e3662e7ee0 100644
--- a/games/freeciv-share/distinfo
+++ b/games/freeciv-share/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.28 2013/05/23 15:02:53 joerg Exp $
+$NetBSD: distinfo,v 1.29 2015/04/26 19:19:42 spz Exp $
 
-SHA1 (freeciv-2.3.2.tar.bz2) = e6267b5e0483cf9c29d01793d2f9433e73d62191
-RMD160 (freeciv-2.3.2.tar.bz2) = 63bea690cfd6953bfb30d320a3e3f7a69353b64c
-Size (freeciv-2.3.2.tar.bz2) = 30695128 bytes
+SHA1 (freeciv-2.5.0.tar.bz2) = 477b60e02606e47b31a019b065353c1a6da6c305
+RMD160 (freeciv-2.5.0.tar.bz2) = 51d16d9c746bd42123c333c2103882b771c6b796
+Size (freeciv-2.5.0.tar.bz2) = 40323793 bytes
 SHA1 (patch-aa) = bac3e05393c154defd288cc621606a3dbd7f00eb
 SHA1 (patch-common_dataio.c) = 6fd08d7185f953fbfdc2c554ad67c4e5c8f2be87
 SHA1 (patch-common_dataio.h) = 4a513230ee814269466959fcb977b1360a78ee53
diff --git a/games/freeciv-share/patches/patch-aa b/games/freeciv-share/patches/patch-aa
deleted file mode 100644
index 8d11a770990..00000000000
--- a/games/freeciv-share/patches/patch-aa
+++ /dev/null
@@ -1,153 +0,0 @@
-$NetBSD: patch-aa,v 1.12 2012/07/31 15:49:37 prlw1 Exp $
-
-https://gna.org/bugs/index.php?20002
-
---- configure.orig	2012-03-31 12:37:54.000000000 +0000
-+++ configure
-@@ -18894,13 +18894,13 @@ $as_echo "yes" >&6; }
- 
- 
- 
--    if (test $ac_tr_lib == HAVE_LIBX11     \
--        || test $ac_tr_lib == HAVE_LIBXEXT \
--        || test $ac_tr_lib == HAVE_LIBXT   \
--        || test $ac_tr_lib == HAVE_LIBXMU  \
--        || test $ac_tr_lib == HAVE_LIBXPM  \
--        || test $ac_tr_lib == HAVE_LIBXAW  \
--        || test $ac_tr_lib == HAVE_LIBXAW3D); then
-+    if (test $ac_tr_lib = HAVE_LIBX11     \
-+        || test $ac_tr_lib = HAVE_LIBXEXT \
-+        || test $ac_tr_lib = HAVE_LIBXT   \
-+        || test $ac_tr_lib = HAVE_LIBXMU  \
-+        || test $ac_tr_lib = HAVE_LIBXPM  \
-+        || test $ac_tr_lib = HAVE_LIBXAW  \
-+        || test $ac_tr_lib = HAVE_LIBXAW3D); then
-       cat >>confdefs.h <<_ACEOF
- #define $ac_tr_lib 1
- _ACEOF
-@@ -18971,13 +18971,13 @@ $as_echo "yes" >&6; }
- 
- 
- 
--    if (test $ac_tr_lib == HAVE_LIBX11     \
--        || test $ac_tr_lib == HAVE_LIBXEXT \
--        || test $ac_tr_lib == HAVE_LIBXT   \
--        || test $ac_tr_lib == HAVE_LIBXMU  \
--        || test $ac_tr_lib == HAVE_LIBXPM  \
--        || test $ac_tr_lib == HAVE_LIBXAW  \
--        || test $ac_tr_lib == HAVE_LIBXAW3D); then
-+    if (test $ac_tr_lib = HAVE_LIBX11     \
-+        || test $ac_tr_lib = HAVE_LIBXEXT \
-+        || test $ac_tr_lib = HAVE_LIBXT   \
-+        || test $ac_tr_lib = HAVE_LIBXMU  \
-+        || test $ac_tr_lib = HAVE_LIBXPM  \
-+        || test $ac_tr_lib = HAVE_LIBXAW  \
-+        || test $ac_tr_lib = HAVE_LIBXAW3D); then
-       cat >>confdefs.h <<_ACEOF
- #define $ac_tr_lib 1
- _ACEOF
-@@ -19044,13 +19044,13 @@ $as_echo "yes" >&6; }
- 
- 
- 
--    if (test $ac_tr_lib == HAVE_LIBX11     \
--        || test $ac_tr_lib == HAVE_LIBXEXT \
--        || test $ac_tr_lib == HAVE_LIBXT   \
--        || test $ac_tr_lib == HAVE_LIBXMU  \
--        || test $ac_tr_lib == HAVE_LIBXPM  \
--        || test $ac_tr_lib == HAVE_LIBXAW  \
--        || test $ac_tr_lib == HAVE_LIBXAW3D); then
-+    if (test $ac_tr_lib = HAVE_LIBX11     \
-+        || test $ac_tr_lib = HAVE_LIBXEXT \
-+        || test $ac_tr_lib = HAVE_LIBXT   \
-+        || test $ac_tr_lib = HAVE_LIBXMU  \
-+        || test $ac_tr_lib = HAVE_LIBXPM  \
-+        || test $ac_tr_lib = HAVE_LIBXAW  \
-+        || test $ac_tr_lib = HAVE_LIBXAW3D); then
-       cat >>confdefs.h <<_ACEOF
- #define $ac_tr_lib 1
- _ACEOF
-@@ -19113,13 +19113,13 @@ $as_echo "yes" >&6; }
- 
- 
- 
--    if (test $ac_tr_lib == HAVE_LIBX11     \
--        || test $ac_tr_lib == HAVE_LIBXEXT \
--        || test $ac_tr_lib == HAVE_LIBXT   \
--        || test $ac_tr_lib == HAVE_LIBXMU  \
--        || test $ac_tr_lib == HAVE_LIBXPM  \
--        || test $ac_tr_lib == HAVE_LIBXAW  \
--        || test $ac_tr_lib == HAVE_LIBXAW3D); then
-+    if (test $ac_tr_lib = HAVE_LIBX11     \
-+        || test $ac_tr_lib = HAVE_LIBXEXT \
-+        || test $ac_tr_lib = HAVE_LIBXT   \
-+        || test $ac_tr_lib = HAVE_LIBXMU  \
-+        || test $ac_tr_lib = HAVE_LIBXPM  \
-+        || test $ac_tr_lib = HAVE_LIBXAW  \
-+        || test $ac_tr_lib = HAVE_LIBXAW3D); then
-       cat >>confdefs.h <<_ACEOF
- #define $ac_tr_lib 1
- _ACEOF
-@@ -19188,13 +19188,13 @@ $as_echo "yes" >&6; }
- 
- 
- 
--    if (test $ac_tr_lib == HAVE_LIBX11     \
--        || test $ac_tr_lib == HAVE_LIBXEXT \
--        || test $ac_tr_lib == HAVE_LIBXT   \
--        || test $ac_tr_lib == HAVE_LIBXMU  \
--        || test $ac_tr_lib == HAVE_LIBXPM  \
--        || test $ac_tr_lib == HAVE_LIBXAW  \
--        || test $ac_tr_lib == HAVE_LIBXAW3D); then
-+    if (test $ac_tr_lib = HAVE_LIBX11     \
-+        || test $ac_tr_lib = HAVE_LIBXEXT \
-+        || test $ac_tr_lib = HAVE_LIBXT   \
-+        || test $ac_tr_lib = HAVE_LIBXMU  \
-+        || test $ac_tr_lib = HAVE_LIBXPM  \
-+        || test $ac_tr_lib = HAVE_LIBXAW  \
-+        || test $ac_tr_lib = HAVE_LIBXAW3D); then
-       cat >>confdefs.h <<_ACEOF
- #define $ac_tr_lib 1
- _ACEOF
-@@ -19260,13 +19260,13 @@ $as_echo "yes" >&6; }
- 
- 
- 
--    if (test $ac_tr_lib == HAVE_LIBX11     \
--        || test $ac_tr_lib == HAVE_LIBXEXT \
--        || test $ac_tr_lib == HAVE_LIBXT   \
--        || test $ac_tr_lib == HAVE_LIBXMU  \
--        || test $ac_tr_lib == HAVE_LIBXPM  \
--        || test $ac_tr_lib == HAVE_LIBXAW  \
--        || test $ac_tr_lib == HAVE_LIBXAW3D); then
-+    if (test $ac_tr_lib = HAVE_LIBX11     \
-+        || test $ac_tr_lib = HAVE_LIBXEXT \
-+        || test $ac_tr_lib = HAVE_LIBXT   \
-+        || test $ac_tr_lib = HAVE_LIBXMU  \
-+        || test $ac_tr_lib = HAVE_LIBXPM  \
-+        || test $ac_tr_lib = HAVE_LIBXAW  \
-+        || test $ac_tr_lib = HAVE_LIBXAW3D); then
-       cat >>confdefs.h <<_ACEOF
- #define $ac_tr_lib 1
- _ACEOF
-@@ -19331,13 +19331,13 @@ $as_echo "yes" >&6; }
- 
- 
- 
--    if (test $ac_tr_lib == HAVE_LIBX11     \
--        || test $ac_tr_lib == HAVE_LIBXEXT \
--        || test $ac_tr_lib == HAVE_LIBXT   \
--        || test $ac_tr_lib == HAVE_LIBXMU  \
--        || test $ac_tr_lib == HAVE_LIBXPM  \
--        || test $ac_tr_lib == HAVE_LIBXAW  \
--        || test $ac_tr_lib == HAVE_LIBXAW3D); then
-+    if (test $ac_tr_lib = HAVE_LIBX11     \
-+        || test $ac_tr_lib = HAVE_LIBXEXT \
-+        || test $ac_tr_lib = HAVE_LIBXT   \
-+        || test $ac_tr_lib = HAVE_LIBXMU  \
-+        || test $ac_tr_lib = HAVE_LIBXPM  \
-+        || test $ac_tr_lib = HAVE_LIBXAW  \
-+        || test $ac_tr_lib = HAVE_LIBXAW3D); then
-       cat >>confdefs.h <<_ACEOF
- #define $ac_tr_lib 1
- _ACEOF
diff --git a/games/freeciv-share/patches/patch-common_dataio.c b/games/freeciv-share/patches/patch-common_dataio.c
deleted file mode 100644
index 7070c7f13ed..00000000000
--- a/games/freeciv-share/patches/patch-common_dataio.c
+++ /dev/null
@@ -1,363 +0,0 @@
-$NetBSD: patch-common_dataio.c,v 1.1 2012/08/17 18:42:44 prlw1 Exp $
-
-Fixes part 2 of http://secunia.com/advisories/40476/
-c.f. https://gna.org/bugs/?20003
-
---- common/dataio.c.orig	2012-03-31 12:35:45.000000000 +0000
-+++ common/dataio.c
-@@ -408,7 +408,7 @@ void dio_put_worklist(struct data_out *d
-  Receive uint8 value to dest. In case of failure, value stored to dest
-  will be zero. Note that zero is legal value even when there is no failure.
- **************************************************************************/
--void dio_get_uint8(struct data_in *din, int *dest)
-+bool dio_get_uint8(struct data_in *din, int *dest)
- {
-   if (enough_data(din, 1)) {
-     if (dest) {
-@@ -421,14 +421,18 @@ void dio_get_uint8(struct data_in *din, 
-     din->current++;
-   } else if (dest) {
-     *dest = 0;
-+
-+    return FALSE;
-   }
-+
-+  return TRUE;
- }
- 
- /**************************************************************************
-  Receive uint16 value to dest. In case of failure, value stored to dest
-  will be zero. Note that zero is legal value even when there is no failure.
- **************************************************************************/
--void dio_get_uint16(struct data_in *din, int *dest)
-+bool dio_get_uint16(struct data_in *din, int *dest)
- {
-   if (enough_data(din, 2)) {
-     if (dest) {
-@@ -441,14 +445,18 @@ void dio_get_uint16(struct data_in *din,
-     din->current += 2;
-   } else if (dest) {
-     *dest = 0;
-+
-+    return FALSE;
-   }
-+
-+  return TRUE;
- }
- 
- /**************************************************************************
-  Receive uint32 value to dest. In case of failure, value stored to dest
-  will be zero. Note that zero is legal value even when there is no failure.
- **************************************************************************/
--void dio_get_uint32(struct data_in *din, int *dest)
-+bool dio_get_uint32(struct data_in *din, int *dest)
- {
-   if (enough_data(din, 4)) {
-     if (dest) {
-@@ -461,17 +469,22 @@ void dio_get_uint32(struct data_in *din,
-     din->current += 4;
-   } else if (dest) {
-     *dest = 0;
-+
-+    return FALSE;
-   }
-+
-+  return TRUE;
- }
- 
- /**************************************************************************
- ...
- **************************************************************************/
--void dio_get_bool8(struct data_in *din, bool * dest)
-+bool dio_get_bool8(struct data_in *din, bool * dest)
- {
-   int ival;
-+  bool retval;
- 
--  dio_get_uint8(din, &ival);
-+  retval = dio_get_uint8(din, &ival);
- 
-   if (ival != 0 && ival != 1) {
-     log_error("Received value isn't boolean: %d", ival);
-@@ -479,16 +492,19 @@ void dio_get_bool8(struct data_in *din, 
-   }
- 
-   *dest = (ival != 0);
-+
-+  return retval;
- }
- 
- /**************************************************************************
- ...
- **************************************************************************/
--void dio_get_bool32(struct data_in *din, bool * dest)
-+bool dio_get_bool32(struct data_in *din, bool * dest)
- {
-   int ival = 0;
-+  bool retval;
- 
--  dio_get_uint32(din, &ival);
-+  retval = dio_get_uint32(din, &ival);
- 
-   if (ival != 0 && ival != 1) {
-     log_error("Received value isn't boolean: %d", ival);
-@@ -496,57 +512,69 @@ void dio_get_bool32(struct data_in *din,
-   }
- 
-   *dest = (ival != 0);
-+
-+  return retval;
- }
- 
- /**************************************************************************
- ...
- **************************************************************************/
--void dio_get_sint8(struct data_in *din, int *dest)
-+bool dio_get_sint8(struct data_in *din, int *dest)
- {
-   int tmp;
-+  bool retval;
- 
--  dio_get_uint8(din, &tmp);
-+  retval = dio_get_uint8(din, &tmp);
-   if (dest) {
-     if (tmp > 0x7f) {
-       tmp -= 0x100;
-     }
-     *dest = tmp;
-   }
-+
-+  return retval;
- }
- 
- /**************************************************************************
- ...
- **************************************************************************/
--void dio_get_sint16(struct data_in *din, int *dest)
-+bool dio_get_sint16(struct data_in *din, int *dest)
- {
-   int tmp = 0;
-+  bool retval;
- 
--  dio_get_uint16(din, &tmp);
-+  retval = dio_get_uint16(din, &tmp);
-   if (dest) {
-     if (tmp > 0x7fff) {
-       tmp -= 0x10000;
-     }
-     *dest = tmp;
-   }
-+
-+  return retval;
- }
- 
- /**************************************************************************
- ...
- **************************************************************************/
--void dio_get_memory(struct data_in *din, void *dest, size_t dest_size)
-+bool dio_get_memory(struct data_in *din, void *dest, size_t dest_size)
- {
-   if (enough_data(din, dest_size)) {
-     if (dest) {
-       memcpy(dest, ADD_TO_POINTER(din->src, din->current), dest_size);
-     }
-     din->current += dest_size;
-+  } else {
-+    return FALSE;
-   }
-+
-+  return TRUE;
- }
- 
- /**************************************************************************
- ...
- **************************************************************************/
--void dio_get_string(struct data_in *din, char *dest, size_t max_dest_size)
-+bool dio_get_string(struct data_in *din, char *dest, size_t max_dest_size)
- {
-   char *c;
-   size_t ps_len;		/* length in packet, not including null */
-@@ -556,7 +584,7 @@ void dio_get_string(struct data_in *din,
- 
-   if (!enough_data(din, 1)) {
-     dest[0] = '\0';
--    return;
-+    return FALSE;
-   }
- 
-   remaining = dio_input_remaining(din);
-@@ -582,37 +610,40 @@ void dio_get_string(struct data_in *din,
-   if (!din->too_short) {
-     din->current += (ps_len + 1);	/* past terminator */
-   }
-+
-+  return TRUE;
- }
- 
- /**************************************************************************
- ...
- **************************************************************************/
--void dio_get_bit_string(struct data_in *din, char *dest,
-+bool dio_get_bit_string(struct data_in *din, char *dest,
- 			size_t max_dest_size)
- {
-   int npack = 0;		/* number claimed in packet */
-   int i;			/* iterate the bytes */
-+  bool retval;
- 
-   fc_assert(dest != NULL && max_dest_size > 0);
- 
-   if (!enough_data(din, 1)) {
-     dest[0] = '\0';
--    return;
-+    return FALSE;
-   }
- 
--  dio_get_uint16(din, &npack);
-+  retval = dio_get_uint16(din, &npack);
-   if (npack >= max_dest_size) {
-       log_error("Have size for %lu, got %d",
-                 (unsigned long) max_dest_size, npack);
-     din->bad_bit_string = TRUE;
-     dest[0] = '\0';
--    return;
-+    return FALSE;
-   }
- 
-   for (i = 0; i < npack;) {
-     int bit, byte_value;
- 
--    dio_get_uint8(din, &byte_value);
-+    retval = dio_get_uint8(din, &byte_value);
-     for (bit = 0; bit < 8 && i < npack; bit++, i++) {
-       if (TEST_BIT(byte_value, bit)) {
- 	dest[i] = '1';
-@@ -627,17 +658,20 @@ void dio_get_bit_string(struct data_in *
-   if (din->too_short) {
-     din->bad_bit_string = TRUE;
-   }
-+
-+  return retval;
- }
- 
- /**************************************************************************
- ...
- **************************************************************************/
--void dio_get_tech_list(struct data_in *din, int *dest)
-+bool dio_get_tech_list(struct data_in *din, int *dest)
- {
-   int i;
-+  bool retval;
- 
-   for (i = 0; i < MAX_NUM_TECH_LIST; i++) {
--    dio_get_uint8(din, &dest[i]);
-+    retval = dio_get_uint8(din, &dest[i]);
-     if (dest[i] == A_LAST) {
-       break;
-     }
-@@ -646,56 +680,66 @@ void dio_get_tech_list(struct data_in *d
-   for (; i < MAX_NUM_TECH_LIST; i++) {
-     dest[i] = A_LAST;
-   }
-+
-+  return retval;
- }
- 
- /**************************************************************************
- ...
- **************************************************************************/
--void dio_get_worklist(struct data_in *din, struct worklist *pwl)
-+bool dio_get_worklist(struct data_in *din, struct worklist *pwl)
- {
-   int i, length;
-+  bool retval;
- 
-   worklist_init(pwl);
- 
--  dio_get_uint8(din, &length);
-+  retval = dio_get_uint8(din, &length);
-   for (i = 0; i < length; i++) {
-     int identifier;
-     int kind;
- 
-     dio_get_uint8(din, &kind);
--    dio_get_uint8(din, &identifier);
-+    retval = dio_get_uint8(din, &identifier);
- 
-     worklist_append(pwl, universal_by_number(kind, identifier));
-   }
-+
-+  return retval;
- }
- 
- /**************************************************************************
- ...
- **************************************************************************/
--void dio_get_uint8_vec8(struct data_in *din, int **values, int stop_value)
-+bool dio_get_uint8_vec8(struct data_in *din, int **values, int stop_value)
- {
-   int count, inx;
-+  bool retval;
- 
--  dio_get_uint8(din, &count);
-+  retval = dio_get_uint8(din, &count);
-   if (values) {
-     *values = fc_calloc((count + 1), sizeof(**values));
-   }
-   for (inx = 0; inx < count; inx++) {
--    dio_get_uint8(din, values ? &((*values)[inx]) : NULL);
-+    retval = dio_get_uint8(din, values ? &((*values)[inx]) : NULL);
-   }
-   if (values) {
-     (*values)[inx] = stop_value;
-   }
-+
-+  return retval;
- }
- 
- /**************************************************************************
-  Receive vector of uint6 values.
- **************************************************************************/
--void dio_get_uint16_vec8(struct data_in *din, int **values, int stop_value)
-+bool dio_get_uint16_vec8(struct data_in *din, int **values, int stop_value)
- {
-   int count, inx;
-+  bool retval;
-+
-+  retval = dio_get_uint8(din, &count);
- 
--  dio_get_uint8(din, &count);
-   if (values) {
-     *values = fc_calloc((count + 1), sizeof(**values));
-   }
-@@ -705,23 +749,28 @@ void dio_get_uint16_vec8(struct data_in 
-   if (values) {
-     (*values)[inx] = stop_value;
-   }
-+
-+  return retval;
- }
- 
- /**************************************************************************
-   De-serialize a requirement.
- **************************************************************************/
--void dio_get_requirement(struct data_in *din, struct requirement *preq)
-+bool dio_get_requirement(struct data_in *din, struct requirement *preq)
- {
-   int type, range, value;
-   bool survives, negated;
-+  bool retval;
- 
-   dio_get_uint8(din, &type);
-   dio_get_sint32(din, &value);
-   dio_get_uint8(din, &range);
-   dio_get_bool8(din, &survives);
--  dio_get_bool8(din, &negated);
-+  retval = dio_get_bool8(din, &negated);
- 
-   *preq = req_from_values(type, range, survives, negated, value);
-+
-+  return retval;
- }
- 
- /**************************************************************************
diff --git a/games/freeciv-share/patches/patch-common_dataio.h b/games/freeciv-share/patches/patch-common_dataio.h
deleted file mode 100644
index c1fccb315a7..00000000000
--- a/games/freeciv-share/patches/patch-common_dataio.h
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-common_dataio.h,v 1.1 2012/08/17 18:42:44 prlw1 Exp $
-
-Fixes part 2 of http://secunia.com/advisories/40476/
-c.f. https://gna.org/bugs/?20003
-
---- common/dataio.h.orig	2012-03-31 12:35:45.000000000 +0000
-+++ common/dataio.h
-@@ -53,27 +53,27 @@ size_t dio_input_remaining(struct data_i
- 
- /* gets */
- 
--void dio_get_uint8(struct data_in *din, int *dest);
--void dio_get_uint16(struct data_in *din, int *dest);
--void dio_get_uint32(struct data_in *din, int *dest);
-+bool dio_get_uint8(struct data_in *din, int *dest);
-+bool dio_get_uint16(struct data_in *din, int *dest);
-+bool dio_get_uint32(struct data_in *din, int *dest);
- 
--void dio_get_sint8(struct data_in *din, int *dest);
--void dio_get_sint16(struct data_in *din, int *dest);
-+bool dio_get_sint8(struct data_in *din, int *dest);
-+bool dio_get_sint16(struct data_in *din, int *dest);
- #define dio_get_sint32(d,v) dio_get_uint32(d,v)
- 
- 
--void dio_get_bool8(struct data_in *din, bool *dest);
--void dio_get_bool32(struct data_in *din, bool *dest);
--void dio_get_memory(struct data_in *din, void *dest, size_t dest_size);
--void dio_get_string(struct data_in *din, char *dest, size_t max_dest_size);
--void dio_get_bit_string(struct data_in *din, char *dest,
-+bool dio_get_bool8(struct data_in *din, bool *dest);
-+bool dio_get_bool32(struct data_in *din, bool *dest);
-+bool dio_get_memory(struct data_in *din, void *dest, size_t dest_size);
-+bool dio_get_string(struct data_in *din, char *dest, size_t max_dest_size);
-+bool dio_get_bit_string(struct data_in *din, char *dest,
- 			size_t max_dest_size);
--void dio_get_tech_list(struct data_in *din, int *dest);
--void dio_get_worklist(struct data_in *din, struct worklist *pwl);
--void dio_get_requirement(struct data_in *din, struct requirement *preq);
-+bool dio_get_tech_list(struct data_in *din, int *dest);
-+bool dio_get_worklist(struct data_in *din, struct worklist *pwl);
-+bool dio_get_requirement(struct data_in *din, struct requirement *preq);
- 
--void dio_get_uint8_vec8(struct data_in *din, int **values, int stop_value);
--void dio_get_uint16_vec8(struct data_in *din, int **values, int stop_value);
-+bool dio_get_uint8_vec8(struct data_in *din, int **values, int stop_value);
-+bool dio_get_uint16_vec8(struct data_in *din, int **values, int stop_value);
- 
- /* Should be a function but we need some macro magic. */
- #define DIO_BV_GET(pdin, bv) \
diff --git a/games/freeciv-share/patches/patch-common_generate__packets.py b/games/freeciv-share/patches/patch-common_generate__packets.py
deleted file mode 100644
index 21e44f40289..00000000000
--- a/games/freeciv-share/patches/patch-common_generate__packets.py
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-common_generate__packets.py,v 1.1 2012/08/17 18:42:44 prlw1 Exp $
-
-Fixes part 2 of http://secunia.com/advisories/40476/
-c.f. https://gna.org/bugs/?20003
-
---- common/generate_packets.py.orig	2012-08-01 17:10:51.000000000 +0000
-+++ common/generate_packets.py
-@@ -546,11 +546,13 @@ class Field:
- for (;;) {
-   int i;
- 
--  dio_get_uint8(&din, &i);
--  if(i == 255) {
-+  if (!dio_get_uint8(&din, &i)) {
-     break;
-   }
--  if(i > %(array_size_u)s) {
-+  if (i == 255) {
-+    break;
-+  }
-+  if (i > %(array_size_u)s) {
-     log_error("packets_gen.c: WARNING: ignoring intra array diff");
-   } else {
-     %(c)s
diff --git a/games/freeciv-share/patches/patch-common_packets.c b/games/freeciv-share/patches/patch-common_packets.c
deleted file mode 100644
index 78f7b6a805e..00000000000
--- a/games/freeciv-share/patches/patch-common_packets.c
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-common_packets.c,v 1.1 2012/07/31 15:49:37 prlw1 Exp $
-
-Fixes part 1 of http://secunia.com/advisories/40476/
-c.f. https://gna.org/bugs/?20003
-
---- common/packets.c.orig	2012-03-31 12:35:45.000000000 +0000
-+++ common/packets.c
-@@ -331,7 +331,7 @@ instead of just testing if the returning
- return a NULL packet even if everything is OK (receive_packet_goto_route).
- **************************************************************************/
- void *get_packet_from_connection(struct connection *pc,
--				 enum packet_type *ptype, bool * presult)
-+				 enum packet_type *ptype, bool *presult)
- {
-   int len_read;
-   int whole_packet_len;
-@@ -386,6 +386,14 @@ void *get_packet_from_connection(struct 
-     return NULL;		/* not all data has been read */
-   }
- 
-+  if (whole_packet_len < header_size) {
-+    log_verbose("The packet size is reported to be less than header alone. "
-+                "The connection will be closed now.");
-+    connection_close(pc, _("illegal packet size"));
-+
-+    return NULL;
-+  }
-+
- #ifdef USE_COMPRESSION
-   if (compressed_packet) {
-     uLong compressed_size = whole_packet_len - header_size;
diff --git a/games/freeciv-share/patches/patch-configure.ac b/games/freeciv-share/patches/patch-configure.ac
deleted file mode 100644
index 63d222a58cb..00000000000
--- a/games/freeciv-share/patches/patch-configure.ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2013/05/23 15:02:53 joerg Exp $
-
---- configure.ac.orig	2012-03-31 12:35:57.000000000 +0000
-+++ configure.ac
-@@ -883,7 +883,7 @@ dnl In the future we probably get rid of
- dnl lua from system.
- dnl LUA_AS_DEPENDENCY should be empty when using lua outside own our tree.
- LUA_CFLAGS="-I\$(top_srcdir)/dependencies/lua-5.1/src"
--LUA_LIBS="\$(top_builddir)/dependencies/lua-5.1/src/liblua.a"
-+LUA_LIBS="\$(top_builddir)/dependencies/lua-5.1/src/liblua.la"
- LUA_AS_DEPENDENCY="$LUA_LIBS"
- AC_SUBST([LUA_CFLAGS])
- AC_SUBST([LUA_LIBS])
-@@ -891,7 +891,7 @@ AC_SUBST([LUA_AS_DEPENDENCY])
- 
- 
- TOLUA_CFLAGS="-I\$(top_srcdir)/dependencies/tolua-5.1/include"
--TOLUA_LIBS="\$(top_builddir)/dependencies/tolua-5.1/src/lib/libtolua.a"
-+TOLUA_LIBS="\$(top_builddir)/dependencies/tolua-5.1/src/lib/libtolua.la"
- TOLUA_AS_DEPENDENCY="$TOLUA_LIBS"
- AC_SUBST([TOLUA_CFLAGS])
- AC_SUBST([TOLUA_LIBS])
diff --git a/games/freeciv-share/patches/patch-dependencies_lua-5.1_src_Makefile.am b/games/freeciv-share/patches/patch-dependencies_lua-5.1_src_Makefile.am
deleted file mode 100644
index 6bdc3e0b0be..00000000000
--- a/games/freeciv-share/patches/patch-dependencies_lua-5.1_src_Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-dependencies_lua-5.1_src_Makefile.am,v 1.1 2013/05/23 15:02:53 joerg Exp $
-
---- dependencies/lua-5.1/src/Makefile.am.orig	2012-03-31 12:32:31.000000000 +0000
-+++ dependencies/lua-5.1/src/Makefile.am
-@@ -1,10 +1,10 @@
- ## Process this file with automake to produce Makefile.in
- 
--noinst_LIBRARIES = liblua.a
-+noinst_LTLIBRARIES = liblua.la
- 
- AM_CPPFLAGS =
- 
--liblua_a_SOURCES = 	\
-+liblua_la_SOURCES = 	\
- 	localluaconf.h	\
- 	lapi.c		\
- 	lapi.h		\
diff --git a/games/freeciv-share/patches/patch-dependencies_tolua-5.1_src_bin_Makefile.am b/games/freeciv-share/patches/patch-dependencies_tolua-5.1_src_bin_Makefile.am
deleted file mode 100644
index 818c78e503f..00000000000
--- a/games/freeciv-share/patches/patch-dependencies_tolua-5.1_src_bin_Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-dependencies_tolua-5.1_src_bin_Makefile.am,v 1.1 2013/05/23 15:02:53 joerg Exp $
-
---- dependencies/tolua-5.1/src/bin/Makefile.am.orig	2013-05-22 20:21:27.000000000 +0000
-+++ dependencies/tolua-5.1/src/bin/Makefile.am
-@@ -36,8 +36,8 @@ EXTRA_tolua_SOURCES = \
- 
- tolua_DEPENDENCIES = \
- 	$(LUA_AS_DEPENDENCY) \
--	../lib/libtolua.a
-+	../lib/libtolua.la
- 
- tolua_LDFLAGS = \
- 	$(LUA_LIBS) \
--	../lib/libtolua.a -lm
-+	../lib/libtolua.la -lm
diff --git a/games/freeciv-share/patches/patch-dependencies_tolua-5.1_src_lib_Makefile.am b/games/freeciv-share/patches/patch-dependencies_tolua-5.1_src_lib_Makefile.am
deleted file mode 100644
index 7a1b90d2b9c..00000000000
--- a/games/freeciv-share/patches/patch-dependencies_tolua-5.1_src_lib_Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-dependencies_tolua-5.1_src_lib_Makefile.am,v 1.1 2013/05/23 15:02:53 joerg Exp $
-
---- dependencies/tolua-5.1/src/lib/Makefile.am.orig	2012-03-31 12:32:31.000000000 +0000
-+++ dependencies/tolua-5.1/src/lib/Makefile.am
-@@ -1,10 +1,10 @@
--noinst_LIBRARIES = libtolua.a
-+noinst_LTLIBRARIES = libtolua.la
- 
- AM_CPPFLAGS = \
- 	-I$(top_srcdir)/dependencies/tolua-5.1/include \
- 	$(LUA_CFLAGS)
- 
--libtolua_a_SOURCES = \
-+libtolua_la_SOURCES = \
- 	tolua_event.c \
- 	tolua_event.h \
- 	tolua_is.c \
diff --git a/games/freeciv-share/patches/patch-m4_x.m4 b/games/freeciv-share/patches/patch-m4_x.m4
deleted file mode 100644
index 35be785359e..00000000000
--- a/games/freeciv-share/patches/patch-m4_x.m4
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-m4_x.m4,v 1.1 2013/05/23 15:02:53 joerg Exp $
-
---- m4/x.m4.orig	2013-05-22 20:15:33.000000000 +0000
-+++ m4/x.m4
-@@ -64,13 +64,13 @@ AC_DEFUN([FC_CHECK_X_LIB], [
-     AH_TEMPLATE([HAVE_LIBXPM], [Define if the Xpm lib is available])
-     AH_TEMPLATE([HAVE_LIBXAW], [Define if the Xaw lib is to be used])
-     AH_TEMPLATE([HAVE_LIBXAW3D], [Define if the Xaw3d lib is to be used])
--    if (test $ac_tr_lib == HAVE_LIBX11     \
--        || test $ac_tr_lib == HAVE_LIBXEXT \
--        || test $ac_tr_lib == HAVE_LIBXT   \
--        || test $ac_tr_lib == HAVE_LIBXMU  \
--        || test $ac_tr_lib == HAVE_LIBXPM  \
--        || test $ac_tr_lib == HAVE_LIBXAW  \
--        || test $ac_tr_lib == HAVE_LIBXAW3D); then
-+    if (test $ac_tr_lib = HAVE_LIBX11     \
-+        || test $ac_tr_lib = HAVE_LIBXEXT \
-+        || test $ac_tr_lib = HAVE_LIBXT   \
-+        || test $ac_tr_lib = HAVE_LIBXMU  \
-+        || test $ac_tr_lib = HAVE_LIBXPM  \
-+        || test $ac_tr_lib = HAVE_LIBXAW  \
-+        || test $ac_tr_lib = HAVE_LIBXAW3D); then
-       AC_DEFINE_UNQUOTED($ac_tr_lib)
-       X_EXTRA_LIBS="-l$1 $X_EXTRA_LIBS"
-     else
diff --git a/games/freeciv-share/patches/patch-server_Makefile.am b/games/freeciv-share/patches/patch-server_Makefile.am
deleted file mode 100644
index e3a765c8d7b..00000000000
--- a/games/freeciv-share/patches/patch-server_Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-server_Makefile.am,v 1.1 2013/05/23 15:02:53 joerg Exp $
-
---- server/Makefile.am.orig	2013-05-22 20:25:54.000000000 +0000
-+++ server/Makefile.am
-@@ -112,6 +112,7 @@ libfreeciv_srv_la_DEPENDENCIES = \
-  $(srvlibs)
- 
- libfreeciv_srv_la_LIBADD = \
-+ $(LUA_LIBS) $(TOLUA_LIBS) \
-  $(srvlibs)
- 
- freeciv_server_DEPENDENCIES = \
-@@ -128,7 +129,6 @@ freeciv_server_LDADD = \
-  ./libfreeciv-srv.la \
-  $(top_builddir)/common/libfreeciv.la \
-  $(INTLLIBS) \
-- $(LUA_LIBS) $(TOLUA_LIBS) \
-  $(AUTH_LIBS) $(SERVER_LIBS) $(LIB_GGZDMOD) $(SERVERICON)
- 
- desktopfiledir = $(prefix)/share/applications
diff --git a/games/freeciv-share/suppress_installation.mk b/games/freeciv-share/suppress_installation.mk
index df798074e5f..79a9c55ab76 100644
--- a/games/freeciv-share/suppress_installation.mk
+++ b/games/freeciv-share/suppress_installation.mk
@@ -1,28 +1,43 @@
-# $NetBSD: suppress_installation.mk,v 1.2 2013/05/23 15:02:53 joerg Exp $
+# $NetBSD: suppress_installation.mk,v 1.3 2015/04/26 19:19:42 spz Exp $
 
 # Makefile snippet to be included by freeciv-client and freeciv-server to
 # prevent files installed by freeciv-share from being installed again.
 
+CONFIGURE_ARGS+=		--without-freeciv-manual
+
 SUBST_CLASSES+=			installmanfix
 SUBST_STAGE.installmanfix=	pre-configure
 SUBST_FILES.installmanfix=	Makefile.in
-SUBST_SED.installmanfix+=	-e 's|po doc||g'
+SUBST_SED.installmanfix+=	-e 's|translations doc ||g'
 SUBST_MESSAGE.installmanfix=	Suppressing installation of man pages and localization files already in freeciv-share.
 
+SUBST_CLASSES+=			installmanfix2
+SUBST_STAGE.installmanfix2=	pre-configure
+SUBST_FILES.installmanfix2=	Makefile.in
+SUBST_SED.installmanfix2+=	-e 's|install-data-am: install-docDATA|install-data-am: \# install-docDATA|'
+SUBST_MESSAGE.installmanfix2=	Suppressing installation of doc files already in freeciv-share
+
 SUBST_CLASSES+=			installfix
 SUBST_STAGE.installfix=		pre-configure
 SUBST_FILES.installfix=		common/Makefile.in
 SUBST_SED.installfix+=		-e 's|^install-exec-am: install-libLTLIBRARIES|install-exec-am: \# install-libLTLIBRARIES|'
 SUBST_MESSAGE.installfix=	Suppressing installation of libs already in freeciv-share.
 
-SUBST_CLASSES+=			installmanfix2
-SUBST_STAGE.installmanfix2=	post-configure
-SUBST_FILES.installmanfix2=	Makefile
-SUBST_SED.installmanfix2+=	-e 's|po doc||g'
-SUBST_MESSAGE.installmanfix2=	Suppressing installation of man pages and localization files already in freeciv-share.
+SUBST_CLASSES+=			installmanfix3
+SUBST_STAGE.installmanfix3=	post-configure
+SUBST_FILES.installmanfix3=	Makefile
+SUBST_SED.installmanfix3+=	-e 's|translations doc ||g'
+SUBST_MESSAGE.installmanfix3=	Suppressing installation of man pages and localization files already in freeciv-share.
+
+SUBST_CLASSES+=			installmanfix4
+SUBST_STAGE.installmanfix4=	post-configure
+SUBST_FILES.installmanfix4=	Makefile
+SUBST_SED.installmanfix4+=	-e 's|install-data-am: install-docDATA|install-data-am: \# install-docDATA|'
+SUBST_MESSAGE.installmanfix4=	Suppressing installation of doc files already in freeciv-share
 
 SUBST_CLASSES+=			installfix2
-SUBST_STAGE.installfix2=		post-configure
-SUBST_FILES.installfix2=		common/Makefile
+SUBST_STAGE.installfix2=	post-configure
+SUBST_FILES.installfix2=	common/Makefile
 SUBST_SED.installfix2+=		-e 's|^install-exec-am: install-libLTLIBRARIES|install-exec-am: \# install-libLTLIBRARIES|'
 SUBST_MESSAGE.installfix2=	Suppressing installation of libs already in freeciv-share.
+