Update Guile to version 2.2.5, modern stable version, and fix dependent

ports to build against it.  Most changes are rather minor and mechanical
except for the devel/gdb (obtained via their bugtracker [1], courtesy of
Doug Evans).  One port (science/meep) I had to mark BROKEN after fixing
it proved to be very tedious and actually unreliable.  It is very old,
there are newer versions available so it should be fixed by updating.

One port (devel/libruin) had revealed a bug in the new Guile code (an
auxiliary script, really) that had to be worked-round; reference to the
problematic upstream commit is provided in the patch.

PR:		229613
Exp-run by:	antoine

[1] https://sourceware.org/bugzilla/show_bug.cgi?id=21104#c8

4 files changed, 102 insertions, 98 deletions

diff --git a/games/aisleriot/Makefile b/games/aisleriot/Makefile
index 5537130fc8e6..ab42af2468f2 100644
--- a/games/aisleriot/Makefile
+++ b/games/aisleriot/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	aisleriot
 PORTVERSION=	3.22.5
+PORTREVISION=	1
 CATEGORIES=	games gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -12,7 +13,7 @@ COMMENT=	Collection of patience games written in guile scheme
 
 BUILD_DEPENDS=	itstool:textproc/itstool \
 		bash:shells/bash
-LIB_DEPENDS=	libguile-2.0.so:lang/guile2 \
+LIB_DEPENDS=	libguile-2.2.so:lang/guile2 \
 		libcanberra.so:audio/libcanberra \
 		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libgc-threaded.so:devel/boehm-gc-threaded
@@ -25,8 +26,7 @@ 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
+CONFIGURE_ARGS=	--with-card-theme-formats=svg
 # work around because configure needs bash
 CONFIGURE_SHELL=${LOCALBASE}/bin/bash
 
diff --git a/games/aisleriot/pkg-plist b/games/aisleriot/pkg-plist
index d887d567d1fa..c5db69c34d29 100644
--- a/games/aisleriot/pkg-plist
+++ b/games/aisleriot/pkg-plist
@@ -1,95 +1,95 @@
 bin/sol
-lib/aisleriot/guile/2.0/accordion.go
-lib/aisleriot/guile/2.0/agnes.go
-lib/aisleriot/guile/2.0/aisleriot/api.go
-lib/aisleriot/guile/2.0/athena.go
-lib/aisleriot/guile/2.0/auld-lang-syne.go
-lib/aisleriot/guile/2.0/aunt-mary.go
-lib/aisleriot/guile/2.0/backbone.go
-lib/aisleriot/guile/2.0/bakers-dozen.go
-lib/aisleriot/guile/2.0/bakers-game.go
-lib/aisleriot/guile/2.0/bear-river.go
-lib/aisleriot/guile/2.0/beleaguered-castle.go
-lib/aisleriot/guile/2.0/block-ten.go
-lib/aisleriot/guile/2.0/bristol.go
-lib/aisleriot/guile/2.0/camelot.go
-lib/aisleriot/guile/2.0/canfield.go
-lib/aisleriot/guile/2.0/carpet.go
-lib/aisleriot/guile/2.0/chessboard.go
-lib/aisleriot/guile/2.0/clock.go
-lib/aisleriot/guile/2.0/cover.go
-lib/aisleriot/guile/2.0/cruel.go
-lib/aisleriot/guile/2.0/diamond-mine.go
-lib/aisleriot/guile/2.0/doublets.go
-lib/aisleriot/guile/2.0/eagle-wing.go
-lib/aisleriot/guile/2.0/easthaven.go
-lib/aisleriot/guile/2.0/eight-off.go
-lib/aisleriot/guile/2.0/elevator.go
-lib/aisleriot/guile/2.0/eliminator.go
-lib/aisleriot/guile/2.0/escalator.go
-lib/aisleriot/guile/2.0/first-law.go
-lib/aisleriot/guile/2.0/fortress.go
-lib/aisleriot/guile/2.0/fortunes.go
-lib/aisleriot/guile/2.0/forty-thieves.go
-lib/aisleriot/guile/2.0/fourteen.go
-lib/aisleriot/guile/2.0/freecell.go
-lib/aisleriot/guile/2.0/gaps.go
-lib/aisleriot/guile/2.0/gay-gordons.go
-lib/aisleriot/guile/2.0/giant.go
-lib/aisleriot/guile/2.0/glenwood.go
-lib/aisleriot/guile/2.0/gold-mine.go
-lib/aisleriot/guile/2.0/golf.go
-lib/aisleriot/guile/2.0/gypsy.go
-lib/aisleriot/guile/2.0/hamilton.go
-lib/aisleriot/guile/2.0/helsinki.go
-lib/aisleriot/guile/2.0/hopscotch.go
-lib/aisleriot/guile/2.0/isabel.go
-lib/aisleriot/guile/2.0/jamestown.go
-lib/aisleriot/guile/2.0/jumbo.go
-lib/aisleriot/guile/2.0/kansas.go
-lib/aisleriot/guile/2.0/king-albert.go
-lib/aisleriot/guile/2.0/kings-audience.go
-lib/aisleriot/guile/2.0/klondike.go
-lib/aisleriot/guile/2.0/labyrinth.go
-lib/aisleriot/guile/2.0/lady-jane.go
-lib/aisleriot/guile/2.0/maze.go
-lib/aisleriot/guile/2.0/monte-carlo.go
-lib/aisleriot/guile/2.0/napoleons-tomb.go
-lib/aisleriot/guile/2.0/neighbor.go
-lib/aisleriot/guile/2.0/odessa.go
-lib/aisleriot/guile/2.0/osmosis.go
-lib/aisleriot/guile/2.0/peek.go
-lib/aisleriot/guile/2.0/pileon.go
-lib/aisleriot/guile/2.0/plait.go
-lib/aisleriot/guile/2.0/poker.go
-lib/aisleriot/guile/2.0/quatorze.go
-lib/aisleriot/guile/2.0/royal-east.go
-lib/aisleriot/guile/2.0/saratoga.go
-lib/aisleriot/guile/2.0/scorpion.go
-lib/aisleriot/guile/2.0/scuffle.go
-lib/aisleriot/guile/2.0/seahaven.go
-lib/aisleriot/guile/2.0/sir-tommy.go
-lib/aisleriot/guile/2.0/spider-three-decks.go
-lib/aisleriot/guile/2.0/spider.go
-lib/aisleriot/guile/2.0/spiderette.go
-lib/aisleriot/guile/2.0/straight-up.go
-lib/aisleriot/guile/2.0/streets-and-alleys.go
-lib/aisleriot/guile/2.0/ten-across.go
-lib/aisleriot/guile/2.0/terrace.go
-lib/aisleriot/guile/2.0/thieves.go
-lib/aisleriot/guile/2.0/thirteen.go
-lib/aisleriot/guile/2.0/thumb-and-pouch.go
-lib/aisleriot/guile/2.0/treize.go
-lib/aisleriot/guile/2.0/triple-peaks.go
-lib/aisleriot/guile/2.0/union-square.go
-lib/aisleriot/guile/2.0/valentine.go
-lib/aisleriot/guile/2.0/wall.go
-lib/aisleriot/guile/2.0/westhaven.go
-lib/aisleriot/guile/2.0/whitehead.go
-lib/aisleriot/guile/2.0/will-o-the-wisp.go
-lib/aisleriot/guile/2.0/yield.go
-lib/aisleriot/guile/2.0/yukon.go
-lib/aisleriot/guile/2.0/zebra.go
+lib/aisleriot/guile/2.2/accordion.go
+lib/aisleriot/guile/2.2/agnes.go
+lib/aisleriot/guile/2.2/aisleriot/api.go
+lib/aisleriot/guile/2.2/athena.go
+lib/aisleriot/guile/2.2/auld-lang-syne.go
+lib/aisleriot/guile/2.2/aunt-mary.go
+lib/aisleriot/guile/2.2/backbone.go
+lib/aisleriot/guile/2.2/bakers-dozen.go
+lib/aisleriot/guile/2.2/bakers-game.go
+lib/aisleriot/guile/2.2/bear-river.go
+lib/aisleriot/guile/2.2/beleaguered-castle.go
+lib/aisleriot/guile/2.2/block-ten.go
+lib/aisleriot/guile/2.2/bristol.go
+lib/aisleriot/guile/2.2/camelot.go
+lib/aisleriot/guile/2.2/canfield.go
+lib/aisleriot/guile/2.2/carpet.go
+lib/aisleriot/guile/2.2/chessboard.go
+lib/aisleriot/guile/2.2/clock.go
+lib/aisleriot/guile/2.2/cover.go
+lib/aisleriot/guile/2.2/cruel.go
+lib/aisleriot/guile/2.2/diamond-mine.go
+lib/aisleriot/guile/2.2/doublets.go
+lib/aisleriot/guile/2.2/eagle-wing.go
+lib/aisleriot/guile/2.2/easthaven.go
+lib/aisleriot/guile/2.2/eight-off.go
+lib/aisleriot/guile/2.2/elevator.go
+lib/aisleriot/guile/2.2/eliminator.go
+lib/aisleriot/guile/2.2/escalator.go
+lib/aisleriot/guile/2.2/first-law.go
+lib/aisleriot/guile/2.2/fortress.go
+lib/aisleriot/guile/2.2/fortunes.go
+lib/aisleriot/guile/2.2/forty-thieves.go
+lib/aisleriot/guile/2.2/fourteen.go
+lib/aisleriot/guile/2.2/freecell.go
+lib/aisleriot/guile/2.2/gaps.go
+lib/aisleriot/guile/2.2/gay-gordons.go
+lib/aisleriot/guile/2.2/giant.go
+lib/aisleriot/guile/2.2/glenwood.go
+lib/aisleriot/guile/2.2/gold-mine.go
+lib/aisleriot/guile/2.2/golf.go
+lib/aisleriot/guile/2.2/gypsy.go
+lib/aisleriot/guile/2.2/hamilton.go
+lib/aisleriot/guile/2.2/helsinki.go
+lib/aisleriot/guile/2.2/hopscotch.go
+lib/aisleriot/guile/2.2/isabel.go
+lib/aisleriot/guile/2.2/jamestown.go
+lib/aisleriot/guile/2.2/jumbo.go
+lib/aisleriot/guile/2.2/kansas.go
+lib/aisleriot/guile/2.2/king-albert.go
+lib/aisleriot/guile/2.2/kings-audience.go
+lib/aisleriot/guile/2.2/klondike.go
+lib/aisleriot/guile/2.2/labyrinth.go
+lib/aisleriot/guile/2.2/lady-jane.go
+lib/aisleriot/guile/2.2/maze.go
+lib/aisleriot/guile/2.2/monte-carlo.go
+lib/aisleriot/guile/2.2/napoleons-tomb.go
+lib/aisleriot/guile/2.2/neighbor.go
+lib/aisleriot/guile/2.2/odessa.go
+lib/aisleriot/guile/2.2/osmosis.go
+lib/aisleriot/guile/2.2/peek.go
+lib/aisleriot/guile/2.2/pileon.go
+lib/aisleriot/guile/2.2/plait.go
+lib/aisleriot/guile/2.2/poker.go
+lib/aisleriot/guile/2.2/quatorze.go
+lib/aisleriot/guile/2.2/royal-east.go
+lib/aisleriot/guile/2.2/saratoga.go
+lib/aisleriot/guile/2.2/scorpion.go
+lib/aisleriot/guile/2.2/scuffle.go
+lib/aisleriot/guile/2.2/seahaven.go
+lib/aisleriot/guile/2.2/sir-tommy.go
+lib/aisleriot/guile/2.2/spider-three-decks.go
+lib/aisleriot/guile/2.2/spider.go
+lib/aisleriot/guile/2.2/spiderette.go
+lib/aisleriot/guile/2.2/straight-up.go
+lib/aisleriot/guile/2.2/streets-and-alleys.go
+lib/aisleriot/guile/2.2/ten-across.go
+lib/aisleriot/guile/2.2/terrace.go
+lib/aisleriot/guile/2.2/thieves.go
+lib/aisleriot/guile/2.2/thirteen.go
+lib/aisleriot/guile/2.2/thumb-and-pouch.go
+lib/aisleriot/guile/2.2/treize.go
+lib/aisleriot/guile/2.2/triple-peaks.go
+lib/aisleriot/guile/2.2/union-square.go
+lib/aisleriot/guile/2.2/valentine.go
+lib/aisleriot/guile/2.2/wall.go
+lib/aisleriot/guile/2.2/westhaven.go
+lib/aisleriot/guile/2.2/whitehead.go
+lib/aisleriot/guile/2.2/will-o-the-wisp.go
+lib/aisleriot/guile/2.2/yield.go
+lib/aisleriot/guile/2.2/yukon.go
+lib/aisleriot/guile/2.2/zebra.go
 lib/valgrind/aisleriot.supp
 libexec/aisleriot/ar-cards-renderer
 man/man6/sol.6.gz
diff --git a/games/gnubik/Makefile b/games/gnubik/Makefile
index d66ab657552d..e41570dddb4f 100644
--- a/games/gnubik/Makefile
+++ b/games/gnubik/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnubik
 PORTVERSION=	2.4.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	GNU
 
@@ -13,7 +13,7 @@ COMMENT=	3D Rubik's cube game
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libguile-2.0.so:lang/guile2 \
+LIB_DEPENDS=	libguile-2.2.so:lang/guile2 \
 		libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
 
 GNU_CONFIGURE=	yes
@@ -27,6 +27,10 @@ INFO=		gnubik
 
 OPTIONS_DEFINE=	DOCS
 
+post-patch:
+	@${REINPLACE_CMD} -e 's,guile-2\.0,guile-2.2,' \
+		${WRKSRC}/configure
+
 post-install:
 	${LN} -s ../icons/hicolor/32x32/apps/gnubik.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 
diff --git a/games/trackballs/Makefile b/games/trackballs/Makefile
index de906f9e3a36..3f8560b39a33 100644
--- a/games/trackballs/Makefile
+++ b/games/trackballs/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	trackballs
 PORTVERSION=	1.3.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 
 MAINTAINER=	martymac@FreeBSD.org
@@ -13,7 +13,7 @@ COMMENT=	SDL-based Marble Madness clone
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libguile-2.0.so:lang/guile2 \
+LIB_DEPENDS=	libguile-2.2.so:lang/guile2 \
 		libgc.so:devel/boehm-gc
 
 USES=		cmake desktop-file-utils gettext-runtime gl gnome pkgconfig sdl