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.

7 files changed, 339 insertions, 18 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