5 files changed, 16 insertions, 32 deletions
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 42b23c28035..aca21f48cc8 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.86 2008/05/30 17:10:04 drochner Exp $
+# $NetBSD: Makefile,v 1.87 2008/12/10 23:11:55 gdt Exp $
 
-DISTNAME=		guile-1.8.5
+DISTNAME=		guile-1.8.6
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=guile/}
 
diff --git a/lang/guile/PLIST b/lang/guile/PLIST
index c0ba1b4c9e9..2763af15224 100644
--- a/lang/guile/PLIST
+++ b/lang/guile/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2008/06/02 16:38:20 drochner Exp $
+@comment $NetBSD: PLIST,v 1.23 2008/12/10 23:11:55 gdt Exp $
 bin/guile
 bin/guile-config
 bin/guile-snarf
@@ -122,6 +122,7 @@ lib/libguile-srfi-srfi-60-v-2.la
 lib/libguile.la
 lib/libguilereadline-v-17.la
 lib/pkgconfig/guile-1.8.pc
+man/man1/guile.1
 share/aclocal/guile.m4
 share/guile/1.8/guile-procedures.txt
 share/guile/1.8/ice-9/and-let-star.scm
diff --git a/lang/guile/distinfo b/lang/guile/distinfo
index ff1a820f3e2..014c614f60f 100644
--- a/lang/guile/distinfo
+++ b/lang/guile/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.37 2008/06/02 16:38:20 drochner Exp $
+$NetBSD: distinfo,v 1.38 2008/12/10 23:11:55 gdt Exp $
 
-SHA1 (guile-1.8.5.tar.gz) = 3ef611cf5c4998a5bdfc7935765bb68730038614
-RMD160 (guile-1.8.5.tar.gz) = 7f8ab70e1c524f7c20a65977b13c2575eeb61655
-Size (guile-1.8.5.tar.gz) = 3933369 bytes
-SHA1 (patch-aa) = 37fdeb8171b13468bfd0fa4e45aaf1770b8668ea
+SHA1 (guile-1.8.6.tar.gz) = a3896f86044a2b3740dac43e045c349d656fba31
+RMD160 (guile-1.8.6.tar.gz) = d6695d266a6091dc5fb1c688e3f0286f1c6d382e
+Size (guile-1.8.6.tar.gz) = 3960608 bytes
 SHA1 (patch-ae) = c3e5065408082978df5b6ddd62e47dda8ab41f40
 SHA1 (patch-ag) = 8aeb781ba43597f37b1ce4aaa2fb0baba2e4ce9c
-SHA1 (patch-ah) = 7a33742c2b4ae21a6e673ceeccc48ccae6a26ba3
+SHA1 (patch-ah) = aebe45fdcebfbad5394a74fc96b8f1fc14703c2b
 SHA1 (patch-ak) = 6639ea95471a76893b0b074dcbfbd139a1571309
 SHA1 (patch-al) = 6a5fb3136028bb5a5185ce7174a20d5f9d227e18
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)
- 
- 	       )))