Update to 1.8.6. Adjust patch-ah slightly for new upstream code.

Delete patch-aa as the whole lt_preloaded_symbols bit is gone upstream.

Changes in 1.8.6 (since 1.8.5)

* New features (see the manual for details)

** New convenience function `scm_c_symbol_length ()'

** Single stepping through code from Emacs

When you use GDS to evaluate Scheme code from Emacs, you can now use
`C-u' to indicate that you want to single step through that code. See
`Evaluating Scheme Code' in the manual for more details.

** New "guile(1)" man page!

* Changes to the distribution

** Automake's `AM_MAINTAINER_MODE' is no longer used

Thus, the `--enable-maintainer-mode' configure option is no longer
available: Guile is now always configured in "maintainer mode".

** `ChangeLog' files are no longer updated

Instead, changes are detailed in the version control system's logs.  See
the top-level `ChangeLog' files for details.

* Bugs fixed

** `symbol->string' now returns a read-only string, as per R5RS
** Fix incorrect handling of the FLAGS argument of `fold-matches'
** `guile-config link' now prints `-L$libdir' before `-lguile'
** Fix memory corruption involving GOOPS' `class-redefinition'
** Fix possible deadlock in `mutex-lock'
** Fix build issue on Tru64 and ia64-hp-hpux11.23 (`SCM_UNPACK' macro)
** Fix build issue on mips, mipsel, powerpc and ia64 (stack direction)
** Fix build issue on hppa2.0w-hp-hpux11.11 (`dirent64' and `readdir64_r')
** Fix build issue on i386-unknown-freebsd7.0 ("break strict-aliasing rules")
** Fix misleading output from `(help rationalize)'
** Fix build failure on Debian hppa architecture (bad stack growth detection)
** Fix `gcd' when called with a single, negative argument.
** Fix `Stack overflow' errors seen when building on some platforms
** Fix bug when `scm_with_guile ()' was called several times from the
   same thread
** The handler of SRFI-34 `with-exception-handler' is now invoked in the
   dynamic environment of the call to `raise'
** Fix potential deadlock in `make-struct'
** Fix compilation problem with libltdl from Libtool 2.2.x
** Fix sloppy bound checking in `string-{ref,set!}' with the empty string

2 files changed, 7 insertions, 23 deletions

diff --git a/lang/guile/patches/patch-aa b/lang/guile/patches/patch-aa
deleted file mode 100644
index e9586a5a3a0..00000000000
--- a/lang/guile/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2007/07/20 00:09:22 gdt Exp $
-
-Use a pointer, instead of an array, to avoid an error on Darwin.
-Patch from DarwinPorts.
-
---- libguile/guile.c.orig	2007-05-09 16:22:03.000000000 -0400
-+++ libguile/guile.c
-@@ -68,7 +68,7 @@ main (int argc, char **argv)
- {
- #if !defined (__MINGW32__)
-   /* libtool automagically inserts this variable into your executable... */
--  extern const lt_dlsymlist lt_preloaded_symbols[];
-+  extern const lt_dlsymlist *lt_preloaded_symbols;
-   lt_dlpreload_default (lt_preloaded_symbols);
- #endif
-   scm_boot_guile (argc, argv, inner_main, 0);
diff --git a/lang/guile/patches/patch-ah b/lang/guile/patches/patch-ah
index f78a1402e62..414ab58bb3b 100644
--- a/lang/guile/patches/patch-ah
+++ b/lang/guile/patches/patch-ah
@@ -1,13 +1,13 @@
-$NetBSD: patch-ah,v 1.3 2007/07/20 00:09:23 gdt Exp $
+$NetBSD: patch-ah,v 1.4 2008/12/10 23:11:55 gdt Exp $
 
---- guile-config/guile-config.in.orig	2007-05-09 16:22:03.000000000 -0400
+--- guile-config/guile-config.in.orig	2008-12-04 13:30:41.000000000 -0500
 +++ guile-config/guile-config.in
-@@ -155,7 +155,7 @@
+@@ -154,6 +154,8 @@
                 (if (or (string=? libdir "/usr/lib")
                         (string=? libdir "/usr/lib/"))
  		   ""
--		   (string-append "-L" (get-build-info 'libdir)))
-+		   (string-append "-Wl,-R" (get-build-info 'libdir) " -L" (get-build-info 'libdir)))
++		   ;; On BSD (all pksrc??), include rpath as well
++		   (string-append "-Wl,-R" (get-build-info 'libdir)))
+ 		   (string-append "-L" (get-build-info 'libdir)))
+                "-lguile -lltdl"
  	       (string-join other-flags)
- 
- 	       )))