Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 Mar 2024 06:14:43 GMT
From:      Dima Panov <fluffy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 576c9fe93b8f - main - games/freeciv: update to 3.1.0 release (+)
Message-ID:  <202403180614.42I6EheB017811@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=576c9fe93b8ff43fc21bae500e7b1b875a2fa100

commit 576c9fe93b8ff43fc21bae500e7b1b875a2fa100
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2024-03-18 06:13:48 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2024-03-18 06:13:48 +0000

    games/freeciv: update to 3.1.0 release (+)
    
    Changelog:      https://freeciv.fandom.com/wiki/NEWS-3.1.0
---
 games/freeciv/Makefile  | 20 +++++++-------------
 games/freeciv/distinfo  |  6 +++---
 games/freeciv/pkg-plist | 44 +++++++++++++++++++++-----------------------
 3 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index a2ed440d3a68..1271555530a5 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	freeciv
-PORTVERSION=	3.0.9
-PORTREVISION=	1
+PORTVERSION=	3.1.0
 CATEGORIES=	games
 MASTER_SITES=	SF/freeciv/Freeciv%20${PORTVERSION:R}/${PORTVERSION} \
 		http://files.freeciv.org/stable/
@@ -39,22 +38,15 @@ LDFLAGS+=	-Wl,--as-needed ${ICONV_LIB}
 
 PORTDATA=	*
 
-OPTIONS_DEFINE=		DOCS IPV6 NLS
+OPTIONS_DEFINE=		DOCS IPV6  NLS
 OPTIONS_DEFAULT=	QT5 SQLITE3
 OPTIONS_MULTI=		DB UI
 OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE3
-OPTIONS_MULTI_UI=	GTK2 GTK3 GTK4 QT5 SDL
+OPTIONS_MULTI_UI=	GTK3 GTK4 QT5 SDL
 OPTIONS_SUB=		yes
 
 DB_DESC=	Database support
 UI_DESC=	GUI clients
-GTK4_DESC=	GTK 4 GUI toolkit support (modpack only)
-
-GTK2_USES=	gnome sdl
-GTK2_USE=	GNOME=gdkpixbuf2,glib20,gtk20,pango \
-		SDL=mixer2
-GTK2_VARS=	_FREECIV_CLIENT+=gtk2 \
-		_FREECIV_MP+=gtk2
 
 GTK3_USES=	gnome sdl
 GTK3_USE=	GNOME=cairo,gdkpixbuf2,glib20,gtk30,pango \
@@ -67,7 +59,8 @@ GTK4_IMPLIES=	GTK3
 GTK4_USES=	gnome sdl
 GTK4_USE=	GNOME=cairo,gdkpixbuf2,glib20,gtk40,pango \
 		SDL=mixer2
-GTK4_VARS=	_FREECIV_MP+=gtk4
+GTK4_VARS=	_FREECIV_CLIENT+=gtk4 \
+		_FREECIV_MP+=gtk4
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
@@ -85,7 +78,8 @@ PGSQL_VARS=		_FREECIV_DB+=postgres
 QT5_USES=		qt:5 sdl
 QT5_USE=		QT=core,gui,widgets,buildtools:build \
 			SDL=mixer2
-QT5_CONFIGURE_ON=	--with-qt5-includes=${LOCALBASE}/${QT_INCDIR_REL} \
+QT5_CONFIGURE_ON=	--with-qt5=yes \
+			--with-qt5-includes=${LOCALBASE}/${QT_INCDIR_REL} \
 			--with-qt5-libs=${LOCALBASE}/${QT_LIBDIR_REL}
 QT5_CONFIGURE_ENABLE=	ruledit
 QT5_VARS=		_FREECIV_CLIENT+=qt \
diff --git a/games/freeciv/distinfo b/games/freeciv/distinfo
index eed527d92f8a..4869b8e99d72 100644
--- a/games/freeciv/distinfo
+++ b/games/freeciv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1703602116
-SHA256 (freeciv-3.0.9.tar.xz) = 16c46a9c378b4a511c1e3d3a7c435a78230a432d8b852202aaf5d5d584962742
-SIZE (freeciv-3.0.9.tar.xz) = 43427420
+TIMESTAMP = 1710738662
+SHA256 (freeciv-3.1.0.tar.xz) = d746a883937b955b0ee1d1eba8b4e82354f7f72051ac4f514de7ab308334506e
+SIZE (freeciv-3.1.0.tar.xz) = 44829852
diff --git a/games/freeciv/pkg-plist b/games/freeciv/pkg-plist
index eb8e1d5f5047..235827d50507 100644
--- a/games/freeciv/pkg-plist
+++ b/games/freeciv/pkg-plist
@@ -1,9 +1,8 @@
 %%CLIENT%%bin/freeciv-manual
-%%GTK2%%bin/freeciv-gtk2
 %%GTK3%%bin/freeciv-gtk3
 %%GTK3%%bin/freeciv-gtk3.22
+%%GTK4%%bin/freeciv-gtk4
 bin/freeciv-mp-cli
-%%GTK2%%bin/freeciv-mp-gtk2
 %%GTK3%%bin/freeciv-mp-gtk3
 %%GTK4%%bin/freeciv-mp-gtk4
 %%QT5%%bin/freeciv-mp-qt
@@ -19,30 +18,31 @@ lib/libfreeciv-srv.so.0.0.0
 lib/libfreeciv.so
 lib/libfreeciv.so.0
 lib/libfreeciv.so.0.0.0
-%%GTK2%%share/applications/org.freeciv.gtk2.desktop
-%%GTK2%%share/applications/org.freeciv.mp.gtk2.desktop
-%%GTK3%%share/applications/org.freeciv.mp.gtk3.desktop
+%%GTK3%%share/applications/org.freeciv.gtk3.desktop
 %%GTK3%%share/applications/org.freeciv.gtk322.desktop
-%%GTK4%%share/applications/org.freeciv.mp.gtk4.desktop
-%%QT5%%share/applications/org.freeciv.mp.qt.desktop
+%%GTK3%%share/applications/org.freeciv.gtk3.mp.desktop
+%%GTK4%%share/applications/org.freeciv.gtk4.desktop
+%%GTK4%%share/applications/org.freeciv.gtk4.mp.desktop
 %%QT5%%share/applications/org.freeciv.qt.desktop
+%%QT5%%share/applications/org.freeciv.qt.mp.desktop
 %%QT5%%share/applications/org.freeciv.ruledit.desktop
 %%SDL%%share/applications/org.freeciv.sdl2.desktop
-%%GTK3%%share/applications/org.freeciv.gtk3.desktop
 share/applications/org.freeciv.server.desktop
 %%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 @comment %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog-1.0-S3_0
 %%PORTDOCS%%%%DOCSDIR%%/CodingStyle
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/HACKING
 %%PORTDOCS%%%%DOCSDIR%%/HOWTOPLAY
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.Cygwin
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.meson
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS-3.0
+%%PORTDOCS%%%%DOCSDIR%%/NEWS-3.1
 %%PORTDOCS%%%%DOCSDIR%%/README.AI
 %%PORTDOCS%%%%DOCSDIR%%/README.AI_modules
 %%PORTDOCS%%%%DOCSDIR%%/README.achievements
@@ -196,28 +196,26 @@ share/icons/hicolor/64x64/apps/freeciv-server.png
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/freeciv-nations.mo
 %%QT5%%%%NLS%%share/locale/zh_TW/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/freeciv-core.mo
-%%GTK2%%share/metainfo/org.freeciv.gtk2.appdata.xml
-%%GTK3%%share/metainfo/org.freeciv.gtk3.appdata.xml
-%%GTK3%%share/metainfo/org.freeciv.gtk322.appdata.xml
-%%GTK2%%share/metainfo/org.freeciv.mp.gtk2.appdata.xml
-%%GTK3%%share/metainfo/org.freeciv.mp.gtk3.appdata.xml
-%%GTK4%%share/metainfo/org.freeciv.mp.gtk4.appdata.xml
-%%QT5%%share/metainfo/org.freeciv.mp.qt.appdata.xml
-%%QT5%%share/metainfo/org.freeciv.qt.appdata.xml
-%%QT5%%share/metainfo/org.freeciv.ruledit.appdata.xml
-%%SDL%%share/metainfo/org.freeciv.sdl2.appdata.xml
-share/metainfo/org.freeciv.server.appdata.xml
+%%GTK3%%share/metainfo/org.freeciv.gtk3.metainfo.xml
+%%GTK3%%share/metainfo/org.freeciv.gtk322.metainfo.xml
+%%GTK3%%share/metainfo/org.freeciv.gtk3.mp.metainfo.xml
+%%GTK4%%share/metainfo/org.freeciv.gtk4.metainfo.xml
+%%GTK4%%share/metainfo/org.freeciv.gtk4.mp.metainfo.xml
+%%QT5%%share/metainfo/org.freeciv.qt.metainfo.xml
+%%QT5%%share/metainfo/org.freeciv.qt.mp.metainfo.xml
+%%QT5%%share/metainfo/org.freeciv.ruledit.metainfo.xml
+%%SDL%%share/metainfo/org.freeciv.sdl2.metainfo.xml
+share/metainfo/org.freeciv.server.metainfo.xml
 share/man/man6/freeciv.6.gz
 %%CLIENT%%share/man/man6/freeciv-client.6.gz
-%%GTK2%%share/man/man6/freeciv-gtk2.6.gz
 @comment share/man/man6/freeciv-gtk3.22.6.gz
 %%GTK3%%share/man/man6/freeciv-gtk3.6.gz
-%%GTK4%%share/man/man6/freeciv-mp-gtk4.6.gz
+%%GTK4%%share/man/man6/freeciv-gtk4.6.gz
 share/man/man6/freeciv-manual.6.gz
 share/man/man6/freeciv-modpack.6.gz
 share/man/man6/freeciv-mp-cli.6.gz
-%%GTK2%%share/man/man6/freeciv-mp-gtk2.6.gz
 %%GTK3%%share/man/man6/freeciv-mp-gtk3.6.gz
+%%GTK4%%share/man/man6/freeciv-mp-gtk4.6.gz
 %%QT5%%share/man/man6/freeciv-mp-qt.6.gz
 %%QT5%%share/man/man6/freeciv-qt.6.gz
 %%QT5%%share/man/man6/freeciv-ruledit.6.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403180614.42I6EheB017811>