18 files changed, 247 insertions, 214 deletions

diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 1e7e72650b18..87bea1853baa 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -6,16 +6,15 @@
 #    $MCom: ports/lang/guile/Makefile,v 1.1 2006/09/12 14:57:06 ahze Exp $
 
 PORTNAME=	guile
-PORTVERSION=	1.6.8
-PORTREVISION=	3
+PORTVERSION=	1.8.4
 CATEGORIES=	lang scheme
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	guile
 
-MAINTAINER=	gnome@FreeBSD.org
+MAINTAINER=	amatus@gnu.org
 COMMENT=	GNU Ubiquitous Intelligent Language for Extension
 
-USE_AUTOTOOLS=	libltdl:15
+USE_AUTOTOOLS=	autoconf:261 libltdl:15
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -23,7 +22,7 @@ USE_GNOME=	gnometarget
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-GUILE_VER=	1.6
+GUILE_VER=	1.8
 PLIST_SUB=	GUILE_VER=${GUILE_VER}
 
 REINPLACE_FILES=	libguile/gc.c libguile/mallocs.c \
@@ -33,17 +32,6 @@ INFO=		goops guile-tut guile r5rs
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "ia64" && ${ARCH} != "amd64" && ${ARCH} != "powerpc"
-CONFIGURE_ARGS+=--with-threads
-PLIST_SUB+=	THREADS:=""
-.else
-PLIST_SUB+=	THREADS:="@comment "
-.endif
-
-.if ${ARCH} == "ia64"
-EXTRA_PATCHES=  ${FILESDIR}/extra-patch-ia64
-.endif
-
 post-extract:
 	cd ${WRKSRC}; ${CHMOD} u+w ${REINPLACE_FILES}
 	@${FIND} ${WRKSRC}/doc -name "*.info*" -delete
diff --git a/lang/guile/distinfo b/lang/guile/distinfo
index 35e18a0bd089..c999247e6657 100644
--- a/lang/guile/distinfo
+++ b/lang/guile/distinfo
@@ -1,3 +1,3 @@
-MD5 (guile-1.6.8.tar.gz) = 2756b01f428b910d33267aeaa0e2d59a
-SHA256 (guile-1.6.8.tar.gz) = 3d4ab874f90f5c2003229be29488ba2aa6fe1f0317774283360530d5d9236011
-SIZE (guile-1.6.8.tar.gz) = 3114052
+MD5 (guile-1.8.4.tar.gz) = aacc6a384af88a85574717a9221f5c6e
+SHA256 (guile-1.8.4.tar.gz) = ca03762565291708b6fbcda4224570e59889795651d3bbb5a380ff6d2c69e1b3
+SIZE (guile-1.8.4.tar.gz) = 3821388
diff --git a/lang/guile/files/extra-patch-ia64 b/lang/guile/files/extra-patch-ia64
deleted file mode 100644
index 87035da6dcfe..000000000000
--- a/lang/guile/files/extra-patch-ia64
+++ /dev/null
@@ -1,94 +0,0 @@
---- libguile/continuations.c.orig	Fri Sep 12 18:58:00 2003
-+++ libguile/continuations.c	Wed Nov 24 07:50:54 2004
-@@ -114,15 +114,6 @@
-   return 1;
- }
- 
--#ifdef __ia64__
--struct rv
--{
--  long retval;
--  long first_return;
--};
--extern struct rv ia64_getcontext (ucontext_t *) __asm__ ("getcontext");
--#endif /* __ia64__ */
--
- /* this may return more than once: the first time with the escape
-    procedure, then subsequently with the value to be passed to the
-    continuation.  */
-@@ -135,9 +126,6 @@
-   scm_t_contregs *rootcont = SCM_CONTREGS (scm_rootcont);
-   long stack_size;
-   SCM_STACKITEM * src;
--#ifdef __ia64__
--  struct rv rv;
--#endif
- 
-   SCM_ENTER_A_SECTION;
-   SCM_FLUSH_REGISTER_WINDOWS;
-@@ -162,17 +150,15 @@
-   memcpy (continuation->stack, src, sizeof (SCM_STACKITEM) * stack_size);
- 
- #ifdef __ia64__
--  rv = ia64_getcontext (&continuation->ctx);
--  if (rv.first_return)
-+  continuation->backing_store = NULL;
-+  getcontext(&continuation->ctx);
-+  if (continuation->backing_store == NULL)
-     {
-       continuation->backing_store_size = 
--        continuation->ctx.uc_mcontext.sc_ar_bsp - 
--        __libc_ia64_register_backing_store_base;
--      continuation->backing_store = NULL;
-+        continuation->ctx.uc_mcontext.mc_special.bspstore - (4UL << 61);
-       continuation->backing_store = 
-         scm_must_malloc (continuation->backing_store_size, FUNC_NAME);
--      memcpy (continuation->backing_store, 
--              (void *) __libc_ia64_register_backing_store_base, 
-+      memcpy (continuation->backing_store, (void *)(4UL << 61),
-               continuation->backing_store_size);
-       *first = 1;
-       return cont;
-@@ -235,8 +221,7 @@
- 
-   continuation->throw_value = val;
- #ifdef __ia64__
--  memcpy ((void *) __libc_ia64_register_backing_store_base,
--          continuation->backing_store,
-+  memcpy ((void *)(4UL << 61), continuation->backing_store,
-           continuation->backing_store_size);
-   setcontext (&continuation->ctx);
- #else
---- libguile/gc.c.orig	Wed Nov 24 07:41:44 2004
-+++ libguile/gc.c	Wed Nov 24 07:53:51 2004
-@@ -1041,8 +1041,8 @@
-     scm_mark_locations ((SCM_STACKITEM *) &ctx.uc_mcontext,           \
-       ((size_t) (sizeof (SCM_STACKITEM) - 1 + sizeof ctx.uc_mcontext) \
-        / sizeof (SCM_STACKITEM)));                                    \
--    bot = (SCM_STACKITEM *) __libc_ia64_register_backing_store_base;  \
--    top = (SCM_STACKITEM *) ctx.uc_mcontext.sc_ar_bsp;                \
-+    bot = (SCM_STACKITEM *) (4UL << 61);                              \
-+    top = (SCM_STACKITEM *) ctx.uc_mcontext.mc_special.bspstore;      \
-     scm_mark_locations (bot, top - bot); } while (0)
- #else
- # define SCM_MARK_BACKING_STORE()
---- libguile/init.c.orig	Sun Sep  5 23:05:37 2004
-+++ libguile/init.c	Wed Nov 24 07:59:48 2004
-@@ -188,6 +188,7 @@
-   {
-     scm_t_contregs *contregs = scm_must_malloc (sizeof (scm_t_contregs),
- 					      "continuation");
-+    memset(contregs, 0, sizeof(*contregs));
-     contregs->num_stack_items = 0;
-     contregs->seq = 0;
-     SCM_NEWSMOB (scm_rootcont, scm_tc16_continuation, contregs);
---- libguile/root.c.orig	Sat Dec  7 22:41:32 2002
-+++ libguile/root.c	Wed Nov 24 08:00:14 2004
-@@ -254,6 +254,7 @@
-       scm_t_contregs *contregs = scm_must_malloc (sizeof (scm_t_contregs),
- 						"inferior root continuation");
- 
-+      memset(contregs, 0, sizeof(*contregs));
-       contregs->num_stack_items = 0;
-       contregs->dynenv = SCM_EOL;
-       contregs->base = stack_start;
diff --git a/lang/guile/files/patch-ag b/lang/guile/files/patch-ag
deleted file mode 100644
index dd895e731912..000000000000
--- a/lang/guile/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- qt/Makefile.in.orig	Mon Apr 24 14:53:57 2000
-+++ qt/Makefile.in	Mon Apr 24 14:54:33 2000
-@@ -407,7 +407,7 @@
- 
- 
- .s.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) $(qthread_asflags) -c $<
-+	$(LIBTOOL) --mode=compile $(CC) $(qthread_asflags) -c $<
- qtmds.s:
- 	${LN_S} ${srcdir}/${qtmds_s} qtmds.s
- qtmdc.c:
diff --git a/lang/guile/files/patch-config.h.in b/lang/guile/files/patch-config.h.in
new file mode 100644
index 000000000000..13db93fae797
--- /dev/null
+++ b/lang/guile/files/patch-config.h.in
@@ -0,0 +1,18 @@
+--- config.h.in	2008-02-16 16:12:15.000000000 -0600
++++ config.h.in	2008-02-27 10:33:27.327021569 -0600
+@@ -432,9 +432,15 @@
+ /* Define to 1 if you have the `pthread_get_stackaddr_np' function. */
+ #undef HAVE_PTHREAD_GET_STACKADDR_NP
+ 
++/* Define to 1 if you have the `pthread_attr_get_np' function. */
++#undef HAVE_PTHREAD_ATTR_GET_NP
++
+ /* Define to 1 if you have the <pthread.h> header file. */
+ #undef HAVE_PTHREAD_H
+ 
++/* Define to 1 if you have the <pthread_np.h> header file. */
++#undef HAVE_PTHREAD_NP_H
++
+ /* Define to 1 if you have the `pthread_sigmask' function. */
+ #undef HAVE_PTHREAD_SIGMASK
+ 
diff --git a/lang/guile/files/patch-configure b/lang/guile/files/patch-configure
deleted file mode 100644
index 1dc6342488f7..000000000000
--- a/lang/guile/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	Fri May 26 19:32:18 2006
-+++ configure	Sun Dec 17 14:27:45 2006
-@@ -21187,6 +21187,9 @@
-     # If you are looking for one http://www.opendarwin.org/projects/dlcompat
-     libltdl_cv_sys_dlopen_deplibs=yes
-     ;;
-+  freebsd*)
-+    libltdl_cv_sys_dlopen_deplibs=yes
-+    ;;
-   gnu* | linux* | k*bsd*-gnu)
-     # GNU and its variants, using gnu ld.so (Glibc)
-     libltdl_cv_sys_dlopen_deplibs=yes
-@@ -30498,6 +30501,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <sys/types.h>
- #include <sys/socket.h>
- 
- int
diff --git a/lang/guile/files/patch-configure.in b/lang/guile/files/patch-configure.in
new file mode 100644
index 000000000000..f3ad80b8a6a9
--- /dev/null
+++ b/lang/guile/files/patch-configure.in
@@ -0,0 +1,28 @@
+--- configure.in	2008-02-16 17:15:18.000000000 -0600
++++ configure.in	2008-02-27 10:32:56.298707356 -0600
+@@ -692,10 +692,11 @@
+ #   sys/param.h - not in mingw
+ #   pthread.h - only available with pthreads.  ACX_PTHREAD doesn't
+ #       check this specifically, we need it for the timespec test below.
++#   pthread_np.h - available on FreeBSD
+ #   sethostname - the function itself check because it's not in mingw,
+ #       the DECL is checked because Solaris 10 doens't have in any header
+ #
+-AC_CHECK_HEADERS(crypt.h netdb.h pthread.h sys/param.h sys/resource.h sys/file.h)
++AC_CHECK_HEADERS(crypt.h netdb.h pthread.h pthread_np.h sys/param.h sys/resource.h sys/file.h)
+ AC_CHECK_FUNCS(chroot flock getlogin cuserid getpriority setpriority getpass sethostname gethostname)
+ AC_CHECK_DECLS([sethostname])
+ 
+@@ -1185,9 +1186,11 @@
+     #         all; not present on MacOS X or Solaris 10
+     #     pthread_get_stackaddr_np - "np" meaning "non portable" says it
+     #         all; specific to MacOS X
++    #     pthread_attr_get_np - "np" meaning "non portable" says it
++    #         all; specific to FreeBSD
+     #     pthread_sigmask - not available on mingw
+     #
+-    AC_CHECK_FUNCS(pthread_attr_getstack pthread_getattr_np pthread_get_stackaddr_np pthread_sigmask)
++    AC_CHECK_FUNCS(pthread_attr_getstack pthread_getattr_np pthread_get_stackaddr_np pthread_attr_get_np pthread_sigmask)
+ 
+     # On past versions of Solaris, believe 8 through 10 at least, you
+     # had to write "pthread_once_t foo = { PTHREAD_ONCE_INIT };".
diff --git a/lang/guile/files/patch-libguile___scm.h b/lang/guile/files/patch-libguile___scm.h
index 8004b8b79e64..cb3cdee83e61 100644
--- a/lang/guile/files/patch-libguile___scm.h
+++ b/lang/guile/files/patch-libguile___scm.h
@@ -1,7 +1,7 @@
---- libguile/__scm.h.orig	Sat Apr 12 14:16:08 2003
-+++ libguile/__scm.h	Sun Jun  1 16:32:36 2003
-@@ -354,7 +354,8 @@
-  * that all the state of the process is contained in the stack. 
+--- libguile/__scm.h	2008-02-23 18:14:28.106264450 -0600
++++ libguile/__scm.h	2008-02-23 18:15:41.306005478 -0600
+@@ -411,7 +411,8 @@
+  * that all the state of the process is contained in the stack.
   */
  
 -#if defined (sparc) || defined (__sparc__) || defined (__sparc)
diff --git a/lang/guile/files/patch-libguile_eval.c b/lang/guile/files/patch-libguile_eval.c
new file mode 100644
index 000000000000..9a5e3c9b4940
--- /dev/null
+++ b/lang/guile/files/patch-libguile_eval.c
@@ -0,0 +1,11 @@
+--- libguile/eval.c	2008-02-23 18:14:28.083264040 -0600
++++ libguile/eval.c	2008-02-23 18:20:55.081183329 -0600
+@@ -40,6 +40,8 @@
+ /* This blob per the Autoconf manual (under "Particular Functions"). */
+ #if HAVE_ALLOCA_H
+ # include <alloca.h>
++#elif defined __FreeBSD__
++# include <stdlib.h>
+ #elif defined __GNUC__
+ # define alloca __builtin_alloca
+ #elif defined _AIX
diff --git a/lang/guile/files/patch-libguile_gc_os_dep.c b/lang/guile/files/patch-libguile_gc_os_dep.c
index ce9b7aa35c17..4368fdcab6cc 100644
--- a/lang/guile/files/patch-libguile_gc_os_dep.c
+++ b/lang/guile/files/patch-libguile_gc_os_dep.c
@@ -1,7 +1,7 @@
---- libguile/gc_os_dep.c.orig	Wed Apr 16 22:16:21 2003
-+++ libguile/gc_os_dep.c	Sun Sep 12 15:18:00 2004
-@@ -93,6 +93,14 @@
- #    define OPENBSD
+--- libguile/gc_os_dep.c	2008-02-23 18:14:28.087264270 -0600
++++ libguile/gc_os_dep.c	2008-02-23 18:22:25.194095724 -0600
+@@ -115,6 +115,14 @@
+ #    define NETBSD
  #    define mach_type_known
  # endif
 +# if defined(__FreeBSD__) && defined(__sparc__)
@@ -15,7 +15,7 @@
  # if defined(__NetBSD__) && defined(__powerpc__)
  #    define POWERPC
  #    define NETBSD
-@@ -225,7 +233,21 @@
+@@ -249,7 +257,21 @@
  #    define ARM32
  #    define mach_type_known
  # endif
@@ -36,9 +36,9 @@
 +#   define mach_type_known
 +# elif defined(__alpha) || defined(__alpha__)
  #   define ALPHA
- #   if !defined(LINUX)
+ #   if !defined(LINUX) && !defined (NETBSD)
  #     define OSF1	/* a.k.a Digital Unix */
-@@ -1125,6 +1147,13 @@
+@@ -1159,6 +1181,13 @@
  #   endif
  # endif
  
@@ -52,7 +52,7 @@
  # ifdef IA64
  #   define MACH_TYPE "IA64"
  #   define ALIGN_DOUBLE
-@@ -1468,7 +1497,7 @@
+@@ -1504,7 +1533,7 @@
  #   include <setjmp.h>
  #endif
  
@@ -61,7 +61,7 @@
  #  include <machine/trap.h>
  #endif
  
-@@ -1501,7 +1530,7 @@
+@@ -1537,7 +1566,7 @@
  #endif
  
  #ifdef SUNOS5SIGS
@@ -70,3 +70,4 @@
  # undef setjmp
  # undef longjmp
  # define setjmp(env) sigsetjmp(env, 1)
+Only in guile-1.8.4/libguile: gc_os_dep.c.orig
diff --git a/lang/guile/files/patch-libguile_gen-scmconfig.c b/lang/guile/files/patch-libguile_gen-scmconfig.c
new file mode 100644
index 000000000000..f2b35b8d5934
--- /dev/null
+++ b/lang/guile/files/patch-libguile_gen-scmconfig.c
@@ -0,0 +1,10 @@
+--- libguile/gen-scmconfig.c	2008-02-23 21:38:39.310330888 -0600
++++ libguile/gen-scmconfig.c	2008-02-23 21:39:32.909873567 -0600
+@@ -123,6 +123,7 @@
+ 
+ #include "gen-scmconfig.h"
+ 
++#define _ANSI_SOURCE
+ #include <stdio.h>
+ #include <string.h>
+ 
diff --git a/lang/guile/files/patch-libguile_load.c b/lang/guile/files/patch-libguile_load.c
deleted file mode 100644
index f5ce39667a23..000000000000
--- a/lang/guile/files/patch-libguile_load.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- libguile/load.c.orig	Sat Dec  7 17:41:32 2002
-+++ libguile/load.c	Wed Apr 30 22:55:23 2003
-@@ -247,9 +247,11 @@
-   SCM path = SCM_EOL;
- 
- #ifdef SCM_LIBRARY_DIR
--  path = scm_list_3 (scm_makfrom0str (SCM_SITE_DIR),
-+  path = scm_list_5 (scm_makfrom0str (SCM_SITE_DIR),
- 		     scm_makfrom0str (SCM_LIBRARY_DIR),
--		     scm_makfrom0str (SCM_PKGDATA_DIR));
-+		     scm_makfrom0str (SCM_PKGDATA_DIR),
-+		     scm_makfrom0str ("%%X11BASE%%/share/guile"),
-+		     scm_makfrom0str ("%%LOCALBASE%%/share/guile"));
- #endif /* SCM_LIBRARY_DIR */
- 
-   path = scm_internal_parse_path (getenv ("GUILE_LOAD_PATH"), path);
diff --git a/lang/guile/files/patch-libguile_numbers.c b/lang/guile/files/patch-libguile_numbers.c
new file mode 100644
index 000000000000..3a78b4a64c6e
--- /dev/null
+++ b/lang/guile/files/patch-libguile_numbers.c
@@ -0,0 +1,11 @@
+--- libguile/numbers.c	2008-02-23 15:41:35.231371691 -0600
++++ libguile/numbers.c	2008-02-23 15:44:52.401368437 -0600
+@@ -170,7 +170,7 @@
+ #endif
+ 
+ /* Convert a C "complex double" to an SCM value. */
+-#if HAVE_COMPLEX_DOUBLE
++#if HAVE_COMPLEX_DOUBLE && (HAVE_CLOG || HAVE_CLOG10 || HAVE_CEXP || HAVE_USABLE_CSQRT) && defined (SCM_COMPLEX_VALUE)
+ static SCM
+ scm_from_complex_double (complex double z)
+ {
diff --git a/lang/guile/files/patch-libguile_pthread-threads.h b/lang/guile/files/patch-libguile_pthread-threads.h
new file mode 100644
index 000000000000..42f5934bb506
--- /dev/null
+++ b/lang/guile/files/patch-libguile_pthread-threads.h
@@ -0,0 +1,12 @@
+--- libguile/pthread-threads.h	2008-02-27 10:31:41.564950412 -0600
++++ libguile/pthread-threads.h	2008-02-27 10:36:08.383652510 -0600
+@@ -26,6 +26,9 @@
+ */
+ 
+ #include <pthread.h>
++#if HAVE_PTHREAD_NP_H
++# include <pthread_np.h>
++#endif
+ #include <sched.h>
+ 
+ /* Threads 
diff --git a/lang/guile/files/patch-libguile_read.c b/lang/guile/files/patch-libguile_read.c
new file mode 100644
index 000000000000..57c71d63d21b
--- /dev/null
+++ b/lang/guile/files/patch-libguile_read.c
@@ -0,0 +1,11 @@
+--- libguile/read.c	2008-02-23 18:05:20.175715735 -0600
++++ libguile/read.c	2008-02-23 18:06:27.495397147 -0600
+@@ -27,7 +27,7 @@
+ #include <ctype.h>
+ #include <string.h>
+ #ifdef HAVE_STRINGS_H
+-# include <strings.h>
++# include "/usr/include/strings.h"
+ #endif
+ 
+ #include "libguile/_scm.h"
diff --git a/lang/guile/files/patch-libguile_threads.c b/lang/guile/files/patch-libguile_threads.c
new file mode 100644
index 000000000000..ad966b88392d
--- /dev/null
+++ b/lang/guile/files/patch-libguile_threads.c
@@ -0,0 +1,27 @@
+--- libguile/threads.c	2008-02-27 10:17:41.531443640 -0600
++++ libguile/threads.c	2008-02-27 10:25:44.309334685 -0600
+@@ -593,7 +593,7 @@
+ 
+ #if SCM_USE_PTHREAD_THREADS
+ 
+-#if HAVE_PTHREAD_ATTR_GETSTACK && HAVE_PTHREAD_GETATTR_NP
++#if HAVE_PTHREAD_ATTR_GETSTACK && (HAVE_PTHREAD_GETATTR_NP || HAVE_PTHREAD_ATTR_GET_NP)
+ /* This method for GNU/Linux and perhaps some other systems.
+    It's not for MacOS X or Solaris 10, since pthread_getattr_np is not
+    available on them.  */
+@@ -606,8 +606,15 @@
+   void *start, *end;
+   size_t size;
+ 
++#if HAVE_PTHREAD_ATTR_GET_NP
++  pthread_attr_init (&attr);
++  pthread_attr_get_np (pthread_self (), &attr);
++  pthread_attr_getstack (&attr, &start, &size);
++  pthread_attr_destroy (&attr);
++#elif HAVE_PTHREAD_GETATTR_NP
+   pthread_getattr_np (pthread_self (), &attr);
+   pthread_attr_getstack (&attr, &start, &size);
++#endif
+   end = (char *)start + size;
+ 
+   /* XXX - pthread_getattr_np from LinuxThreads does not seem to work
diff --git a/lang/guile/files/patch-srfi_srfi-4.c b/lang/guile/files/patch-srfi_srfi-4.c
deleted file mode 100644
index e4fb17f3e3d4..000000000000
--- a/lang/guile/files/patch-srfi_srfi-4.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- srfi/srfi-4.c.orig	Sat Nov 20 17:30:56 2004
-+++ srfi/srfi-4.c	Sat Nov 20 17:31:55 2004
-@@ -50,6 +50,10 @@
- #include <string.h>
- #include <stdio.h>
- 
-+#ifndef SIZE_MAX
-+#define SIZE_MAX ((size_t) (-1))
-+#endif
-+
- /* For brevity and maintainability, we define our own types for the
-    various integer and floating point types.  */
- typedef unsigned char int_u8;
diff --git a/lang/guile/pkg-plist b/lang/guile/pkg-plist
index 88bc9ffdc4ff..c47afc706e83 100644
--- a/lang/guile/pkg-plist
+++ b/lang/guile/pkg-plist
@@ -2,11 +2,13 @@ bin/guile
 bin/guile-config
 bin/guile-snarf
 bin/guile-tools
-include/guile-readline/readline.h
 include/guile/gh.h
+include/guile/readline.h
+include/guile/srfi/srfi-1.h
 include/guile/srfi/srfi-13.h
 include/guile/srfi/srfi-14.h
 include/guile/srfi/srfi-4.h
+include/guile/srfi/srfi-60.h
 include/libguile.h
 include/libguile/__scm.h
 include/libguile/alist.h
@@ -16,10 +18,12 @@ include/libguile/backtrace.h
 include/libguile/boolean.h
 include/libguile/chars.h
 include/libguile/continuations.h
-include/libguile/coop-defs.h
+include/libguile/convert.h
 include/libguile/debug-malloc.h
 include/libguile/debug.h
+include/libguile/deprecated.h
 include/libguile/deprecation.h
+include/libguile/discouraged.h
 include/libguile/dynl.h
 include/libguile/dynwind.h
 include/libguile/environments.h
@@ -32,6 +36,7 @@ include/libguile/feature.h
 include/libguile/filesys.h
 include/libguile/fluids.h
 include/libguile/fports.h
+include/libguile/futures.h
 include/libguile/gc.h
 include/libguile/gdb_interface.h
 include/libguile/gdbint.h
@@ -41,7 +46,9 @@ include/libguile/guardians.h
 include/libguile/hash.h
 include/libguile/hashtab.h
 include/libguile/hooks.h
+include/libguile/i18n.h
 include/libguile/init.h
+include/libguile/inline.h
 include/libguile/ioext.h
 include/libguile/iselect.h
 include/libguile/keywords.h
@@ -52,6 +59,7 @@ include/libguile/macros.h
 include/libguile/mallocs.h
 include/libguile/modules.h
 include/libguile/net_db.h
+include/libguile/null-threads.h
 include/libguile/numbers.h
 include/libguile/objects.h
 include/libguile/objprop.h
@@ -63,6 +71,7 @@ include/libguile/print.h
 include/libguile/procprop.h
 include/libguile/procs.h
 include/libguile/properties.h
+include/libguile/pthread-threads.h
 include/libguile/ramap.h
 include/libguile/random.h
 include/libguile/rdelim.h
@@ -79,11 +88,13 @@ include/libguile/snarf.h
 include/libguile/socket.h
 include/libguile/sort.h
 include/libguile/srcprop.h
+include/libguile/srfi-13.h
+include/libguile/srfi-14.h
+include/libguile/srfi-4.h
 include/libguile/stackchk.h
 include/libguile/stacks.h
 include/libguile/stime.h
 include/libguile/strings.h
-include/libguile/strop.h
 include/libguile/strorder.h
 include/libguile/strports.h
 include/libguile/struct.h
@@ -99,35 +110,33 @@ include/libguile/vectors.h
 include/libguile/version.h
 include/libguile/vports.h
 include/libguile/weaks.h
-lib/libguile-ltdl.a
-lib/libguile-ltdl.la
-lib/libguile-ltdl.so
-lib/libguile-ltdl.so.1
-lib/libguile-srfi-srfi-13-14-v-1.a
-lib/libguile-srfi-srfi-13-14-v-1.la
-lib/libguile-srfi-srfi-13-14-v-1.so
-lib/libguile-srfi-srfi-13-14-v-1.so.1
-lib/libguile-srfi-srfi-4-v-1.a
-lib/libguile-srfi-srfi-4-v-1.la
-lib/libguile-srfi-srfi-4-v-1.so
-lib/libguile-srfi-srfi-4-v-1.so.1
+lib/libguile-srfi-srfi-1-v-3.a
+lib/libguile-srfi-srfi-1-v-3.la
+lib/libguile-srfi-srfi-1-v-3.so
+lib/libguile-srfi-srfi-1-v-3.so.3
+lib/libguile-srfi-srfi-13-14-v-3.a
+lib/libguile-srfi-srfi-13-14-v-3.la
+lib/libguile-srfi-srfi-13-14-v-3.so
+lib/libguile-srfi-srfi-13-14-v-3.so.3
+lib/libguile-srfi-srfi-4-v-3.a
+lib/libguile-srfi-srfi-4-v-3.la
+lib/libguile-srfi-srfi-4-v-3.so
+lib/libguile-srfi-srfi-4-v-3.so.3
+lib/libguile-srfi-srfi-60-v-2.a
+lib/libguile-srfi-srfi-60-v-2.la
+lib/libguile-srfi-srfi-60-v-2.so
+lib/libguile-srfi-srfi-60-v-2.so.2
 lib/libguile.a
 lib/libguile.la
 lib/libguile.so
-lib/libguile.so.15
-lib/libguilereadline-v-12.a
-lib/libguilereadline-v-12.la
-lib/libguilereadline-v-12.so
-lib/libguilereadline-v-12.so.15
-%%THREADS:%%lib/libqthreads.a
-%%THREADS:%%lib/libqthreads.la
-%%THREADS:%%lib/libqthreads.so
-%%THREADS:%%lib/libqthreads.so.15
+lib/libguile.so.18
+lib/libguilereadline-v-17.a
+lib/libguilereadline-v-17.la
+lib/libguilereadline-v-17.so
+lib/libguilereadline-v-17.so.17
 share/aclocal/guile.m4
 %%DATADIR%%/%%GUILE_VER%%/guile-procedures.txt
-%%DATADIR%%/%%GUILE_VER%%/ice-9/and-let*.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/and-let-star.scm
-%%DATADIR%%/%%GUILE_VER%%/ice-9/arrays.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/boot-9.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/buffered-input.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/calling.scm
@@ -135,20 +144,29 @@ share/aclocal/guile.m4
 %%DATADIR%%/%%GUILE_VER%%/ice-9/common-list.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/debug.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/debugger.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/debugger/command-loop.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/debugger/commands.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/debugger/state.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/debugger/trc.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/debugger/utils.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/deprecated.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/documentation.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/emacs.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/expect.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/format.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/ftw.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/gap-buffer.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/getopt-long.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/hcons.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/history.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/lineio.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/list.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/ls.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/mapping.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/match.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/networking.scm
 %%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/poe.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/popen.scm
@@ -167,16 +185,52 @@ 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/serialize.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/session.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/slib.scm
-%%DATADIR%%/%%GUILE_VER%%/ice-9/slib-old.scm
 %%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/syncase.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/threads.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/time.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/weak-vector.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/base.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/example.el
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/interface.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals/evaluation.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals/format.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals/fset.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals/lambda.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals/load.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals/null.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals/set.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals/signal.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals/time.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals/trace.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/buffers.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/char-table.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/features.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/fns.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/format.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/guile.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/keymaps.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/lists.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/load.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/match.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/numbers.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/pure.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/read.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/signal.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/strings.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/symprop.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/syntax.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/system.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/time.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/transform.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/variables.scm
 %%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
@@ -185,9 +239,11 @@ share/aclocal/guile.m4
 %%DATADIR%%/%%GUILE_VER%%/oop/goops/internal.scm
 %%DATADIR%%/%%GUILE_VER%%/oop/goops/old-define-method.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%%/scripts/PROGRAM
+%%DATADIR%%/%%GUILE_VER%%/scripts/api-diff
 %%DATADIR%%/%%GUILE_VER%%/scripts/autofrisk
 %%DATADIR%%/%%GUILE_VER%%/scripts/display-commentary
 %%DATADIR%%/%%GUILE_VER%%/scripts/doc-snarf
@@ -195,9 +251,13 @@ share/aclocal/guile.m4
 %%DATADIR%%/%%GUILE_VER%%/scripts/generate-autoload
 %%DATADIR%%/%%GUILE_VER%%/scripts/lint
 %%DATADIR%%/%%GUILE_VER%%/scripts/punify
+%%DATADIR%%/%%GUILE_VER%%/scripts/read-rfc822
 %%DATADIR%%/%%GUILE_VER%%/scripts/read-scheme-source
+%%DATADIR%%/%%GUILE_VER%%/scripts/read-text-outline
+%%DATADIR%%/%%GUILE_VER%%/scripts/scan-api
 %%DATADIR%%/%%GUILE_VER%%/scripts/snarf-check-and-output-texi
 %%DATADIR%%/%%GUILE_VER%%/scripts/snarf-guile-m4-docs
+%%DATADIR%%/%%GUILE_VER%%/scripts/summarize-guile-TODO
 %%DATADIR%%/%%GUILE_VER%%/scripts/use2dot
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-1.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-10.scm
@@ -208,20 +268,30 @@ share/aclocal/guile.m4
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-17.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-19.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-2.scm
+%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-26.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-31.scm
+%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-34.scm
+%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-35.scm
+%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-37.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-39.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-4.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-6.scm
+%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-60.scm
+%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-69.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-8.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-9.scm
 @dirrm %%DATADIR%%/%%GUILE_VER%%/srfi
 @dirrm %%DATADIR%%/%%GUILE_VER%%/scripts
 @dirrm %%DATADIR%%/%%GUILE_VER%%/oop/goops
 @dirrm %%DATADIR%%/%%GUILE_VER%%/oop
+@dirrm %%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives
+@dirrm %%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals
+@dirrm %%DATADIR%%/%%GUILE_VER%%/lang/elisp
+@dirrm %%DATADIR%%/%%GUILE_VER%%/lang
+@dirrm %%DATADIR%%/%%GUILE_VER%%/ice-9/debugger
 @dirrm %%DATADIR%%/%%GUILE_VER%%/ice-9
 @dirrm %%DATADIR%%/%%GUILE_VER%%
 @dirrm %%DATADIR%%
 @dirrm include/libguile
 @dirrm include/guile/srfi
-@dirrm include/guile-readline
 @dirrm include/guile