Diff below brings freeciv to 2.6.1, which is a bugfix release.
https://freeciv.fandom.com/wiki/NEWS-2.6.1 lists the changes since
2.6.0.
(Lightly) run tested on amd64 for the last couple of days.
Comments/OK?
diff --git Makefile Makefile
index 2d8260e17d8..1f8a076b1d8 100644
--- Makefile
+++ Makefile
@@ -4,7 +4,7 @@ COMMENT-main= Civilization clone for X11; multiplayer; game
server
COMMENT-client= Freeciv client
COMMENT-share= shared data files for Freeciv
-VERSION= 2.6.0
+VERSION= 2.6.1
DISTNAME= freeciv-${VERSION}
PKGNAME-main= freeciv-server-${VERSION}
PKGNAME-client= freeciv-client-${VERSION}
@@ -23,15 +23,15 @@ EXTRACT_SUFX= .tar.bz2
cWANTLIB += bz2 c crypto curl iconv intl lzma m nghttp2 pthread sqlite3 ssl z
cWANTLIB += ${MODLUA_WANTLIB}
-WANTLIB-main += curses readline ${cWANTLIB}
+WANTLIB-main += readline ${cWANTLIB}
-WANTLIB-client += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
-WANTLIB-client += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
-WANTLIB-client += cairo cairo-gobject dbus-1 epoxy expat ffi fontconfig
-WANTLIB-client += freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB-client += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
-WANTLIB-client += harfbuzz pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
-WANTLIB-client += pixman-1 png xcb xcb-render xcb-shm ${cWANTLIB}
+WANTLIB-client += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB-client += Xrandr Xrender atk-1.0 atk-bridge-2.0 cairo cairo-gobject
+WANTLIB-client += epoxy expat fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0
+WANTLIB-client += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
+WANTLIB-client += gthread-2.0 gtk-3 harfbuzz pango-1.0 pangocairo-1.0
+WANTLIB-client += pangoft2-1.0 pixman-1 png xcb xcb-render xcb-shm
+WANTLIB-client += ${cWANTLIB}
WANTLIB-share=
diff --git distinfo distinfo
index ba22aa32483..d0d6b4c0e07 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (freeciv-2.6.0.tar.bz2) = fCA5kZjWx9hG/tmmmwLgETSuU0Cjrg+Z0eOAY63myZk=
-SIZE (freeciv-2.6.0.tar.bz2) = 51912466
+SHA256 (freeciv-2.6.1.tar.bz2) = zOaEHaAZQTiq0mnMc1VX20OKRJCddf0D1NtnUHmGueI=
+SIZE (freeciv-2.6.1.tar.bz2) = 51915573
