freeciv: Update to 2.6.5. This is a bugfix-only release.

Changelog:
https://freeciv.fandom.com/wiki/NEWS-2.6.5

10 files changed, 23 insertions, 138 deletions

diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile
index 2465cf24e9a..299234e8588 100644
--- a/games/freeciv-client/Makefile
+++ b/games/freeciv-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.114 2021/04/21 13:24:40 adam Exp $
+# $NetBSD: Makefile,v 1.115 2021/09/19 07:31:27 nia Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	4
 COMMENT=	Freeciv client
 
 DEPENDS+=	freeciv-share>=${FC_VERS}:../../games/freeciv-share
diff --git a/games/freeciv-client/PLIST.gtk3 b/games/freeciv-client/PLIST.gtk3
index 23160bc0590..949d5b99c5c 100644
--- a/games/freeciv-client/PLIST.gtk3
+++ b/games/freeciv-client/PLIST.gtk3
@@ -1,123 +1,10 @@
-@comment $NetBSD: PLIST.gtk3,v 1.3 2019/09/22 18:03:53 prlw1 Exp $
+@comment $NetBSD: PLIST.gtk3,v 1.4 2021/09/19 07:31:27 nia Exp $
 bin/freeciv-gtk3.22
 bin/freeciv-mp-gtk3
 share/appdata/freeciv-gtk3.22.appdata.xml
 share/appdata/freeciv-mp-gtk3.appdata.xml
-share/applications/freeciv-gtk3.22.desktop
-share/applications/freeciv-mp-gtk3.desktop
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Arrows/arrow-down.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Arrows/arrow-left.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Arrows/arrow-right-norm.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Arrows/arrow-right-prelight.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Arrows/arrow-right.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Arrows/arrow-up.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Buttons/button-default.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Buttons/button-insensitive.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Buttons/button-normal.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Buttons/button-prelight.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Buttons/button-pressed.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Check-Radio/check1.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Check-Radio/check2.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Check-Radio/check3.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Check-Radio/check4.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Check-Radio/checklight.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Check-Radio/highlight.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Check-Radio/option1.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Check-Radio/option2.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Check-Radio/option3.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Check-Radio/option4.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Combo/combo-arrow-insens.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Combo/combo-arrow-prelight.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Combo/combo-arrow.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Combo/combo-inactive.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Combo/combo-normal.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Combo/combo-prelight.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Frame-Gap/frame-gap-end.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Frame-Gap/frame-gap-start.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Frame-Gap/frame1.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Frame-Gap/frame2.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Handles/handle-h.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Handles/handle-v.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Lines/line-h.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Lines/line-v.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/ListHeaders/list_header-insens.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/ListHeaders/list_header-prelight.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/ListHeaders/list_header-pressed.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/ListHeaders/list_header.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Menu-Menubar/menu-overlay.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Menu-Menubar/menu.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Menu-Menubar/menubar-item.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Menu-Menubar/menubar.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Menu-Menubar/menuitem.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Menu-Menubar/menuline.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Others/focus.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Others/null.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Others/ruler.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Panel/panel-bg.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Panel/panelbutton1.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Panel/panelbutton2.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Panel/panelbutton3.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Panel/panelbutton4.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/ProgressBar/progressbar-horiz-1.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/ProgressBar/progressbar-horiz-2.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/ProgressBar/progressbar-horiz.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/ProgressBar/t-progressbar-horiz-2.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/ProgressBar/t-progressbar-horiz.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/ProgressBar/t-progressbar-vert.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Range/null.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Range/slider-horiz-prelight.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Range/slider-horiz.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Range/slider-vert-prelight.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Range/slider-vert.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Range/trough-horizontal.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Range/trough-vertical.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Scrollbars/scroll-thumb-horiz.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Scrollbars/scroll-thumb-vert.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Scrollbars/slider-horiz-insens.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Scrollbars/slider-horiz-prelight.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Scrollbars/slider-horiz.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Scrollbars/slider-vert-insens.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Scrollbars/slider-vert-prelight.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Scrollbars/slider-vert.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Scrollbars/stepper-down-insens.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Scrollbars/stepper-down-prelight.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Scrollbars/stepper-down.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Scrollbars/stepper-left-insens.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Scrollbars/stepper-left-prelight.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Scrollbars/stepper-left.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Scrollbars/stepper-right-insens.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Scrollbars/stepper-right-prelight.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Scrollbars/stepper-right.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Scrollbars/stepper-up-insens.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Scrollbars/stepper-up-prelight.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Scrollbars/stepper-up.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Scrollbars/stepper.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Scrollbars/trough-scrollbar-horiz.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Scrollbars/trough-scrollbar-vert.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Shadows/entry-shadow-in.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Shadows/shadow-etched-out.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Shadows/shadow-in.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Shadows/shadow-none.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Shadows/shadow-out.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Shadows/text-entry.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Shadows/text.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Spin/spin-down-disable.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Spin/spin-down-prelight.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Spin/spin-down.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Spin/spin-up-disable.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Spin/spin-up-prelight.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Spin/spin-up.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Spin/spin.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Tabs/null.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Tabs/tab-bottom-active.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Tabs/tab-bottom.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Tabs/tab-left-active.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Tabs/tab-left.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Tabs/tab-right-active.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Tabs/tab-right.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Tabs/tab-top-active.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Tabs/tab-top.png
-share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/Toolbar/toolbar.png
+share/applications/org.freeciv.gtk322.desktop
+share/applications/org.freeciv.mp.gtk3.desktop
 share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/bg.png
 share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/gtk.css
 share/freeciv/themes/gui-gtk-3.22/Freeciv/gtk-3.0/menubar.css
diff --git a/games/freeciv-client/PLIST.sdl b/games/freeciv-client/PLIST.sdl
index 1a6f430a697..9817073172d 100644
--- a/games/freeciv-client/PLIST.sdl
+++ b/games/freeciv-client/PLIST.sdl
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST.sdl,v 1.2 2019/08/31 14:44:57 nia Exp $
+@comment $NetBSD: PLIST.sdl,v 1.3 2021/09/19 07:31:27 nia Exp $
 bin/freeciv-mp-cli
 bin/freeciv-sdl
 share/appdata/freeciv-sdl.appdata.xml
-share/applications/freeciv-sdl.desktop
+share/applications/org.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
diff --git a/games/freeciv-server/Makefile b/games/freeciv-server/Makefile
index d7664e0a663..e29e3ec9630 100644
--- a/games/freeciv-server/Makefile
+++ b/games/freeciv-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.65 2021/04/21 13:24:41 adam Exp $
+# $NetBSD: Makefile,v 1.66 2021/09/19 07:31:27 nia Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	3
 COMMENT=	Freeciv game server
 
 DEPENDS+=	freeciv-share>=${FC_VERS}:../../games/freeciv-share
diff --git a/games/freeciv-server/PLIST b/games/freeciv-server/PLIST
index 0afd033985e..c2ebb1ba8bb 100644
--- a/games/freeciv-server/PLIST
+++ b/games/freeciv-server/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2019/08/31 14:44:57 nia Exp $
+@comment $NetBSD: PLIST,v 1.6 2021/09/19 07:31:27 nia Exp $
 bin/freeciv-server
 etc/freeciv/database.lua
 lib/libfreeciv-srv.la
 share/appdata/freeciv-server.appdata.xml
-share/applications/freeciv-server.desktop
+share/applications/org.freeciv.server.desktop
diff --git a/games/freeciv-share/Makefile b/games/freeciv-share/Makefile
index 4ef4567370f..1cf4719e6f9 100644
--- a/games/freeciv-share/Makefile
+++ b/games/freeciv-share/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2021/04/21 13:24:41 adam Exp $
+# $NetBSD: Makefile,v 1.50 2021/09/19 07:31:27 nia Exp $
 
 PKGNAME=	${DISTNAME:S/-/-share-/}
-PKGREVISION=	4
 COMMENT=	Machine independent files for Freeciv
 
 .include "../../games/freeciv-share/Makefile.common"
diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common
index a387fa46a41..7f5bd5b7744 100644
--- a/games/freeciv-share/Makefile.common
+++ b/games/freeciv-share/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.58 2020/03/22 10:01:58 nia Exp $
+# $NetBSD: Makefile.common,v 1.59 2021/09/19 07:31:27 nia 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.6.2
+FC_VERS=	2.6.5
 CATEGORIES=	games
 MASTER_SITES=	http://files.freeciv.org/stable/
 EXTRACT_SUFX=	.tar.bz2
@@ -24,7 +24,7 @@ USE_PKGLOCALEDIR=	yes
 DISTINFO_FILE=		../../games/freeciv-share/distinfo
 #PATCHDIR=		../../games/freeciv-share/patches
 
-REPLACE_PYTHON=		${WRKSRC}/common/generate_packets.py
+REPLACE_PYTHON=		common/generate_packets.py
 
 SUBST_CLASSES+=		data
 SUBST_STAGE.data=	pre-configure
diff --git a/games/freeciv-share/PLIST b/games/freeciv-share/PLIST
index 55d281140bf..e8faba46e43 100644
--- a/games/freeciv-share/PLIST
+++ b/games/freeciv-share/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2020/03/22 10:01:58 nia Exp $
+@comment $NetBSD: PLIST,v 1.18 2021/09/19 07:31:27 nia Exp $
 lib/libfreeciv.la
 man/man6/freeciv-client.6
 man/man6/freeciv-gtk2.6
@@ -16,6 +16,7 @@ man/man6/freeciv-sdl.6
 man/man6/freeciv-sdl2.6
 man/man6/freeciv-server.6
 man/man6/freeciv-xaw.6
+man/man6/freeciv.6
 share/doc/freeciv/ABOUT-NLS
 share/doc/freeciv/AUTHORS
 share/doc/freeciv/BUGS
diff --git a/games/freeciv-share/distinfo b/games/freeciv-share/distinfo
index 92eca8c7b2a..f1ceec74979 100644
--- a/games/freeciv-share/distinfo
+++ b/games/freeciv-share/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.34 2020/03/22 10:01:58 nia Exp $
+$NetBSD: distinfo,v 1.35 2021/09/19 07:31:27 nia Exp $
 
-SHA1 (freeciv-2.6.2.tar.bz2) = d459c711a164fbaf215e0083aaf5784253a1492f
-RMD160 (freeciv-2.6.2.tar.bz2) = df2fb7b8fa84e1d5ac4bbcc7ad73379d108aab00
-SHA512 (freeciv-2.6.2.tar.bz2) = b11752f38027fcc8b092f323d4e76cf3c4c426bfcc811eb3a76daca075dc391d8179cd140abf1534abc56409344c53238b9fee2ee10d08a688e15671f3a70ef3
-Size (freeciv-2.6.2.tar.bz2) = 52139007 bytes
+SHA1 (freeciv-2.6.5.tar.bz2) = 739a8fa5abb8a9d548572b09c20cb63c00abc88f
+RMD160 (freeciv-2.6.5.tar.bz2) = d3ec7aca47632bf4cbc1e5eb0c4e85ebae1e176f
+SHA512 (freeciv-2.6.5.tar.bz2) = a80d319d62395a65f089ba4e9f60af29e94209c06ab6e7dd0fb30009857e59f3b54f89f4aa0bd7671ca14bc4d17d468fc37f21bf447840292ab3cacb976ae17b
+Size (freeciv-2.6.5.tar.bz2) = 52139611 bytes
diff --git a/games/freeciv-share/suppress_installation.mk b/games/freeciv-share/suppress_installation.mk
index d45d140f9d9..274d912c34b 100644
--- a/games/freeciv-share/suppress_installation.mk
+++ b/games/freeciv-share/suppress_installation.mk
@@ -1,4 +1,4 @@
-# $NetBSD: suppress_installation.mk,v 1.7 2020/05/21 15:58:40 rillig Exp $
+# $NetBSD: suppress_installation.mk,v 1.8 2021/09/19 07:31:27 nia Exp $
 
 # Makefile snippet to be included by freeciv-client and freeciv-server to
 # prevent files installed by freeciv-share from being installed again.
@@ -26,11 +26,11 @@ 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_NOOP_OK.installmanfix3=	yes 
+SUBST_NOOP_OK.installmanfix3=	yes
 
 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_NOOP_OK.installmanfix4=	yes 
+SUBST_NOOP_OK.installmanfix4=	yes