update to 1.8.5

changes:
-new module: `(srfi srfi-88)'
-New `postfix' read option, for SRFI-88 keyword syntax
-Some I/O primitives have been inlined, which improves I/O performance
-New object-based traps infrastructure
-New support for working on Guile code from within Emacs
-bugfixes

pkgsrc note: added a patch which affects builds without thread
 support only (fixes crash on termination)

approved by gdt

5 files changed, 40 insertions, 28 deletions

diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 432074bc30a..42b23c28035 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.85 2008/03/29 05:12:16 tnn Exp $
+# $NetBSD: Makefile,v 1.86 2008/05/30 17:10:04 drochner Exp $
 
-DISTNAME=		guile-1.8.4
-PKGREVISION=		2
+DISTNAME=		guile-1.8.5
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=guile/}
 
@@ -19,6 +18,7 @@ USE_LIBTOOL=		YES
 USE_GNU_READLINE=	YES
 PTHREAD_AUTO_VARS=	YES
 INFO_FILES=		YES
+PKGCONFIG_OVERRIDE=	guile-1.8.pc.in
 
 # XXX Make this conditional on the problematic systems.
 # couldn't figure out how to work around an error on solaris-2.9/sparc with gcc when
@@ -26,6 +26,8 @@ INFO_FILES=		YES
 # a prototype.
 CONFIGURE_ARGS+=	--disable-error-on-warning
 
+#CONFIGURE_ARGS+=	--without-threads
+
 TEST_DIRS=		.
 TEST_TARGET=		check
 
diff --git a/lang/guile/PLIST b/lang/guile/PLIST
index b736a8f0d00..f0d362356ae 100644
--- a/lang/guile/PLIST
+++ b/lang/guile/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2008/02/22 02:28:06 gdt Exp $
+@comment $NetBSD: PLIST,v 1.21 2008/05/30 17:10:04 drochner Exp $
 bin/guile
 bin/guile-config
 bin/guile-snarf
@@ -121,7 +121,11 @@ lib/libguile-srfi-srfi-4-v-3.la
 lib/libguile-srfi-srfi-60-v-2.la
 lib/libguile.la
 lib/libguilereadline-v-17.la
+lib/pkgconfig/guile-1.8.pc
 share/aclocal/guile.m4
+share/emacs/site-lisp/gds-scheme.el
+share/emacs/site-lisp/gds-server.el
+share/emacs/site-lisp/gds.el
 share/guile/1.8/guile-procedures.txt
 share/guile/1.8/ice-9/and-let-star.scm
 share/guile/1.8/ice-9/boot-9.scm
@@ -136,6 +140,12 @@ share/guile/1.8/ice-9/debugger/commands.scm
 share/guile/1.8/ice-9/debugger/state.scm
 share/guile/1.8/ice-9/debugger/trc.scm
 share/guile/1.8/ice-9/debugger/utils.scm
+share/guile/1.8/ice-9/debugging/example-fns.scm
+share/guile/1.8/ice-9/debugging/ice-9-debugger-extensions.scm
+share/guile/1.8/ice-9/debugging/steps.scm
+share/guile/1.8/ice-9/debugging/trace.scm
+share/guile/1.8/ice-9/debugging/traps.scm
+share/guile/1.8/ice-9/debugging/trc.scm
 share/guile/1.8/ice-9/deprecated.scm
 share/guile/1.8/ice-9/documentation.scm
 share/guile/1.8/ice-9/emacs.scm
@@ -143,6 +153,8 @@ share/guile/1.8/ice-9/expect.scm
 share/guile/1.8/ice-9/format.scm
 share/guile/1.8/ice-9/ftw.scm
 share/guile/1.8/ice-9/gap-buffer.scm
+share/guile/1.8/ice-9/gds-client.scm
+share/guile/1.8/ice-9/gds-server.scm
 share/guile/1.8/ice-9/getopt-long.scm
 share/guile/1.8/ice-9/hcons.scm
 share/guile/1.8/ice-9/history.scm
@@ -266,6 +278,7 @@ share/guile/1.8/srfi/srfi-6.scm
 share/guile/1.8/srfi/srfi-60.scm
 share/guile/1.8/srfi/srfi-69.scm
 share/guile/1.8/srfi/srfi-8.scm
+share/guile/1.8/srfi/srfi-88.scm
 share/guile/1.8/srfi/srfi-9.scm
 @exec ${MKDIR} %D/share/guile/site
 @dirrm share/guile/site
@@ -277,6 +290,7 @@ share/guile/1.8/srfi/srfi-9.scm
 @dirrm share/guile/1.8/lang/elisp/internals
 @dirrm share/guile/1.8/lang/elisp
 @dirrm share/guile/1.8/lang
+@dirrm share/guile/1.8/ice-9/debugging
 @dirrm share/guile/1.8/ice-9/debugger
 @dirrm share/guile/1.8/ice-9
 @dirrm share/guile/1.8
diff --git a/lang/guile/distinfo b/lang/guile/distinfo
index 37e76f46de1..75fd340bb85 100644
--- a/lang/guile/distinfo
+++ b/lang/guile/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.35 2008/02/27 12:19:45 gdt Exp $
+$NetBSD: distinfo,v 1.36 2008/05/30 17:10:04 drochner Exp $
 
-SHA1 (guile-1.8.4.tar.gz) = 1e80fe242acfde2bfa39fd1e8409a8f010e24e2b
-RMD160 (guile-1.8.4.tar.gz) = 58a502e553519b7f4e409ede361ad12141f20fec
-Size (guile-1.8.4.tar.gz) = 3821388 bytes
+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 (patch-ae) = c3e5065408082978df5b6ddd62e47dda8ab41f40
 SHA1 (patch-ag) = 8aeb781ba43597f37b1ce4aaa2fb0baba2e4ce9c
 SHA1 (patch-ah) = 7a33742c2b4ae21a6e673ceeccc48ccae6a26ba3
-SHA1 (patch-aj) = e00579d933cec744538851b62d372a027f20b6b6
+SHA1 (patch-ak) = 6639ea95471a76893b0b074dcbfbd139a1571309
diff --git a/lang/guile/patches/patch-aj b/lang/guile/patches/patch-aj
deleted file mode 100644
index 1b7defbf7cf..00000000000
--- a/lang/guile/patches/patch-aj
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aj,v 1.4 2008/02/27 12:19:45 gdt Exp $
-
---- libguile/_scm.h.orig	2008-02-06 08:09:18.000000000 -0500
-+++ libguile/_scm.h
-@@ -95,14 +95,6 @@
- # define SCM_SYSCALL(line) line;
- #endif /* ndef SCM_SYSCALL */
- 
--#if !defined (MSDOS) && !defined (__MINGW32__)
--# ifdef ARM_ULIB
--    extern volatile int errno;
--# else
--    extern int errno;
--# endif /* def ARM_ULIB */
--#endif /* ndef MSDOS && ndef __MINGW32__*/
--
- 
- 
- #ifndef min
diff --git a/lang/guile/patches/patch-ak b/lang/guile/patches/patch-ak
new file mode 100644
index 00000000000..f7ae36ceb5e
--- /dev/null
+++ b/lang/guile/patches/patch-ak
@@ -0,0 +1,15 @@
+$NetBSD: patch-ak,v 1.8 2008/05/30 17:10:04 drochner Exp $
+
+--- libguile/null-threads.c.orig	2008-01-04 14:43:50.000000000 +0100
++++ libguile/null-threads.c
+@@ -47,8 +47,10 @@ int
+ scm_i_pthread_key_create (scm_i_pthread_key_t *key,
+ 			  void (*destr_func) (void *))
+ {
++#if 0 /* keys are needed by other atexit() functions */
+   if (all_keys == NULL)
+     atexit (destroy_keys);
++#endif
+ 
+   key->next = all_keys;
+   all_keys = key;