Update to 1.6.5. Greg Troxel and I did the same work here, so I'll commit

it before someone else does too :)

Changes since Guile 1.6.4 (changes in 1.6.5):

* Changes to the distribution

** Bugs have been fixed that prevented the (re)generation of psyntax.pp.

** SRFI-31 has been added (special form `rec' for recursive evaluation)

(use-modules (srfi srfi-31)) will now provide support for SRFI-31.
See the Guile info pages for more documentation.

** SRFI-39 has been added (parameter objects)

** Guile is now compiled with -fno-strict-aliasing when gcc is detected.

** The --enable-htmldoc option has been removed from 'configure'.

Support for translating the documentation into HTML is now always
provided.  Use 'make html'.

* Changes to the stand-alone interpreter

** GC bug fixed.

The use of scm_must_realloc() for memory which is scanned by GC, could
trigger a GC scan of a free()d block of memory. This is now fixed.

* Changes to Scheme functions and syntax

** array-map! and array-map-in-order! now require at least one source array.

Previously a call without any source arrays like (array-map! array
proc) would cause a segfault.  Now such calls are properly rejected.

** srfi-4 has been overhauled

Bugs have been fixed, and performance may be improved in certain
situations.  Among other things, large 64-bit values should print
correctly now.

** gethost no longer causes an exception when trying to throw an exception

** call-with-output-string doesn't segv on closed port

Previously call-with-output-string would give a segmentation fault if
the string port was closed by the called function.  An exception is
raised now.

** (ice-9 popen) duplicate pipe fd fix

open-pipe, open-input-pipe and open-output-pipe left an extra copy of
their pipe file descriptor in the child, which was normally harmless,
but it can prevent the parent seeing eof or a broken pipe immediately                               and has now been fixed.

** source-properties and set-source-properties! fix

Properties set with set-source-properties! can now be read back
correctly with source-properties.

** SRFI-1 delete equality argument order fixed.

In the srfi-1 module delete and delete!, the order of the arguments to
the "=" procedure now matches the SRFI-1 specification.

** SRFI-19 date-week-number fix

date-week-number now correctly respects the requested day of week
starting the week.

* Changes to the C interface

8 files changed, 102 insertions, 103 deletions

diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 87e955d416b..0d345a8b1ae 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2004/11/12 06:39:20 jlam Exp $
+# $NetBSD: Makefile,v 1.58 2004/11/18 12:30:49 wiz Exp $
 
-DISTNAME=		guile-1.6.4
-PKGREVISION=		4
+DISTNAME=		guile-1.6.5
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=guile/}
 
@@ -29,7 +28,7 @@ TEST_TARGET=		check
 CPPFLAGS+=		-Dmacosx
 
 post-patch:
-	@mv ${WRKSRC}/guile-config/guile-config.in.orig \
+	@${MV} ${WRKSRC}/guile-config/guile-config.in.orig \
 	    ${WRKSRC}/guile-config/guile-config.in
 .endif
 
diff --git a/lang/guile/PLIST b/lang/guile/PLIST
index 4a84e2b35df..0b4fa7151ac 100644
--- a/lang/guile/PLIST
+++ b/lang/guile/PLIST
@@ -1,8 +1,14 @@
-@comment $NetBSD: PLIST,v 1.11 2004/09/22 08:09:39 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2004/11/18 12:30:49 wiz Exp $
 bin/guile
-bin/guile-snarf
 bin/guile-config
+bin/guile-snarf
 bin/guile-tools
+include/guile-readline/readline.h
+include/guile/gh.h
+include/guile/srfi/srfi-13.h
+include/guile/srfi/srfi-14.h
+include/guile/srfi/srfi-4.h
+include/libguile.h
 include/libguile/__scm.h
 include/libguile/alist.h
 include/libguile/arbiters.h
@@ -12,8 +18,8 @@ include/libguile/boolean.h
 include/libguile/chars.h
 include/libguile/continuations.h
 include/libguile/coop-defs.h
-include/libguile/debug.h
 include/libguile/debug-malloc.h
+include/libguile/debug.h
 include/libguile/deprecation.h
 include/libguile/dynl.h
 include/libguile/dynwind.h
@@ -54,20 +60,19 @@ include/libguile/options.h
 include/libguile/pairs.h
 include/libguile/ports.h
 include/libguile/posix.h
-include/libguile/regex-posix.h
 include/libguile/print.h
 include/libguile/procprop.h
 include/libguile/procs.h
 include/libguile/properties.h
-include/libguile/random.h
 include/libguile/ramap.h
+include/libguile/random.h
 include/libguile/rdelim.h
 include/libguile/read.h
+include/libguile/regex-posix.h
 include/libguile/root.h
 include/libguile/rw.h
 include/libguile/scmconfig.h
 include/libguile/scmsigs.h
-include/libguile/validate.h
 include/libguile/script.h
 include/libguile/simpos.h
 include/libguile/smob.h
@@ -88,40 +93,27 @@ include/libguile/tags.h
 include/libguile/threads.h
 include/libguile/throw.h
 include/libguile/unif.h
+include/libguile/validate.h
 include/libguile/values.h
 include/libguile/variable.h
 include/libguile/vectors.h
 include/libguile/version.h
 include/libguile/vports.h
 include/libguile/weaks.h
-include/guile/gh.h
-include/guile/srfi/srfi-4.h
-include/guile/srfi/srfi-13.h
-include/guile/srfi/srfi-14.h
-include/guile-readline/readline.h
-include/libguile.h
-lib/libguile.la
 lib/libguile-ltdl.la
-lib/libguilereadline-v-12.la
-lib/libguile-srfi-srfi-4-v-1.la
 lib/libguile-srfi-srfi-13-14-v-1.la
+lib/libguile-srfi-srfi-4-v-1.la
+lib/libguile.la
+lib/libguilereadline-v-12.la
 share/aclocal/guile.m4
-share/guile/1.6/oop/goops/active-slot.scm
-share/guile/1.6/oop/goops/compile.scm
-share/guile/1.6/oop/goops/composite-slot.scm
-share/guile/1.6/oop/goops/describe.scm
-share/guile/1.6/oop/goops/dispatch.scm
-share/guile/1.6/oop/goops/internal.scm
-share/guile/1.6/oop/goops/save.scm
-share/guile/1.6/oop/goops/stklos.scm
-share/guile/1.6/oop/goops/util.scm
-share/guile/1.6/oop/goops/old-define-method.scm
-share/guile/1.6/oop/goops.scm
 share/guile/1.6/guile-procedures.txt
+share/guile/1.6/ice-9/and-let*.scm
 share/guile/1.6/ice-9/and-let-star.scm
 share/guile/1.6/ice-9/arrays.scm
 share/guile/1.6/ice-9/boot-9.scm
+share/guile/1.6/ice-9/buffered-input.scm
 share/guile/1.6/ice-9/calling.scm
+share/guile/1.6/ice-9/channel.scm
 share/guile/1.6/ice-9/common-list.scm
 share/guile/1.6/ice-9/debug.scm
 share/guile/1.6/ice-9/debugger.scm
@@ -129,8 +121,10 @@ share/guile/1.6/ice-9/documentation.scm
 share/guile/1.6/ice-9/emacs.scm
 share/guile/1.6/ice-9/expect.scm
 share/guile/1.6/ice-9/format.scm
+share/guile/1.6/ice-9/ftw.scm
 share/guile/1.6/ice-9/getopt-long.scm
 share/guile/1.6/ice-9/hcons.scm
+share/guile/1.6/ice-9/history.scm
 share/guile/1.6/ice-9/lineio.scm
 share/guile/1.6/ice-9/ls.scm
 share/guile/1.6/ice-9/mapping.scm
@@ -141,12 +135,14 @@ share/guile/1.6/ice-9/optargs.scm
 share/guile/1.6/ice-9/poe.scm
 share/guile/1.6/ice-9/popen.scm
 share/guile/1.6/ice-9/posix.scm
+share/guile/1.6/ice-9/pretty-print.scm
 share/guile/1.6/ice-9/psyntax.pp
 share/guile/1.6/ice-9/psyntax.ss
 share/guile/1.6/ice-9/q.scm
 share/guile/1.6/ice-9/r4rs.scm
 share/guile/1.6/ice-9/r5rs.scm
 share/guile/1.6/ice-9/rdelim.scm
+share/guile/1.6/ice-9/readline.scm
 share/guile/1.6/ice-9/receive.scm
 share/guile/1.6/ice-9/regex.scm
 share/guile/1.6/ice-9/runq.scm
@@ -160,14 +156,18 @@ share/guile/1.6/ice-9/streams.scm
 share/guile/1.6/ice-9/string-fun.scm
 share/guile/1.6/ice-9/syncase.scm
 share/guile/1.6/ice-9/threads.scm
-share/guile/1.6/ice-9/buffered-input.scm
 share/guile/1.6/ice-9/time.scm
-share/guile/1.6/ice-9/history.scm
-share/guile/1.6/ice-9/channel.scm
-share/guile/1.6/ice-9/pretty-print.scm
-share/guile/1.6/ice-9/ftw.scm
-share/guile/1.6/ice-9/and-let*.scm
-share/guile/1.6/ice-9/readline.scm
+share/guile/1.6/oop/goops.scm
+share/guile/1.6/oop/goops/active-slot.scm
+share/guile/1.6/oop/goops/compile.scm
+share/guile/1.6/oop/goops/composite-slot.scm
+share/guile/1.6/oop/goops/describe.scm
+share/guile/1.6/oop/goops/dispatch.scm
+share/guile/1.6/oop/goops/internal.scm
+share/guile/1.6/oop/goops/old-define-method.scm
+share/guile/1.6/oop/goops/save.scm
+share/guile/1.6/oop/goops/stklos.scm
+share/guile/1.6/oop/goops/util.scm
 share/guile/1.6/scripts/PROGRAM
 share/guile/1.6/scripts/autofrisk
 share/guile/1.6/scripts/display-commentary
@@ -177,15 +177,10 @@ share/guile/1.6/scripts/generate-autoload
 share/guile/1.6/scripts/lint
 share/guile/1.6/scripts/punify
 share/guile/1.6/scripts/read-scheme-source
-share/guile/1.6/scripts/use2dot
 share/guile/1.6/scripts/snarf-check-and-output-texi
 share/guile/1.6/scripts/snarf-guile-m4-docs
+share/guile/1.6/scripts/use2dot
 share/guile/1.6/srfi/srfi-1.scm
-share/guile/1.6/srfi/srfi-2.scm
-share/guile/1.6/srfi/srfi-4.scm
-share/guile/1.6/srfi/srfi-6.scm
-share/guile/1.6/srfi/srfi-8.scm
-share/guile/1.6/srfi/srfi-9.scm
 share/guile/1.6/srfi/srfi-10.scm
 share/guile/1.6/srfi/srfi-11.scm
 share/guile/1.6/srfi/srfi-13.scm
@@ -193,10 +188,11 @@ share/guile/1.6/srfi/srfi-14.scm
 share/guile/1.6/srfi/srfi-16.scm
 share/guile/1.6/srfi/srfi-17.scm
 share/guile/1.6/srfi/srfi-19.scm
-@dirrm include/libguile
-@dirrm include/guile/srfi
-@dirrm include/guile-readline
-@dirrm include/guile
+share/guile/1.6/srfi/srfi-2.scm
+share/guile/1.6/srfi/srfi-4.scm
+share/guile/1.6/srfi/srfi-6.scm
+share/guile/1.6/srfi/srfi-8.scm
+share/guile/1.6/srfi/srfi-9.scm
 @dirrm share/guile/1.6/srfi
 @dirrm share/guile/1.6/scripts
 @dirrm share/guile/1.6/oop/goops
@@ -204,3 +200,7 @@ share/guile/1.6/srfi/srfi-19.scm
 @dirrm share/guile/1.6/ice-9
 @dirrm share/guile/1.6
 @dirrm share/guile
+@dirrm include/libguile
+@dirrm include/guile/srfi
+@dirrm include/guile-readline
+@dirrm include/guile
diff --git a/lang/guile/distinfo b/lang/guile/distinfo
index e2233fe0b45..adeccd3353e 100644
--- a/lang/guile/distinfo
+++ b/lang/guile/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.19 2004/05/16 17:52:11 danw Exp $
+$NetBSD: distinfo,v 1.20 2004/11/18 12:30:49 wiz Exp $
 
-SHA1 (guile-1.6.4.tar.gz) = fe5a759ed233e8633e9e59d0eb0a8035756e2e4e
-Size (guile-1.6.4.tar.gz) = 2778075 bytes
-SHA1 (patch-ad) = 403390879c4377f7a2e1d2bf8dc1f58118b45bc8
-SHA1 (patch-ae) = 4dd28ab34928608e00fc474bdebfd3a178f8f152
-SHA1 (patch-af) = e30137918a83a735bcc9b1c4458df4905fe46087
-SHA1 (patch-ag) = 06f0edd45fae828e41252e9b6964a2e0fab6f1af
+SHA1 (guile-1.6.5.tar.gz) = c7f96fa445d76c9ba9b0cdbb706f6f3109f0935b
+Size (guile-1.6.5.tar.gz) = 3031556 bytes
+SHA1 (patch-ad) = a1e59d8569ddbd0ccfdc96423e377f39836e6f21
+SHA1 (patch-ae) = 1074f9efc90ec419ed08d393892d8fe41fdde2b2
+SHA1 (patch-af) = 96b50d3cff86a7ba7a76551723192ad99a07b971
+SHA1 (patch-ag) = a4b5f490e9c9520120bcb2824004cb8bfa1027e1
 SHA1 (patch-ah) = e66596a5ecc5c2d4fd09833507499b4d02c7af8a
-SHA1 (patch-ai) = 095f7d1e5a3df3cceb05f1b5daccae78691a796a
+SHA1 (patch-ai) = 5907d308b45a2e07086ce8969f37aa5d789142f3
diff --git a/lang/guile/patches/patch-ad b/lang/guile/patches/patch-ad
index fee029a8825..a293605b738 100644
--- a/lang/guile/patches/patch-ad
+++ b/lang/guile/patches/patch-ad
@@ -1,22 +1,22 @@
-$NetBSD: patch-ad,v 1.6 2003/12/14 17:14:40 wiz Exp $
+$NetBSD: patch-ad,v 1.7 2004/11/18 12:30:49 wiz Exp $
 
---- guile-readline/Makefile.in.orig	2003-04-21 20:23:33.000000000 +0200
+--- guile-readline/Makefile.in.orig	2004-10-05 05:58:19.000000000 +0200
 +++ guile-readline/Makefile.in
-@@ -135,7 +135,7 @@ lib_LTLIBRARIES = libguilereadline-v-@LI
+@@ -61,7 +61,7 @@ am__vpath_adj = case $$p in \
+   esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
++libLTLIBRARIES_INSTALL = $(INSTALL_DATA)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_DEPENDENCIES =  \
+ 	../libguile/libguile.la
+@@ -215,7 +215,7 @@ lib_LTLIBRARIES = libguilereadline-v-@LI
  libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_SOURCES = readline.c
  libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LIBADD = ../libguile/libguile.la
  libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LDFLAGS = -version-info @LIBGUILEREADLINE_INTERFACE@ \
 -  -export-dynamic -no-undefined
 +  -export-dynamic
  
- 
  BUILT_SOURCES = readline.x
-@@ -208,7 +208,7 @@ $(srcdir)/configure:  $(srcdir)/configur
- 
- $(ACLOCAL_M4):  configure.in 
- 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
--libLTLIBRARIES_INSTALL = $(INSTALL)
-+libLTLIBRARIES_INSTALL = $(INSTALL_DATA)
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ pkginclude_HEADERS = readline.h
diff --git a/lang/guile/patches/patch-ae b/lang/guile/patches/patch-ae
index 7186b5f627a..95d9c07ad9f 100644
--- a/lang/guile/patches/patch-ae
+++ b/lang/guile/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.9 2004/03/16 00:46:39 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.10 2004/11/18 12:30:49 wiz Exp $
 
---- libguile/gc_os_dep.c.orig	Wed Apr 16 20:16:21 2003
+--- libguile/gc_os_dep.c.orig	2004-06-16 00:55:31.000000000 +0200
 +++ libguile/gc_os_dep.c
-@@ -98,12 +98,27 @@ typedef int GC_bool;
+@@ -112,12 +112,27 @@ typedef int GC_bool;
  #    define NETBSD
  #    define mach_type_known
  # endif
@@ -32,7 +32,7 @@ $NetBSD: patch-ae,v 1.9 2004/03/16 00:46:39 dmcmahill Exp $
  #    define ARM32
  #    define NETBSD
  #    define mach_type_known
-@@ -227,7 +242,7 @@ typedef int GC_bool;
+@@ -241,7 +256,7 @@ typedef int GC_bool;
  # endif
  # if defined(__alpha) || defined(__alpha__)
  #   define ALPHA
@@ -41,7 +41,7 @@ $NetBSD: patch-ae,v 1.9 2004/03/16 00:46:39 dmcmahill Exp $
  #     define OSF1	/* a.k.a Digital Unix */
  #   endif
  #   define mach_type_known
-@@ -279,6 +294,11 @@ typedef int GC_bool;
+@@ -294,6 +309,11 @@ typedef int GC_bool;
  #   define NETBSD
  #   define mach_type_known
  # endif
@@ -53,7 +53,7 @@ $NetBSD: patch-ae,v 1.9 2004/03/16 00:46:39 dmcmahill Exp $
  # if defined(bsdi) && defined(i386)
  #    define I386
  #    define BSDI
-@@ -412,12 +432,12 @@ typedef int GC_bool;
+@@ -433,12 +453,12 @@ scm_get_stack_base ()
  /*
   * For each architecture and OS, the following need to be defined:
   *
@@ -69,11 +69,10 @@ $NetBSD: patch-ae,v 1.9 2004/03/16 00:46:39 dmcmahill Exp $
   *
   * MACH_TYPE is a string representation of the machine type.
   * OS_TYPE is analogous for the OS.
-@@ -961,6 +981,21 @@ typedef int GC_bool;
- #      define OS_TYPE "GNU"
+@@ -983,6 +1003,21 @@ scm_get_stack_base ()
  #    endif
  # endif
-+
+ 
 +# ifdef X86_64
 +#   define MACH_TYPE "X86_64"
 +#   define ALIGNMENT 8
@@ -88,6 +87,7 @@ $NetBSD: patch-ae,v 1.9 2004/03/16 00:46:39 dmcmahill Exp $
 +#	define DATASTART ((ptr_t)(&etext))
 +#   endif
 +#   endif
- 
++
  # ifdef NS32K
  #   define MACH_TYPE "NS32K"
+ #   define ALIGNMENT 4
diff --git a/lang/guile/patches/patch-af b/lang/guile/patches/patch-af
index b7dbaf36735..2089c640d17 100644
--- a/lang/guile/patches/patch-af
+++ b/lang/guile/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.2 2003/12/14 17:14:40 wiz Exp $
+$NetBSD: patch-af,v 1.3 2004/11/18 12:30:49 wiz Exp $
 
---- doc/ref/Makefile.in.orig	2003-04-21 19:02:49.000000000 +0200
+--- doc/ref/Makefile.in.orig	2004-10-05 05:34:07.000000000 +0200
 +++ doc/ref/Makefile.in
-@@ -218,7 +218,7 @@ PSS = guile.ps
- TEXINFOS = guile.texi
- DATA = $(html_DATA)
- 
--DIST_COMMON = $(guile_TEXINFOS) $(top_srcdir)/am/pre-inst-guile \
-+DIST_COMMON = $(info_TEXINFOS) $(top_srcdir)/am/pre-inst-guile \
- 	ChangeLog Makefile.am Makefile.in mdate-sh stamp-vti \
- 	texinfo.tex version.texi
- all: all-am
+@@ -35,7 +35,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-DIST_COMMON = $(guile_TEXINFOS) $(srcdir)/Makefile.am \
++DIST_COMMON = $(info_TEXINFOS) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/stamp-vti \
+ 	$(srcdir)/version.texi $(top_srcdir)/am/pre-inst-guile \
+ 	ChangeLog mdate-sh texinfo.tex
diff --git a/lang/guile/patches/patch-ag b/lang/guile/patches/patch-ag
index 73b8a461bf6..0910f44c89a 100644
--- a/lang/guile/patches/patch-ag
+++ b/lang/guile/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.2 2003/12/14 17:14:40 wiz Exp $
+$NetBSD: patch-ag,v 1.3 2004/11/18 12:30:49 wiz Exp $
 
---- doc/goops/Makefile.in.orig	2003-04-21 19:02:48.000000000 +0200
+--- doc/goops/Makefile.in.orig	2004-10-05 05:34:07.000000000 +0200
 +++ doc/goops/Makefile.in
-@@ -201,7 +201,7 @@ PSS = goops.ps
- TEXINFOS = goops.texi
- DATA = $(html_DATA)
- 
--DIST_COMMON = $(goops_TEXINFOS) ChangeLog Makefile.am Makefile.in
-+DIST_COMMON = $(info_TEXINFOS) ChangeLog Makefile.am Makefile.in
- all: all-am
- 
- .SUFFIXES:
+@@ -36,7 +36,7 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ subdir = doc/goops
+-DIST_COMMON = $(goops_TEXINFOS) $(srcdir)/Makefile.am \
++DIST_COMMON = $(info_TEXINFOS) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in ChangeLog
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/guile-config/qthreads.m4 \
diff --git a/lang/guile/patches/patch-ai b/lang/guile/patches/patch-ai
index 8b49f4816e9..f8fd94882b4 100644
--- a/lang/guile/patches/patch-ai
+++ b/lang/guile/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1 2004/05/16 17:52:11 danw Exp $
+$NetBSD: patch-ai,v 1.2 2004/11/18 12:30:49 wiz Exp $
 
---- libguile/Makefile.in.orig	Sat Mar 13 17:21:34 2004
+--- libguile/Makefile.in.orig	2004-10-05 05:34:09.000000000 +0200
 +++ libguile/Makefile.in
-@@ -258,7 +258,7 @@ noinst_HEADERS = coop-threads.c coop-thr
+@@ -343,7 +343,7 @@ noinst_HEADERS = coop-threads.c coop-thr
  
  libguile_la_DEPENDENCIES = @LIBLOBJS@
  libguile_la_LIBADD = @LIBLOBJS@ ../libguile-ltdl/libguile-ltdl.la $(THREAD_LIBS_LOCAL)