3 files changed, 228 insertions, 141 deletions

diff --git a/games/swell-foop/Makefile b/games/swell-foop/Makefile
index 8769a9820b62..08b47b845aab 100644
--- a/games/swell-foop/Makefile
+++ b/games/swell-foop/Makefile
@@ -1,33 +1,29 @@
 # Created by: FreeBSD GNOME Team <gnome@freebsd.org>
 
 PORTNAME=	swell-foop
-PORTVERSION=	3.34.1
+PORTVERSION=	40.1
 CATEGORIES=	games gnome
-MASTER_SITES=	GNOME
+MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
 
-PATCH_SITES=	https://gitlab.gnome.org/GNOME/swell-foop/-/commit/
-PATCHFILES=	a366bf649c032c56f52138d14e2b96b4a48525de.patch:-p1
-
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome swell-foop
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	vala:lang/vala \
-		itstool:textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool \
+		vala:lang/vala
 LIB_DEPENDS=	libclutter-1.0.so:graphics/clutter \
-		libclutter-gtk-1.0.so:graphics/clutter-gtk3
+		libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
+		libgnome-games-support-1.so:games/libgnome-games-support
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gnome localbase meson \
-		pkgconfig python:3.6+,build tar:xz
+USES=		gettext gnome localbase meson pkgconfig python:3.6+,build \
+		tar:xz
 USE_GNOME=	gtk30
 INSTALLS_ICONS=	yes
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
-GLIB_SCHEMAS=	org.gnome.swell-foop.gschema.xml
-
 .include <bsd.port.mk>
diff --git a/games/swell-foop/distinfo b/games/swell-foop/distinfo
index 32c7fbc8e18f..497aef92374a 100644
--- a/games/swell-foop/distinfo
+++ b/games/swell-foop/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1613211655
-SHA256 (gnome/swell-foop-3.34.1.tar.xz) = 61c6b6ff9047c00bdc0dbe11a880058a5462921c702123a2d6d1a652bbbe6280
-SIZE (gnome/swell-foop-3.34.1.tar.xz) = 732008
-SHA256 (gnome/a366bf649c032c56f52138d14e2b96b4a48525de.patch) = 744f046f0561bd27f339ee2115d8caa2d9cd36c8a6c3046456fe0bdaefacf419
-SIZE (gnome/a366bf649c032c56f52138d14e2b96b4a48525de.patch) = 757
+TIMESTAMP = 1629301532
+SHA256 (gnome/swell-foop-40.1.tar.xz) = c1070d8a88fa43dc56a85e8bba07e9d89d8f8898cf9ed6b838e81f8d1e58249f
+SIZE (gnome/swell-foop-40.1.tar.xz) = 821744
diff --git a/games/swell-foop/pkg-plist b/games/swell-foop/pkg-plist
index 280fc4917828..59b0aa08b6b8 100644
--- a/games/swell-foop/pkg-plist
+++ b/games/swell-foop/pkg-plist
@@ -1,145 +1,237 @@
 bin/swell-foop
 share/applications/org.gnome.SwellFoop.desktop
-share/help/C/swell-foop/figures/play1.png
-share/help/C/swell-foop/figures/play2.png
-share/help/C/swell-foop/figures/play3.png
-share/help/C/swell-foop/figures/play4.png
-share/help/C/swell-foop/figures/start-up.png
-share/help/C/swell-foop/index.docbook
+share/dbus-1/services/org.gnome.SwellFoop.service
+share/glib-2.0/schemas/org.gnome.SwellFoop.gschema.xml
+share/help/C/swell-foop/figures/logo.png
+share/help/C/swell-foop/figures/start-game.png
+share/help/C/swell-foop/index.page
+share/help/C/swell-foop/introduction.page
 share/help/C/swell-foop/legal.xml
-share/help/ca/swell-foop/figures/play1.png
-share/help/ca/swell-foop/figures/play2.png
-share/help/ca/swell-foop/figures/play3.png
-share/help/ca/swell-foop/figures/play4.png
-share/help/ca/swell-foop/figures/start-up.png
-share/help/ca/swell-foop/index.docbook
+share/help/C/swell-foop/playing-game.page
+share/help/C/swell-foop/preferences.page
+share/help/C/swell-foop/score.page
+share/help/C/swell-foop/start.page
+share/help/C/swell-foop/strategy.page
+share/help/ca/swell-foop/figures/logo.png
+share/help/ca/swell-foop/figures/start-game.png
+share/help/ca/swell-foop/index.page
+share/help/ca/swell-foop/introduction.page
 share/help/ca/swell-foop/legal.xml
-share/help/cs/swell-foop/figures/play1.png
-share/help/cs/swell-foop/figures/play2.png
-share/help/cs/swell-foop/figures/play3.png
-share/help/cs/swell-foop/figures/play4.png
-share/help/cs/swell-foop/figures/start-up.png
-share/help/cs/swell-foop/index.docbook
+share/help/ca/swell-foop/playing-game.page
+share/help/ca/swell-foop/preferences.page
+share/help/ca/swell-foop/score.page
+share/help/ca/swell-foop/start.page
+share/help/ca/swell-foop/strategy.page
+share/help/cs/swell-foop/figures/logo.png
+share/help/cs/swell-foop/figures/start-game.png
+share/help/cs/swell-foop/index.page
+share/help/cs/swell-foop/introduction.page
 share/help/cs/swell-foop/legal.xml
-share/help/de/swell-foop/figures/play1.png
-share/help/de/swell-foop/figures/play2.png
-share/help/de/swell-foop/figures/play3.png
-share/help/de/swell-foop/figures/play4.png
-share/help/de/swell-foop/figures/start-up.png
-share/help/de/swell-foop/index.docbook
+share/help/cs/swell-foop/playing-game.page
+share/help/cs/swell-foop/preferences.page
+share/help/cs/swell-foop/score.page
+share/help/cs/swell-foop/start.page
+share/help/cs/swell-foop/strategy.page
+share/help/da/swell-foop/figures/logo.png
+share/help/da/swell-foop/figures/start-game.png
+share/help/da/swell-foop/index.page
+share/help/da/swell-foop/introduction.page
+share/help/da/swell-foop/legal.xml
+share/help/da/swell-foop/playing-game.page
+share/help/da/swell-foop/preferences.page
+share/help/da/swell-foop/score.page
+share/help/da/swell-foop/start.page
+share/help/da/swell-foop/strategy.page
+share/help/de/swell-foop/figures/logo.png
+share/help/de/swell-foop/figures/start-game.png
+share/help/de/swell-foop/index.page
+share/help/de/swell-foop/introduction.page
 share/help/de/swell-foop/legal.xml
-share/help/el/swell-foop/figures/play1.png
-share/help/el/swell-foop/figures/play2.png
-share/help/el/swell-foop/figures/play3.png
-share/help/el/swell-foop/figures/play4.png
-share/help/el/swell-foop/figures/start-up.png
-share/help/el/swell-foop/index.docbook
+share/help/de/swell-foop/playing-game.page
+share/help/de/swell-foop/preferences.page
+share/help/de/swell-foop/score.page
+share/help/de/swell-foop/start.page
+share/help/de/swell-foop/strategy.page
+share/help/el/swell-foop/figures/logo.png
+share/help/el/swell-foop/figures/start-game.png
+share/help/el/swell-foop/index.page
+share/help/el/swell-foop/introduction.page
 share/help/el/swell-foop/legal.xml
-share/help/en_GB/swell-foop/figures/play1.png
-share/help/en_GB/swell-foop/figures/play2.png
-share/help/en_GB/swell-foop/figures/play3.png
-share/help/en_GB/swell-foop/figures/play4.png
-share/help/en_GB/swell-foop/figures/start-up.png
-share/help/en_GB/swell-foop/index.docbook
+share/help/el/swell-foop/playing-game.page
+share/help/el/swell-foop/preferences.page
+share/help/el/swell-foop/score.page
+share/help/el/swell-foop/start.page
+share/help/el/swell-foop/strategy.page
+share/help/en_GB/swell-foop/figures/logo.png
+share/help/en_GB/swell-foop/figures/start-game.png
+share/help/en_GB/swell-foop/index.page
+share/help/en_GB/swell-foop/introduction.page
 share/help/en_GB/swell-foop/legal.xml
-share/help/es/swell-foop/figures/play1.png
-share/help/es/swell-foop/figures/play2.png
-share/help/es/swell-foop/figures/play3.png
-share/help/es/swell-foop/figures/play4.png
-share/help/es/swell-foop/figures/start-up.png
-share/help/es/swell-foop/index.docbook
+share/help/en_GB/swell-foop/playing-game.page
+share/help/en_GB/swell-foop/preferences.page
+share/help/en_GB/swell-foop/score.page
+share/help/en_GB/swell-foop/start.page
+share/help/en_GB/swell-foop/strategy.page
+share/help/es/swell-foop/figures/logo.png
+share/help/es/swell-foop/figures/start-game.png
+share/help/es/swell-foop/index.page
+share/help/es/swell-foop/introduction.page
 share/help/es/swell-foop/legal.xml
-share/help/eu/swell-foop/figures/play1.png
-share/help/eu/swell-foop/figures/play2.png
-share/help/eu/swell-foop/figures/play3.png
-share/help/eu/swell-foop/figures/play4.png
-share/help/eu/swell-foop/figures/start-up.png
-share/help/eu/swell-foop/index.docbook
+share/help/es/swell-foop/playing-game.page
+share/help/es/swell-foop/preferences.page
+share/help/es/swell-foop/score.page
+share/help/es/swell-foop/start.page
+share/help/es/swell-foop/strategy.page
+share/help/eu/swell-foop/figures/logo.png
+share/help/eu/swell-foop/figures/start-game.png
+share/help/eu/swell-foop/index.page
+share/help/eu/swell-foop/introduction.page
 share/help/eu/swell-foop/legal.xml
-share/help/fr/swell-foop/figures/play1.png
-share/help/fr/swell-foop/figures/play2.png
-share/help/fr/swell-foop/figures/play3.png
-share/help/fr/swell-foop/figures/play4.png
-share/help/fr/swell-foop/figures/start-up.png
-share/help/fr/swell-foop/index.docbook
+share/help/eu/swell-foop/playing-game.page
+share/help/eu/swell-foop/preferences.page
+share/help/eu/swell-foop/score.page
+share/help/eu/swell-foop/start.page
+share/help/eu/swell-foop/strategy.page
+share/help/fr/swell-foop/figures/logo.png
+share/help/fr/swell-foop/figures/start-game.png
+share/help/fr/swell-foop/index.page
+share/help/fr/swell-foop/introduction.page
 share/help/fr/swell-foop/legal.xml
-share/help/hu/swell-foop/figures/play1.png
-share/help/hu/swell-foop/figures/play2.png
-share/help/hu/swell-foop/figures/play3.png
-share/help/hu/swell-foop/figures/play4.png
-share/help/hu/swell-foop/figures/start-up.png
-share/help/hu/swell-foop/index.docbook
+share/help/fr/swell-foop/playing-game.page
+share/help/fr/swell-foop/preferences.page
+share/help/fr/swell-foop/score.page
+share/help/fr/swell-foop/start.page
+share/help/fr/swell-foop/strategy.page
+share/help/hu/swell-foop/figures/logo.png
+share/help/hu/swell-foop/figures/start-game.png
+share/help/hu/swell-foop/index.page
+share/help/hu/swell-foop/introduction.page
 share/help/hu/swell-foop/legal.xml
-share/help/it/swell-foop/figures/play1.png
-share/help/it/swell-foop/figures/play2.png
-share/help/it/swell-foop/figures/play3.png
-share/help/it/swell-foop/figures/play4.png
-share/help/it/swell-foop/figures/start-up.png
-share/help/it/swell-foop/index.docbook
+share/help/hu/swell-foop/playing-game.page
+share/help/hu/swell-foop/preferences.page
+share/help/hu/swell-foop/score.page
+share/help/hu/swell-foop/start.page
+share/help/hu/swell-foop/strategy.page
+share/help/id/swell-foop/figures/logo.png
+share/help/id/swell-foop/figures/start-game.png
+share/help/id/swell-foop/index.page
+share/help/id/swell-foop/introduction.page
+share/help/id/swell-foop/legal.xml
+share/help/id/swell-foop/playing-game.page
+share/help/id/swell-foop/preferences.page
+share/help/id/swell-foop/score.page
+share/help/id/swell-foop/start.page
+share/help/id/swell-foop/strategy.page
+share/help/it/swell-foop/figures/logo.png
+share/help/it/swell-foop/figures/start-game.png
+share/help/it/swell-foop/index.page
+share/help/it/swell-foop/introduction.page
 share/help/it/swell-foop/legal.xml
-share/help/oc/swell-foop/figures/play1.png
-share/help/oc/swell-foop/figures/play2.png
-share/help/oc/swell-foop/figures/play3.png
-share/help/oc/swell-foop/figures/play4.png
-share/help/oc/swell-foop/figures/start-up.png
-share/help/oc/swell-foop/index.docbook
+share/help/it/swell-foop/playing-game.page
+share/help/it/swell-foop/preferences.page
+share/help/it/swell-foop/score.page
+share/help/it/swell-foop/start.page
+share/help/it/swell-foop/strategy.page
+share/help/oc/swell-foop/figures/logo.png
+share/help/oc/swell-foop/figures/start-game.png
+share/help/oc/swell-foop/index.page
+share/help/oc/swell-foop/introduction.page
 share/help/oc/swell-foop/legal.xml
-share/help/pl/swell-foop/figures/play1.png
-share/help/pl/swell-foop/figures/play2.png
-share/help/pl/swell-foop/figures/play3.png
-share/help/pl/swell-foop/figures/play4.png
-share/help/pl/swell-foop/figures/start-up.png
-share/help/pl/swell-foop/index.docbook
+share/help/oc/swell-foop/playing-game.page
+share/help/oc/swell-foop/preferences.page
+share/help/oc/swell-foop/score.page
+share/help/oc/swell-foop/start.page
+share/help/oc/swell-foop/strategy.page
+share/help/pl/swell-foop/figures/logo.png
+share/help/pl/swell-foop/figures/start-game.png
+share/help/pl/swell-foop/index.page
+share/help/pl/swell-foop/introduction.page
 share/help/pl/swell-foop/legal.xml
-share/help/pt_BR/swell-foop/figures/play1.png
-share/help/pt_BR/swell-foop/figures/play2.png
-share/help/pt_BR/swell-foop/figures/play3.png
-share/help/pt_BR/swell-foop/figures/play4.png
-share/help/pt_BR/swell-foop/figures/start-up.png
-share/help/pt_BR/swell-foop/index.docbook
+share/help/pl/swell-foop/playing-game.page
+share/help/pl/swell-foop/preferences.page
+share/help/pl/swell-foop/score.page
+share/help/pl/swell-foop/start.page
+share/help/pl/swell-foop/strategy.page
+share/help/pt_BR/swell-foop/figures/logo.png
+share/help/pt_BR/swell-foop/figures/start-game.png
+share/help/pt_BR/swell-foop/index.page
+share/help/pt_BR/swell-foop/introduction.page
 share/help/pt_BR/swell-foop/legal.xml
-share/help/ru/swell-foop/figures/play1.png
-share/help/ru/swell-foop/figures/play2.png
-share/help/ru/swell-foop/figures/play3.png
-share/help/ru/swell-foop/figures/play4.png
-share/help/ru/swell-foop/figures/start-up.png
-share/help/ru/swell-foop/index.docbook
+share/help/pt_BR/swell-foop/playing-game.page
+share/help/pt_BR/swell-foop/preferences.page
+share/help/pt_BR/swell-foop/score.page
+share/help/pt_BR/swell-foop/start.page
+share/help/pt_BR/swell-foop/strategy.page
+share/help/ru/swell-foop/figures/logo.png
+share/help/ru/swell-foop/figures/start-game.png
+share/help/ru/swell-foop/index.page
+share/help/ru/swell-foop/introduction.page
 share/help/ru/swell-foop/legal.xml
-share/help/sl/swell-foop/figures/play1.png
-share/help/sl/swell-foop/figures/play2.png
-share/help/sl/swell-foop/figures/play3.png
-share/help/sl/swell-foop/figures/play4.png
-share/help/sl/swell-foop/figures/start-up.png
-share/help/sl/swell-foop/index.docbook
+share/help/ru/swell-foop/playing-game.page
+share/help/ru/swell-foop/preferences.page
+share/help/ru/swell-foop/score.page
+share/help/ru/swell-foop/start.page
+share/help/ru/swell-foop/strategy.page
+share/help/sl/swell-foop/figures/logo.png
+share/help/sl/swell-foop/figures/start-game.png
+share/help/sl/swell-foop/index.page
+share/help/sl/swell-foop/introduction.page
 share/help/sl/swell-foop/legal.xml
-share/help/sr/swell-foop/figures/play1.png
-share/help/sr/swell-foop/figures/play2.png
-share/help/sr/swell-foop/figures/play3.png
-share/help/sr/swell-foop/figures/play4.png
-share/help/sr/swell-foop/figures/start-up.png
-share/help/sr/swell-foop/index.docbook
+share/help/sl/swell-foop/playing-game.page
+share/help/sl/swell-foop/preferences.page
+share/help/sl/swell-foop/score.page
+share/help/sl/swell-foop/start.page
+share/help/sl/swell-foop/strategy.page
+share/help/sr/swell-foop/figures/logo.png
+share/help/sr/swell-foop/figures/start-game.png
+share/help/sr/swell-foop/index.page
+share/help/sr/swell-foop/introduction.page
 share/help/sr/swell-foop/legal.xml
-share/help/sr@latin/swell-foop/figures/play1.png
-share/help/sr@latin/swell-foop/figures/play2.png
-share/help/sr@latin/swell-foop/figures/play3.png
-share/help/sr@latin/swell-foop/figures/play4.png
-share/help/sr@latin/swell-foop/figures/start-up.png
-share/help/sr@latin/swell-foop/index.docbook
+share/help/sr/swell-foop/playing-game.page
+share/help/sr/swell-foop/preferences.page
+share/help/sr/swell-foop/score.page
+share/help/sr/swell-foop/start.page
+share/help/sr/swell-foop/strategy.page
+share/help/sr@latin/swell-foop/figures/logo.png
+share/help/sr@latin/swell-foop/figures/start-game.png
+share/help/sr@latin/swell-foop/index.page
+share/help/sr@latin/swell-foop/introduction.page
 share/help/sr@latin/swell-foop/legal.xml
-share/help/sv/swell-foop/figures/play1.png
-share/help/sv/swell-foop/figures/play2.png
-share/help/sv/swell-foop/figures/play3.png
-share/help/sv/swell-foop/figures/play4.png
-share/help/sv/swell-foop/figures/start-up.png
-share/help/sv/swell-foop/index.docbook
+share/help/sr@latin/swell-foop/playing-game.page
+share/help/sr@latin/swell-foop/preferences.page
+share/help/sr@latin/swell-foop/score.page
+share/help/sr@latin/swell-foop/start.page
+share/help/sr@latin/swell-foop/strategy.page
+share/help/sv/swell-foop/figures/logo.png
+share/help/sv/swell-foop/figures/start-game.png
+share/help/sv/swell-foop/index.page
+share/help/sv/swell-foop/introduction.page
 share/help/sv/swell-foop/legal.xml
-share/help/zh_CN/swell-foop/figures/play1.png
-share/help/zh_CN/swell-foop/figures/play2.png
-share/help/zh_CN/swell-foop/figures/play3.png
-share/help/zh_CN/swell-foop/figures/play4.png
-share/help/zh_CN/swell-foop/figures/start-up.png
-share/help/zh_CN/swell-foop/index.docbook
+share/help/sv/swell-foop/playing-game.page
+share/help/sv/swell-foop/preferences.page
+share/help/sv/swell-foop/score.page
+share/help/sv/swell-foop/start.page
+share/help/sv/swell-foop/strategy.page
+share/help/uk/swell-foop/figures/logo.png
+share/help/uk/swell-foop/figures/start-game.png
+share/help/uk/swell-foop/index.page
+share/help/uk/swell-foop/introduction.page
+share/help/uk/swell-foop/legal.xml
+share/help/uk/swell-foop/playing-game.page
+share/help/uk/swell-foop/preferences.page
+share/help/uk/swell-foop/score.page
+share/help/uk/swell-foop/start.page
+share/help/uk/swell-foop/strategy.page
+share/help/zh_CN/swell-foop/figures/logo.png
+share/help/zh_CN/swell-foop/figures/start-game.png
+share/help/zh_CN/swell-foop/index.page
+share/help/zh_CN/swell-foop/introduction.page
 share/help/zh_CN/swell-foop/legal.xml
+share/help/zh_CN/swell-foop/playing-game.page
+share/help/zh_CN/swell-foop/preferences.page
+share/help/zh_CN/swell-foop/score.page
+share/help/zh_CN/swell-foop/start.page
+share/help/zh_CN/swell-foop/strategy.page
 share/icons/hicolor/16x16/apps/org.gnome.SwellFoop.png
 share/icons/hicolor/22x22/apps/org.gnome.SwellFoop.png
 share/icons/hicolor/24x24/apps/org.gnome.SwellFoop.png
@@ -239,15 +331,16 @@ share/locale/zh_CN/LC_MESSAGES/swell-foop.mo
 share/locale/zh_HK/LC_MESSAGES/swell-foop.mo
 share/locale/zh_TW/LC_MESSAGES/swell-foop.mo
 share/metainfo/org.gnome.SwellFoop.appdata.xml
-%%DATADIR%%/preferences.ui
-%%DATADIR%%/swell-foop.css
-%%DATADIR%%/themes/colors/bkg.svg
+%%DATADIR%%/themes/boringshapes/blue.svg
+%%DATADIR%%/themes/boringshapes/green.svg
+%%DATADIR%%/themes/boringshapes/highlight.svg
+%%DATADIR%%/themes/boringshapes/red.svg
+%%DATADIR%%/themes/boringshapes/yellow.svg
 %%DATADIR%%/themes/colors/blue.svg
 %%DATADIR%%/themes/colors/green.svg
 %%DATADIR%%/themes/colors/highlight.svg
 %%DATADIR%%/themes/colors/red.svg
 %%DATADIR%%/themes/colors/yellow.svg
-%%DATADIR%%/themes/shapesandcolors/bkg.svg
 %%DATADIR%%/themes/shapesandcolors/blue.svg
 %%DATADIR%%/themes/shapesandcolors/green.svg
 %%DATADIR%%/themes/shapesandcolors/highlight.svg