From 7035f5be742940591558e14fe2059edfaa7147ca Mon Sep 17 00:00:00 2001 From: sthen Date: Fri, 5 Aug 2022 17:12:13 +0000 Subject: [PATCH] update to freeciv-2.6.7, tidy plists a bit --- games/freeciv/Makefile | 17 ++++++++++------- games/freeciv/distinfo | 4 ++-- games/freeciv/pkg/PLIST-client | 15 +-------------- games/freeciv/pkg/PLIST-main | 3 --- games/freeciv/pkg/PLIST-share | 15 +-------------- 5 files changed, 14 insertions(+), 40 deletions(-) diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile index 8b648174e7f..f88ff56661a 100644 --- a/games/freeciv/Makefile +++ b/games/freeciv/Makefile @@ -2,7 +2,7 @@ COMMENT-main= Civilization clone for X11; multiplayer; game server COMMENT-client= Freeciv client COMMENT-share= shared data files for Freeciv -VERSION= 2.6.4 +VERSION= 2.6.7 DISTNAME= freeciv-${VERSION} PKGNAME-main= freeciv-server-${VERSION} @@ -16,18 +16,18 @@ PERMIT_PACKAGE= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freeciv/} EXTRACT_SUFX= .tar.bz2 -cWANTLIB += bz2 c crypto curl execinfo iconv intl lzma m nghttp2 pthread -cWANTLIB += sqlite3 ssl z ${MODLUA_WANTLIB} +cWANTLIB += bz2 c charset crypto curl execinfo iconv intl lzma m +cWANTLIB += nghttp2 pthread sqlite3 ssl z ${MODLUA_WANTLIB} WANTLIB-main += readline ${cWANTLIB} +WANTLIB-client += ${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-client += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 +WANTLIB-client += gtk-3 harfbuzz pango-1.0 pangocairo-1.0 pangoft2-1.0 +WANTLIB-client += xcb WANTLIB-share= @@ -87,5 +87,8 @@ PKG_ARCH-share= * post-install: mv ${WRKINST}/etc/freeciv ${PREFIX}/share/examples/ + cd ${PREFIX}/man/man6 && \ + rm freeciv-{gtk2,gtk3*,mp-cli,mp-gtk*,mp-qt,qt,sdl*,xaw}.6 + rm ${PREFIX}/lib/*.{a,la} .include diff --git a/games/freeciv/distinfo b/games/freeciv/distinfo index d4c17c23fb0..4b4ec35c86d 100644 --- a/games/freeciv/distinfo +++ b/games/freeciv/distinfo @@ -1,2 +1,2 @@ -SHA256 (freeciv-2.6.4.tar.bz2) = QNuVd2asvUnFrxWv0XEdqZa2aBvnq+4zUsXyU5wQwc4= -SIZE (freeciv-2.6.4.tar.bz2) = 52087948 +SHA256 (freeciv-2.6.7.tar.bz2) = 76dhgCSwXt7iublmFKIHDe7LFdp9MuU0sTX3X6gk8vc= +SIZE (freeciv-2.6.7.tar.bz2) = 52264474 diff --git a/games/freeciv/pkg/PLIST-client b/games/freeciv/pkg/PLIST-client index a621f3de2f7..6e4dbff84a6 100644 --- a/games/freeciv/pkg/PLIST-client +++ b/games/freeciv/pkg/PLIST-client @@ -3,23 +3,10 @@ @pkgpath games/freeciv,-client,gtk2 @bin bin/freeciv-gtk3 @bin bin/freeciv-mp-gtk3 -@comment @man man/man6/freeciv-ftwl.6 -@comment lib/libfreeciv.a -@comment lib/libfreeciv.la @man man/man6/freeciv-client.6 -@man man/man6/freeciv-gtk2.6 -@man man/man6/freeciv-gtk3.22.6 -@comment @man man/man6/freeciv-gtk3.6 @man man/man6/freeciv-modpack.6 -@comment @man man/man6/freeciv-mp-cli.6 -@man man/man6/freeciv-mp-gtk2.6 -@comment man/man6/freeciv-mp-gtk3.6 -@comment man/man6/freeciv-mp-qt.6 -@comment @man man/man6/freeciv-qt.6 @man man/man6/freeciv-ruledit.6 -@comment @man man/man6/freeciv-sdl.6 -@man man/man6/freeciv-sdl2.6 -@comment @man man/man6/freeciv-xaw.6 +@man man/man6/freeciv.6 share/appdata/ share/appdata/freeciv-gtk3.appdata.xml share/appdata/freeciv-mp-gtk3.appdata.xml diff --git a/games/freeciv/pkg/PLIST-main b/games/freeciv/pkg/PLIST-main index 01fd8e61eaf..61da6d59e7c 100644 --- a/games/freeciv/pkg/PLIST-main +++ b/games/freeciv/pkg/PLIST-main @@ -2,9 +2,6 @@ @pkgpath games/freeciv @bin bin/freeciv-manual @bin bin/freeciv-server -@comment lib/fcai/ -@comment lib/libfreeciv-srv.a -@comment lib/libfreeciv-srv.la @man man/man6/freeciv-manual.6 @man man/man6/freeciv-server.6 share/appdata/ diff --git a/games/freeciv/pkg/PLIST-share b/games/freeciv/pkg/PLIST-share index 49c6c47f1b8..7cdb875ac50 100644 --- a/games/freeciv/pkg/PLIST-share +++ b/games/freeciv/pkg/PLIST-share @@ -1,4 +1,3 @@ -@comment share/applications/ share/freeciv/ share/freeciv/civ1/ share/freeciv/civ1.serv @@ -669,22 +668,10 @@ share/freeciv/scenarios/europe_1900_WWI.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/italy-114x100-v2.0.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 -@comment share/icons/ -@comment share/icons/hicolor/ -@comment share/icons/hicolor/128x128/ -@comment share/icons/hicolor/128x128/apps/ -@comment share/icons/hicolor/16x16/ -@comment share/icons/hicolor/16x16/apps/ -@comment share/icons/hicolor/32x32/ -@comment share/icons/hicolor/32x32/apps/ -@comment share/icons/hicolor/48x48/ -@comment share/icons/hicolor/48x48/apps/ -@comment share/icons/hicolor/64x64/ -@comment share/icons/hicolor/64x64/apps/ share/locale/ share/locale/ar/ share/locale/ar/LC_MESSAGES/