Index: Makefile
===================================================================
--- Makefile	(revision 439347)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aisleriot
-PORTVERSION=	3.18.2
+PORTVERSION=	3.22.1
 CATEGORIES=	games gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -14,13 +14,16 @@
 		appstream-builder:devel/appstream-glib \
 		bash:shells/bash
 LIB_DEPENDS=	libguile-2.0.so:lang/guile2 \
-		libcanberra-gtk3.so:audio/libcanberra-gtk3
+		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+		libgc-threaded.so:devel/boehm-gc-threaded
 
-CONFLICTS=	sol-*
+CONFLICTS=	sol-[0-9]*
 PORTSCOUT=	limitw:1,even
 
 USES=		desktop-file-utils gettext gmake gnome pathfix pkgconfig tar:xz
-USE_GNOME=	gconf2 gtk30 intlhack librsvg2 libxml2:build
+USE_GNOME=	cairo gconf2 gtk30 intlhack librsvg2 libxml2:build
+USE_XORG=	x11
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-card-theme-formats=svg \
 		--with-guile=2.0
@@ -30,4 +33,5 @@
 GCONF_SCHEMAS=	aisleriot.schemas
 GLIB_SCHEMAS=	org.gnome.Patience.WindowState.gschema.xml
 
+INSTALLS_ICONS=	yes
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 439347)
+++ distinfo	(working copy)
@@ -1,2 +1,3 @@
-SHA256 (gnome3/aisleriot-3.18.2.tar.xz) = 0bac8ba11ce37e4e7beddcd173f55ac1630a425399cfabb57e0e500886642fe3
-SIZE (gnome3/aisleriot-3.18.2.tar.xz) = 6322512
+TIMESTAMP = 1493081452
+SHA256 (gnome3/aisleriot-3.22.1.tar.xz) = 52b11114205f901e63c8e1e8aacd317dd7fb50217061bc2cdabba339d3c0cd07
+SIZE (gnome3/aisleriot-3.22.1.tar.xz) = 6321784
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 439347)
+++ pkg-plist	(working copy)
@@ -1929,6 +1929,7 @@
 share/locale/fa/LC_MESSAGES/aisleriot.mo
 share/locale/fi/LC_MESSAGES/aisleriot.mo
 share/locale/fr/LC_MESSAGES/aisleriot.mo
+share/locale/fur/LC_MESSAGES/aisleriot.mo
 share/locale/ga/LC_MESSAGES/aisleriot.mo
 share/locale/gl/LC_MESSAGES/aisleriot.mo
 share/locale/gu/LC_MESSAGES/aisleriot.mo
@@ -1987,21 +1988,21 @@
 share/locale/zh_CN/LC_MESSAGES/aisleriot.mo
 share/locale/zh_HK/LC_MESSAGES/aisleriot.mo
 share/locale/zh_TW/LC_MESSAGES/aisleriot.mo
+@dir share/help/ca/aisleriot/figures
+@dir share/help/cs/aisleriot/figures
+@dir share/help/de/aisleriot/figures
+@dir share/help/el/aisleriot/figures
+@dir share/help/en_GB/aisleriot/figures
+@dir share/help/es/aisleriot/figures
+@dir share/help/eu/aisleriot/figures
+@dir share/help/fr/aisleriot/figures
+@dir share/help/gl/aisleriot/figures
+@dir share/help/hu/aisleriot/figures
+@dir share/help/oc/aisleriot/figures
+@dir share/help/pt_BR/aisleriot/figures
+@dir share/help/ru/aisleriot/figures
+@dir share/help/sl/aisleriot/figures
+@dir share/help/sr/aisleriot/figures
+@dir share/help/sr@latin/aisleriot/figures
+@dir share/help/sv/aisleriot/figures
 @dir share/help/zh_CN/aisleriot/figures
-@dir share/help/sv/aisleriot/figures
-@dir share/help/sr@latin/aisleriot/figures
-@dir share/help/sr/aisleriot/figures
-@dir share/help/sl/aisleriot/figures
-@dir share/help/ru/aisleriot/figures
-@dir share/help/pt_BR/aisleriot/figures
-@dir share/help/oc/aisleriot/figures
-@dir share/help/hu/aisleriot/figures
-@dir share/help/gl/aisleriot/figures
-@dir share/help/fr/aisleriot/figures
-@dir share/help/eu/aisleriot/figures
-@dir share/help/es/aisleriot/figures
-@dir share/help/en_GB/aisleriot/figures
-@dir share/help/el/aisleriot/figures
-@dir share/help/de/aisleriot/figures
-@dir share/help/cs/aisleriot/figures
-@dir share/help/ca/aisleriot/figures