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

6 files changed, 149 insertions, 75 deletions

diff --git a/lang/guile2/Makefile b/lang/guile2/Makefile
index 2b10737fd715..d0980639e2b5 100644
--- a/lang/guile2/Makefile
+++ b/lang/guile2/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	guile
-PORTVERSION=	2.0.14
-PORTREVISION=	10
+PORTVERSION=	2.2.5
 CATEGORIES=	lang scheme
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	2
@@ -24,7 +23,7 @@ CONFLICTS_INSTALL=	guile-[0-9]*
 MAKE_JOBS_UNSAFE=	yes
 
 USES=		charsetfix ${USES_${ARCH}} gmake iconv libtool makeinfo ncurses pathfix \
-		pkgconfig readline
+		pkgconfig readline tar:lz
 USES_powerpc64=	compiler:c11
 
 USE_LDCONFIG=	yes
@@ -57,6 +56,8 @@ post-patch:
 	  ${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' ${REINPLACE_FILES}
 	@${REINPLACE_CMD} -e 's|sys/time.h sys/timeb.h|sys/time.h |g' \
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-i -e|-i.bak -e|' \
+		${WRKSRC}/libguile/Makefile.in
 
 post-patch-THREADS-on:
 	@${REINPLACE_CMD} -e 's|bdw-gc|bdw-gc-threaded|g' ${WRKSRC}/configure
diff --git a/lang/guile2/distinfo b/lang/guile2/distinfo
index b2490986ea9b..ac068d0a351f 100644
--- a/lang/guile2/distinfo
+++ b/lang/guile2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487980204
-SHA256 (guile-2.0.14.tar.gz) = 8aeb2f353881282fe01694cce76bb72f7ffdd296a12c7a1a39255c27b0dfe5f1
-SIZE (guile-2.0.14.tar.gz) = 7823099
+TIMESTAMP = 1561026500
+SHA256 (guile-2.2.5.tar.lz) = 340a2ec7a6beb080f1b6f34e642dc2fb2235176468dcad2d01fdc695ed5a0128
+SIZE (guile-2.2.5.tar.lz) = 9220300
diff --git a/lang/guile2/files/patch-libguile_____scm.h b/lang/guile2/files/patch-libguile_____scm.h
deleted file mode 100644
index 1c5f854843e5..000000000000
--- a/lang/guile2/files/patch-libguile_____scm.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- libguile/__scm.h.orig	2014-01-21 21:25:11 UTC
-+++ libguile/__scm.h
-@@ -544,7 +544,8 @@ typedef void *scm_t_subr;
-  * that all the state of the process is contained in the stack.
-  */
- 
--#if defined (sparc) || defined (__sparc__) || defined (__sparc)
-+#if (defined (sparc) || defined (__sparc__) || defined (__sparc)) && \
-+	    defined(__FreeBSD__)
- # define SCM_FLUSH_REGISTER_WINDOWS asm("ta 3")
- #else
- # define SCM_FLUSH_REGISTER_WINDOWS /* empty */
diff --git a/lang/guile2/pkg-plist b/lang/guile2/pkg-plist
index 5fe91f11e77c..7d1d9014ea98 100644
--- a/lang/guile2/pkg-plist
+++ b/lang/guile2/pkg-plist
@@ -6,11 +6,11 @@ bin/guile-tools
 include/guile/%%GUILE_VER%%/libguile.h
 include/guile/%%GUILE_VER%%/libguile/__scm.h
 include/guile/%%GUILE_VER%%/libguile/alist.h
-include/guile/%%GUILE_VER%%/libguile/arbiters.h
 include/guile/%%GUILE_VER%%/libguile/array-handle.h
 include/guile/%%GUILE_VER%%/libguile/array-map.h
 include/guile/%%GUILE_VER%%/libguile/arrays.h
 include/guile/%%GUILE_VER%%/libguile/async.h
+include/guile/%%GUILE_VER%%/libguile/atomic.h
 include/guile/%%GUILE_VER%%/libguile/backtrace.h
 include/guile/%%GUILE_VER%%/libguile/bdw-gc.h
 include/guile/%%GUILE_VER%%/libguile/bitvectors.h
@@ -24,6 +24,7 @@ include/guile/%%GUILE_VER%%/libguile/debug.h
 include/guile/%%GUILE_VER%%/libguile/deprecated.h
 include/guile/%%GUILE_VER%%/libguile/deprecation.h
 include/guile/%%GUILE_VER%%/libguile/dynl.h
+include/guile/%%GUILE_VER%%/libguile/dynstack.h
 include/guile/%%GUILE_VER%%/libguile/dynwind.h
 include/guile/%%GUILE_VER%%/libguile/eq.h
 include/guile/%%GUILE_VER%%/libguile/error.h
@@ -31,16 +32,17 @@ include/guile/%%GUILE_VER%%/libguile/eval.h
 include/guile/%%GUILE_VER%%/libguile/evalext.h
 include/guile/%%GUILE_VER%%/libguile/expand.h
 include/guile/%%GUILE_VER%%/libguile/extensions.h
+include/guile/%%GUILE_VER%%/libguile/fdes-finalizers.h
 include/guile/%%GUILE_VER%%/libguile/feature.h
 include/guile/%%GUILE_VER%%/libguile/filesys.h
 include/guile/%%GUILE_VER%%/libguile/finalizers.h
 include/guile/%%GUILE_VER%%/libguile/fluids.h
+include/guile/%%GUILE_VER%%/libguile/foreign-object.h
 include/guile/%%GUILE_VER%%/libguile/foreign.h
 include/guile/%%GUILE_VER%%/libguile/fports.h
 include/guile/%%GUILE_VER%%/libguile/frames.h
+include/guile/%%GUILE_VER%%/libguile/gc-inline.h
 include/guile/%%GUILE_VER%%/libguile/gc.h
-include/guile/%%GUILE_VER%%/libguile/gdb_interface.h
-include/guile/%%GUILE_VER%%/libguile/gdbint.h
 include/guile/%%GUILE_VER%%/libguile/generalized-arrays.h
 include/guile/%%GUILE_VER%%/libguile/generalized-vectors.h
 include/guile/%%GUILE_VER%%/libguile/gettext.h
@@ -59,6 +61,7 @@ include/guile/%%GUILE_VER%%/libguile/iselect.h
 include/guile/%%GUILE_VER%%/libguile/keywords.h
 include/guile/%%GUILE_VER%%/libguile/list.h
 include/guile/%%GUILE_VER%%/libguile/load.h
+include/guile/%%GUILE_VER%%/libguile/loader.h
 include/guile/%%GUILE_VER%%/libguile/macros.h
 include/guile/%%GUILE_VER%%/libguile/mallocs.h
 include/guile/%%GUILE_VER%%/libguile/memoize.h
@@ -66,7 +69,6 @@ include/guile/%%GUILE_VER%%/libguile/modules.h
 include/guile/%%GUILE_VER%%/libguile/net_db.h
 include/guile/%%GUILE_VER%%/libguile/null-threads.h
 include/guile/%%GUILE_VER%%/libguile/numbers.h
-include/guile/%%GUILE_VER%%/libguile/objcodes.h
 include/guile/%%GUILE_VER%%/libguile/objprop.h
 include/guile/%%GUILE_VER%%/libguile/options.h
 include/guile/%%GUILE_VER%%/libguile/pairs.h
@@ -84,7 +86,6 @@ include/guile/%%GUILE_VER%%/libguile/random.h
 include/guile/%%GUILE_VER%%/libguile/rdelim.h
 include/guile/%%GUILE_VER%%/libguile/read.h
 include/guile/%%GUILE_VER%%/libguile/regex-posix.h
-include/guile/%%GUILE_VER%%/libguile/root.h
 include/guile/%%GUILE_VER%%/libguile/rw.h
 include/guile/%%GUILE_VER%%/libguile/scmconfig.h
 include/guile/%%GUILE_VER%%/libguile/scmsigs.h
@@ -119,13 +120,17 @@ include/guile/%%GUILE_VER%%/libguile/values.h
 include/guile/%%GUILE_VER%%/libguile/variable.h
 include/guile/%%GUILE_VER%%/libguile/vectors.h
 include/guile/%%GUILE_VER%%/libguile/version.h
-include/guile/%%GUILE_VER%%/libguile/vm-engine.h
+include/guile/%%GUILE_VER%%/libguile/vm-builtins.h
 include/guile/%%GUILE_VER%%/libguile/vm-expand.h
 include/guile/%%GUILE_VER%%/libguile/vm.h
 include/guile/%%GUILE_VER%%/libguile/vports.h
-include/guile/%%GUILE_VER%%/libguile/weaks.h
+include/guile/%%GUILE_VER%%/libguile/weak-set.h
+include/guile/%%GUILE_VER%%/libguile/weak-table.h
+include/guile/%%GUILE_VER%%/libguile/weak-vector.h
 include/guile/%%GUILE_VER%%/readline.h
 lib/guile/%%GUILE_VER%%/ccache/ice-9/and-let-star.go
+lib/guile/%%GUILE_VER%%/ccache/ice-9/arrays.go
+lib/guile/%%GUILE_VER%%/ccache/ice-9/atomic.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/binary-ports.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/boot-9.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/buffered-input.go
@@ -141,6 +146,7 @@ lib/guile/%%GUILE_VER%%/ccache/ice-9/documentation.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/eval-string.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/eval.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/expect.go
+lib/guile/%%GUILE_VER%%/ccache/ice-9/fdes-finalizers.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/format.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/ftw.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/futures.go
@@ -161,14 +167,20 @@ lib/guile/%%GUILE_VER%%/ccache/ice-9/networking.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/null.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/occam-channel.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/optargs.go
+lib/guile/%%GUILE_VER%%/ccache/ice-9/peg.go
+lib/guile/%%GUILE_VER%%/ccache/ice-9/peg/cache.go
+lib/guile/%%GUILE_VER%%/ccache/ice-9/peg/codegen.go
+lib/guile/%%GUILE_VER%%/ccache/ice-9/peg/simplify-tree.go
+lib/guile/%%GUILE_VER%%/ccache/ice-9/peg/string-peg.go
+lib/guile/%%GUILE_VER%%/ccache/ice-9/peg/using-parsers.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/poe.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/poll.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/popen.go
+lib/guile/%%GUILE_VER%%/ccache/ice-9/ports.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/posix.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/pretty-print.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/psyntax-pp.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/q.go
-lib/guile/%%GUILE_VER%%/ccache/ice-9/r4rs.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/r5rs.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/rdelim.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/readline.go
@@ -178,6 +190,7 @@ lib/guile/%%GUILE_VER%%/ccache/ice-9/runq.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/rw.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/safe-r5rs.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/safe.go
+lib/guile/%%GUILE_VER%%/ccache/ice-9/sandbox.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/save-stack.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/scm-style-repl.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/serialize.go
@@ -186,23 +199,55 @@ lib/guile/%%GUILE_VER%%/ccache/ice-9/slib.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/stack-catch.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/streams.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/string-fun.go
+lib/guile/%%GUILE_VER%%/ccache/ice-9/suspendable-ports.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/syncase.go
+lib/guile/%%GUILE_VER%%/ccache/ice-9/textual-ports.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/threads.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/time.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/top-repl.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/unicode.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/vlist.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/weak-vector.go
-lib/guile/%%GUILE_VER%%/ccache/language/assembly.go
-lib/guile/%%GUILE_VER%%/ccache/language/assembly/compile-bytecode.go
-lib/guile/%%GUILE_VER%%/ccache/language/assembly/decompile-bytecode.go
-lib/guile/%%GUILE_VER%%/ccache/language/assembly/disassemble.go
-lib/guile/%%GUILE_VER%%/ccache/language/assembly/spec.go
 lib/guile/%%GUILE_VER%%/ccache/language/brainfuck/compile-scheme.go
 lib/guile/%%GUILE_VER%%/ccache/language/brainfuck/compile-tree-il.go
 lib/guile/%%GUILE_VER%%/ccache/language/brainfuck/parse.go
 lib/guile/%%GUILE_VER%%/ccache/language/brainfuck/spec.go
+lib/guile/%%GUILE_VER%%/ccache/language/bytecode.go
 lib/guile/%%GUILE_VER%%/ccache/language/bytecode/spec.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/closure-conversion.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/compile-bytecode.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/constructors.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/contification.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/cse.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/dce.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/effects-analysis.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/elide-values.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/handle-interrupts.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/intmap.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/intset.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/licm.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/optimize.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/peel-loops.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/primitives.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/prune-bailouts.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/prune-top-level-scopes.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/reify-primitives.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/renumber.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/rotate-loops.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/self-references.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/simplify.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/slot-allocation.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/spec.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/specialize-numbers.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/specialize-primcalls.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/split-rec.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/type-checks.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/type-fold.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/types.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/utils.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/verify.go
+lib/guile/%%GUILE_VER%%/ccache/language/cps/with-cps.go
 lib/guile/%%GUILE_VER%%/ccache/language/ecmascript/array.go
 lib/guile/%%GUILE_VER%%/ccache/language/ecmascript/base.go
 lib/guile/%%GUILE_VER%%/ccache/language/ecmascript/compile-tree-il.go
@@ -212,31 +257,25 @@ lib/guile/%%GUILE_VER%%/ccache/language/ecmascript/parse.go
 lib/guile/%%GUILE_VER%%/ccache/language/ecmascript/spec.go
 lib/guile/%%GUILE_VER%%/ccache/language/ecmascript/tokenize.go
 lib/guile/%%GUILE_VER%%/ccache/language/elisp/bindings.go
+lib/guile/%%GUILE_VER%%/ccache/language/elisp/boot.go
 lib/guile/%%GUILE_VER%%/ccache/language/elisp/compile-tree-il.go
+lib/guile/%%GUILE_VER%%/ccache/language/elisp/falias.go
 lib/guile/%%GUILE_VER%%/ccache/language/elisp/lexer.go
 lib/guile/%%GUILE_VER%%/ccache/language/elisp/parser.go
 lib/guile/%%GUILE_VER%%/ccache/language/elisp/runtime.go
 lib/guile/%%GUILE_VER%%/ccache/language/elisp/runtime/function-slot.go
-lib/guile/%%GUILE_VER%%/ccache/language/elisp/runtime/macros.go
-lib/guile/%%GUILE_VER%%/ccache/language/elisp/runtime/subrs.go
 lib/guile/%%GUILE_VER%%/ccache/language/elisp/runtime/value-slot.go
 lib/guile/%%GUILE_VER%%/ccache/language/elisp/spec.go
-lib/guile/%%GUILE_VER%%/ccache/language/glil.go
-lib/guile/%%GUILE_VER%%/ccache/language/glil/compile-assembly.go
-lib/guile/%%GUILE_VER%%/ccache/language/glil/spec.go
-lib/guile/%%GUILE_VER%%/ccache/language/objcode/spec.go
 lib/guile/%%GUILE_VER%%/ccache/language/scheme/compile-tree-il.go
 lib/guile/%%GUILE_VER%%/ccache/language/scheme/decompile-tree-il.go
 lib/guile/%%GUILE_VER%%/ccache/language/scheme/spec.go
 lib/guile/%%GUILE_VER%%/ccache/language/tree-il.go
 lib/guile/%%GUILE_VER%%/ccache/language/tree-il/analyze.go
 lib/guile/%%GUILE_VER%%/ccache/language/tree-il/canonicalize.go
-lib/guile/%%GUILE_VER%%/ccache/language/tree-il/compile-glil.go
-lib/guile/%%GUILE_VER%%/ccache/language/tree-il/cse.go
+lib/guile/%%GUILE_VER%%/ccache/language/tree-il/compile-cps.go
 lib/guile/%%GUILE_VER%%/ccache/language/tree-il/debug.go
 lib/guile/%%GUILE_VER%%/ccache/language/tree-il/effects.go
 lib/guile/%%GUILE_VER%%/ccache/language/tree-il/fix-letrec.go
-lib/guile/%%GUILE_VER%%/ccache/language/tree-il/inline.go
 lib/guile/%%GUILE_VER%%/ccache/language/tree-il/optimize.go
 lib/guile/%%GUILE_VER%%/ccache/language/tree-il/peval.go
 lib/guile/%%GUILE_VER%%/ccache/language/tree-il/primitives.go
@@ -245,15 +284,12 @@ lib/guile/%%GUILE_VER%%/ccache/language/value/spec.go
 lib/guile/%%GUILE_VER%%/ccache/oop/goops.go
 lib/guile/%%GUILE_VER%%/ccache/oop/goops/accessors.go
 lib/guile/%%GUILE_VER%%/ccache/oop/goops/active-slot.go
-lib/guile/%%GUILE_VER%%/ccache/oop/goops/compile.go
 lib/guile/%%GUILE_VER%%/ccache/oop/goops/composite-slot.go
 lib/guile/%%GUILE_VER%%/ccache/oop/goops/describe.go
-lib/guile/%%GUILE_VER%%/ccache/oop/goops/dispatch.go
 lib/guile/%%GUILE_VER%%/ccache/oop/goops/internal.go
 lib/guile/%%GUILE_VER%%/ccache/oop/goops/save.go
 lib/guile/%%GUILE_VER%%/ccache/oop/goops/simple.go
 lib/guile/%%GUILE_VER%%/ccache/oop/goops/stklos.go
-lib/guile/%%GUILE_VER%%/ccache/oop/goops/util.go
 lib/guile/%%GUILE_VER%%/ccache/rnrs.go
 lib/guile/%%GUILE_VER%%/ccache/rnrs/arithmetic/bitwise.go
 lib/guile/%%GUILE_VER%%/ccache/rnrs/arithmetic/fixnums.go
@@ -331,6 +367,7 @@ lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-60.go
 lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-64.go
 lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-67.go
 lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-69.go
+lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-71.go
 lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-8.go
 lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-88.go
 lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-9.go
@@ -354,6 +391,7 @@ lib/guile/%%GUILE_VER%%/ccache/system/base/pmatch.go
 lib/guile/%%GUILE_VER%%/ccache/system/base/syntax.go
 lib/guile/%%GUILE_VER%%/ccache/system/base/target.go
 lib/guile/%%GUILE_VER%%/ccache/system/base/types.go
+lib/guile/%%GUILE_VER%%/ccache/system/foreign-object.go
 lib/guile/%%GUILE_VER%%/ccache/system/foreign.go
 lib/guile/%%GUILE_VER%%/ccache/system/repl/command.go
 lib/guile/%%GUILE_VER%%/ccache/system/repl/common.go
@@ -362,11 +400,17 @@ lib/guile/%%GUILE_VER%%/ccache/system/repl/debug.go
 lib/guile/%%GUILE_VER%%/ccache/system/repl/error-handling.go
 lib/guile/%%GUILE_VER%%/ccache/system/repl/repl.go
 lib/guile/%%GUILE_VER%%/ccache/system/repl/server.go
+lib/guile/%%GUILE_VER%%/ccache/system/syntax.go
+lib/guile/%%GUILE_VER%%/ccache/system/vm/assembler.go
 lib/guile/%%GUILE_VER%%/ccache/system/vm/coverage.go
+lib/guile/%%GUILE_VER%%/ccache/system/vm/debug.go
+lib/guile/%%GUILE_VER%%/ccache/system/vm/disassembler.go
+lib/guile/%%GUILE_VER%%/ccache/system/vm/dwarf.go
+lib/guile/%%GUILE_VER%%/ccache/system/vm/elf.go
 lib/guile/%%GUILE_VER%%/ccache/system/vm/frame.go
 lib/guile/%%GUILE_VER%%/ccache/system/vm/inspect.go
-lib/guile/%%GUILE_VER%%/ccache/system/vm/instruction.go
-lib/guile/%%GUILE_VER%%/ccache/system/vm/objcode.go
+lib/guile/%%GUILE_VER%%/ccache/system/vm/linker.go
+lib/guile/%%GUILE_VER%%/ccache/system/vm/loader.go
 lib/guile/%%GUILE_VER%%/ccache/system/vm/program.go
 lib/guile/%%GUILE_VER%%/ccache/system/vm/trace.go
 lib/guile/%%GUILE_VER%%/ccache/system/vm/trap-state.go
@@ -388,20 +432,22 @@ lib/guile/%%GUILE_VER%%/ccache/web/response.go
 lib/guile/%%GUILE_VER%%/ccache/web/server.go
 lib/guile/%%GUILE_VER%%/ccache/web/server/http.go
 lib/guile/%%GUILE_VER%%/ccache/web/uri.go
+lib/guile/%%GUILE_VER%%/extensions/guile-readline.a
+lib/guile/%%GUILE_VER%%/extensions/guile-readline.so
+lib/guile/%%GUILE_VER%%/extensions/guile-readline.so.0
+lib/guile/%%GUILE_VER%%/extensions/guile-readline.so.0.0.0
 lib/libguile-%%GUILE_VER%%.a
 lib/libguile-%%GUILE_VER%%.so
-lib/libguile-%%GUILE_VER%%.so.22
-lib/libguile-%%GUILE_VER%%.so.22.8.1
-lib/libguile-%%GUILE_VER%%.so.22.8.1-gdb.scm
-lib/libguilereadline-v-18.a
-lib/libguilereadline-v-18.so
-lib/libguilereadline-v-18.so.18
-lib/libguilereadline-v-18.so.18.0.0
+lib/libguile-%%GUILE_VER%%.so.1
+lib/libguile-%%GUILE_VER%%.so.1.4.0
+lib/libguile-%%GUILE_VER%%.so.1.4.0-gdb.scm
 libdata/pkgconfig/guile-%%GUILE_VER%%.pc
 man/man1/guile.1.gz
 share/aclocal/guile.m4
 %%DATADIR%%/%%GUILE_VER%%/guile-procedures.txt
 %%DATADIR%%/%%GUILE_VER%%/ice-9/and-let-star.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/arrays.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/atomic.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/binary-ports.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/boot-9.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/buffered-input.scm
@@ -417,6 +463,7 @@ share/aclocal/guile.m4
 %%DATADIR%%/%%GUILE_VER%%/ice-9/eval-string.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/eval.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/expect.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/fdes-finalizers.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/format.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/ftw.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/futures.scm
@@ -438,16 +485,22 @@ share/aclocal/guile.m4
 %%DATADIR%%/%%GUILE_VER%%/ice-9/null.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/occam-channel.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/optargs.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/peg.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/peg/cache.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/peg/codegen.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/peg/simplify-tree.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/peg/string-peg.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/peg/using-parsers.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/poe.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/poll.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/popen.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/ports.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/posix.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/pretty-print.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/psyntax-pp.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/psyntax.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/q.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/quasisyntax.scm
-%%DATADIR%%/%%GUILE_VER%%/ice-9/r4rs.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/r5rs.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/r6rs-libraries.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/rdelim.scm
@@ -458,6 +511,7 @@ share/aclocal/guile.m4
 %%DATADIR%%/%%GUILE_VER%%/ice-9/rw.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/safe-r5rs.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/safe.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/sandbox.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/save-stack.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/scm-style-repl.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/serialize.scm
@@ -466,23 +520,55 @@ share/aclocal/guile.m4
 %%DATADIR%%/%%GUILE_VER%%/ice-9/stack-catch.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/streams.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/string-fun.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/suspendable-ports.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/syncase.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/textual-ports.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/threads.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/time.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/top-repl.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/unicode.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/vlist.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/weak-vector.scm
-%%DATADIR%%/%%GUILE_VER%%/language/assembly.scm
-%%DATADIR%%/%%GUILE_VER%%/language/assembly/compile-bytecode.scm
-%%DATADIR%%/%%GUILE_VER%%/language/assembly/decompile-bytecode.scm
-%%DATADIR%%/%%GUILE_VER%%/language/assembly/disassemble.scm
-%%DATADIR%%/%%GUILE_VER%%/language/assembly/spec.scm
 %%DATADIR%%/%%GUILE_VER%%/language/brainfuck/compile-scheme.scm
 %%DATADIR%%/%%GUILE_VER%%/language/brainfuck/compile-tree-il.scm
 %%DATADIR%%/%%GUILE_VER%%/language/brainfuck/parse.scm
 %%DATADIR%%/%%GUILE_VER%%/language/brainfuck/spec.scm
+%%DATADIR%%/%%GUILE_VER%%/language/bytecode.scm
 %%DATADIR%%/%%GUILE_VER%%/language/bytecode/spec.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/closure-conversion.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/compile-bytecode.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/constructors.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/contification.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/cse.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/dce.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/effects-analysis.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/elide-values.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/handle-interrupts.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/intmap.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/intset.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/licm.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/optimize.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/peel-loops.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/primitives.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/prune-bailouts.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/prune-top-level-scopes.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/reify-primitives.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/renumber.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/rotate-loops.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/self-references.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/simplify.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/slot-allocation.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/spec.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/specialize-numbers.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/specialize-primcalls.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/split-rec.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/type-checks.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/type-fold.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/types.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/utils.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/verify.scm
+%%DATADIR%%/%%GUILE_VER%%/language/cps/with-cps.scm
 %%DATADIR%%/%%GUILE_VER%%/language/ecmascript/array.scm
 %%DATADIR%%/%%GUILE_VER%%/language/ecmascript/base.scm
 %%DATADIR%%/%%GUILE_VER%%/language/ecmascript/compile-tree-il.scm
@@ -492,31 +578,25 @@ share/aclocal/guile.m4
 %%DATADIR%%/%%GUILE_VER%%/language/ecmascript/spec.scm
 %%DATADIR%%/%%GUILE_VER%%/language/ecmascript/tokenize.scm
 %%DATADIR%%/%%GUILE_VER%%/language/elisp/bindings.scm
+%%DATADIR%%/%%GUILE_VER%%/language/elisp/boot.el
 %%DATADIR%%/%%GUILE_VER%%/language/elisp/compile-tree-il.scm
+%%DATADIR%%/%%GUILE_VER%%/language/elisp/falias.scm
 %%DATADIR%%/%%GUILE_VER%%/language/elisp/lexer.scm
 %%DATADIR%%/%%GUILE_VER%%/language/elisp/parser.scm
 %%DATADIR%%/%%GUILE_VER%%/language/elisp/runtime.scm
 %%DATADIR%%/%%GUILE_VER%%/language/elisp/runtime/function-slot.scm
-%%DATADIR%%/%%GUILE_VER%%/language/elisp/runtime/macros.scm
-%%DATADIR%%/%%GUILE_VER%%/language/elisp/runtime/subrs.scm
 %%DATADIR%%/%%GUILE_VER%%/language/elisp/runtime/value-slot.scm
 %%DATADIR%%/%%GUILE_VER%%/language/elisp/spec.scm
-%%DATADIR%%/%%GUILE_VER%%/language/glil.scm
-%%DATADIR%%/%%GUILE_VER%%/language/glil/compile-assembly.scm
-%%DATADIR%%/%%GUILE_VER%%/language/glil/spec.scm
-%%DATADIR%%/%%GUILE_VER%%/language/objcode/spec.scm
 %%DATADIR%%/%%GUILE_VER%%/language/scheme/compile-tree-il.scm
 %%DATADIR%%/%%GUILE_VER%%/language/scheme/decompile-tree-il.scm
 %%DATADIR%%/%%GUILE_VER%%/language/scheme/spec.scm
 %%DATADIR%%/%%GUILE_VER%%/language/tree-il.scm
 %%DATADIR%%/%%GUILE_VER%%/language/tree-il/analyze.scm
 %%DATADIR%%/%%GUILE_VER%%/language/tree-il/canonicalize.scm
-%%DATADIR%%/%%GUILE_VER%%/language/tree-il/compile-glil.scm
-%%DATADIR%%/%%GUILE_VER%%/language/tree-il/cse.scm
+%%DATADIR%%/%%GUILE_VER%%/language/tree-il/compile-cps.scm
 %%DATADIR%%/%%GUILE_VER%%/language/tree-il/debug.scm
 %%DATADIR%%/%%GUILE_VER%%/language/tree-il/effects.scm
 %%DATADIR%%/%%GUILE_VER%%/language/tree-il/fix-letrec.scm
-%%DATADIR%%/%%GUILE_VER%%/language/tree-il/inline.scm
 %%DATADIR%%/%%GUILE_VER%%/language/tree-il/optimize.scm
 %%DATADIR%%/%%GUILE_VER%%/language/tree-il/peval.scm
 %%DATADIR%%/%%GUILE_VER%%/language/tree-il/primitives.scm
@@ -525,15 +605,12 @@ share/aclocal/guile.m4
 %%DATADIR%%/%%GUILE_VER%%/oop/goops.scm
 %%DATADIR%%/%%GUILE_VER%%/oop/goops/accessors.scm
 %%DATADIR%%/%%GUILE_VER%%/oop/goops/active-slot.scm
-%%DATADIR%%/%%GUILE_VER%%/oop/goops/compile.scm
 %%DATADIR%%/%%GUILE_VER%%/oop/goops/composite-slot.scm
 %%DATADIR%%/%%GUILE_VER%%/oop/goops/describe.scm
-%%DATADIR%%/%%GUILE_VER%%/oop/goops/dispatch.scm
 %%DATADIR%%/%%GUILE_VER%%/oop/goops/internal.scm
 %%DATADIR%%/%%GUILE_VER%%/oop/goops/save.scm
 %%DATADIR%%/%%GUILE_VER%%/oop/goops/simple.scm
 %%DATADIR%%/%%GUILE_VER%%/oop/goops/stklos.scm
-%%DATADIR%%/%%GUILE_VER%%/oop/goops/util.scm
 %%DATADIR%%/%%GUILE_VER%%/rnrs.scm
 %%DATADIR%%/%%GUILE_VER%%/rnrs/arithmetic/bitwise.scm
 %%DATADIR%%/%%GUILE_VER%%/rnrs/arithmetic/fixnums.scm
@@ -614,6 +691,7 @@ share/aclocal/guile.m4
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-67.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-67/compare.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-69.scm
+%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-71.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-8.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-88.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-9.scm
@@ -644,6 +722,7 @@ share/aclocal/guile.m4
 %%DATADIR%%/%%GUILE_VER%%/system/base/syntax.scm
 %%DATADIR%%/%%GUILE_VER%%/system/base/target.scm
 %%DATADIR%%/%%GUILE_VER%%/system/base/types.scm
+%%DATADIR%%/%%GUILE_VER%%/system/foreign-object.scm
 %%DATADIR%%/%%GUILE_VER%%/system/foreign.scm
 %%DATADIR%%/%%GUILE_VER%%/system/repl/command.scm
 %%DATADIR%%/%%GUILE_VER%%/system/repl/common.scm
@@ -653,11 +732,17 @@ share/aclocal/guile.m4
 %%DATADIR%%/%%GUILE_VER%%/system/repl/error-handling.scm
 %%DATADIR%%/%%GUILE_VER%%/system/repl/repl.scm
 %%DATADIR%%/%%GUILE_VER%%/system/repl/server.scm
+%%DATADIR%%/%%GUILE_VER%%/system/syntax.scm
+%%DATADIR%%/%%GUILE_VER%%/system/vm/assembler.scm
 %%DATADIR%%/%%GUILE_VER%%/system/vm/coverage.scm
+%%DATADIR%%/%%GUILE_VER%%/system/vm/debug.scm
+%%DATADIR%%/%%GUILE_VER%%/system/vm/disassembler.scm
+%%DATADIR%%/%%GUILE_VER%%/system/vm/dwarf.scm
+%%DATADIR%%/%%GUILE_VER%%/system/vm/elf.scm
 %%DATADIR%%/%%GUILE_VER%%/system/vm/frame.scm
 %%DATADIR%%/%%GUILE_VER%%/system/vm/inspect.scm
-%%DATADIR%%/%%GUILE_VER%%/system/vm/instruction.scm
-%%DATADIR%%/%%GUILE_VER%%/system/vm/objcode.scm
+%%DATADIR%%/%%GUILE_VER%%/system/vm/linker.scm
+%%DATADIR%%/%%GUILE_VER%%/system/vm/loader.scm
 %%DATADIR%%/%%GUILE_VER%%/system/vm/program.scm
 %%DATADIR%%/%%GUILE_VER%%/system/vm/trace.scm
 %%DATADIR%%/%%GUILE_VER%%/system/vm/trap-state.scm
diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile
index b234451353ee..7a3247ee2a60 100644
--- a/lang/mdk/Makefile
+++ b/lang/mdk/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mdk
 PORTVERSION=	1.2.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang gnome
 MASTER_SITES=	GNU/${PORTNAME}/v${PORTVERSION}
 
@@ -29,7 +29,7 @@ GLADE_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 GLADE_USE=		GNOME=cairo,gdkpixbuf2,libglade2
 
 GUILE_CONFIGURE_WITH=	guile
-GUILE_LIB_DEPENDS=	libguile-2.0.so:lang/guile2 \
+GUILE_LIB_DEPENDS=	libguile-2.2.so:lang/guile2 \
 			libgc-threaded.so:devel/boehm-gc-threaded
 
 NLS_CONFIGURE_ENABLE=	nls
diff --git a/lang/slib-guile2/Makefile b/lang/slib-guile2/Makefile
index 85dfdce69d80..71252d9505e1 100644
--- a/lang/slib-guile2/Makefile
+++ b/lang/slib-guile2/Makefile
@@ -1,9 +1,9 @@
 # Created by: Kimura Fuyuki <fuyuki@nigredo.org>
 # $FreeBSD$
-#    $MCom: ports/lang/slib-guile/Makefile,v 1.3 2006/10/13 02:32:48 marcus Exp $
 
 PORTNAME=	slib
 PORTVERSION=	3b4 # Keep this in sync with lang/slib
+PORTREVISION=	1
 CATEGORIES=	lang scheme
 MASTER_SITES=	# empty
 PKGNAMESUFFIX=	-guile2