Update to 1.6.7:

Changes since Guile 1.6.6 (changes in 1.6.7):

* Changes to the distribution

** A build problem has been fixed.

Previously, on some systems, the build would fail when libguile-ltdl
couldn't be found during the build.  This should now be fixed.

* Changes to Scheme functions and syntax

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

A mistake caused a call with just one source array to be rejected,
this has been fixed.

** string->number and octal constant bignums

An incorrect bignum size calculation has been fixed, this caused
overflow errors in string->number on bases other than 2, 10 and 16,
including octal literal constants in code or the reader.

** SRFI-1 alist-delete equality argument order fixed.

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

** SRFI-13 string-any and string-every tail calls

string-any and string-every now make a tail call to their predicate
function on reaching the last character in the string, per the SRFI-13
specification.

4 files changed, 27 insertions, 36 deletions

diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index a3ad49e5f49..a812db6d057 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.62 2004/12/01 14:59:48 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2004/12/26 00:29:42 wiz Exp $
 
-DISTNAME=		guile-1.6.6
+DISTNAME=		guile-1.6.7
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=guile/}
 
diff --git a/lang/guile/distinfo b/lang/guile/distinfo
index efbdaaea997..6d0e68314cf 100644
--- a/lang/guile/distinfo
+++ b/lang/guile/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.21 2004/12/01 14:59:48 wiz Exp $
+$NetBSD: distinfo,v 1.22 2004/12/26 00:29:42 wiz Exp $
 
-SHA1 (guile-1.6.6.tar.gz) = 0485619c8431385d9d395746d53776753b9dd76f
-Size (guile-1.6.6.tar.gz) = 3033204 bytes
+SHA1 (guile-1.6.7.tar.gz) = 00a82dc4c7c19f9b791e116a2baf83e7d0c0856d
+Size (guile-1.6.7.tar.gz) = 3039294 bytes
 SHA1 (patch-ad) = a1e59d8569ddbd0ccfdc96423e377f39836e6f21
-SHA1 (patch-ae) = 1074f9efc90ec419ed08d393892d8fe41fdde2b2
+SHA1 (patch-ae) = 4aaadd1df36540117bef4128f607b6a1bbcaaf28
 SHA1 (patch-af) = 96b50d3cff86a7ba7a76551723192ad99a07b971
 SHA1 (patch-ag) = a4b5f490e9c9520120bcb2824004cb8bfa1027e1
 SHA1 (patch-ah) = e66596a5ecc5c2d4fd09833507499b4d02c7af8a
-SHA1 (patch-ai) = 5907d308b45a2e07086ce8969f37aa5d789142f3
+SHA1 (patch-ai) = 3343ea669fa05c93a2af5a75cf9da5a04d068273
diff --git a/lang/guile/patches/patch-ae b/lang/guile/patches/patch-ae
index 95d9c07ad9f..4ebdd58f94f 100644
--- a/lang/guile/patches/patch-ae
+++ b/lang/guile/patches/patch-ae
@@ -1,38 +1,29 @@
-$NetBSD: patch-ae,v 1.10 2004/11/18 12:30:49 wiz Exp $
+$NetBSD: patch-ae,v 1.11 2004/12/26 00:29:42 wiz Exp $
 
---- libguile/gc_os_dep.c.orig	2004-06-16 00:55:31.000000000 +0200
+--- libguile/gc_os_dep.c.orig	2004-12-14 06:21:39.000000000 +0100
 +++ libguile/gc_os_dep.c
-@@ -112,12 +112,27 @@ typedef int GC_bool;
- #    define NETBSD
+@@ -107,6 +107,11 @@ typedef int GC_bool;
+ #    define OPENBSD
  #    define mach_type_known
  # endif
--# if defined(__NetBSD__) && defined(m68k)
-+# if defined(__NetBSD__) && defined(__powerpc__)
-+#    define POWERPC
++# if defined(__NetBSD__) && defined(__alpha__)
++#    define ALPHA
 +#    define NETBSD
 +#    define mach_type_known
 +# endif
-+# if defined(__NetBSD__) && (defined(m68k) || defined(__m68k__))
- #    define M68K
+ # if defined(__NetBSD__) && defined(__powerpc__)
+ #    define POWERPC
+ #    define NETBSD
+@@ -124,7 +129,7 @@ typedef int GC_bool;
  #    define NETBSD
  #    define mach_type_known
  # endif
--# if defined(__NetBSD__) && defined(arm32)
+-# if defined(__NetBSD__) && defined(__sparc__)
 +# if defined(__NetBSD__) && (defined(__sparc__) || defined(__sparc_v9__))
-+#    define SPARC
-+#    define NETBSD
-+#    define mach_type_known
-+# endif
-+# if defined(__NetBSD__) && defined(__alpha__)
-+#    define ALPHA
-+#    define NETBSD
-+#    define mach_type_known
-+# endif
-+# if defined(__NetBSD__) && (defined(arm32) || defined(__arm__))
- #    define ARM32
+ #    define SPARC
  #    define NETBSD
  #    define mach_type_known
-@@ -241,7 +256,7 @@ typedef int GC_bool;
+@@ -243,7 +248,7 @@ typedef int GC_bool;
  # endif
  # if defined(__alpha) || defined(__alpha__)
  #   define ALPHA
@@ -41,7 +32,7 @@ $NetBSD: patch-ae,v 1.10 2004/11/18 12:30:49 wiz Exp $
  #     define OSF1	/* a.k.a Digital Unix */
  #   endif
  #   define mach_type_known
-@@ -294,6 +309,11 @@ typedef int GC_bool;
+@@ -296,6 +301,11 @@ typedef int GC_bool;
  #   define NETBSD
  #   define mach_type_known
  # endif
@@ -53,7 +44,7 @@ $NetBSD: patch-ae,v 1.10 2004/11/18 12:30:49 wiz Exp $
  # if defined(bsdi) && defined(i386)
  #    define I386
  #    define BSDI
-@@ -433,12 +453,12 @@ scm_get_stack_base ()
+@@ -435,12 +445,12 @@ scm_get_stack_base ()
  /*
   * For each architecture and OS, the following need to be defined:
   *
@@ -69,7 +60,7 @@ $NetBSD: patch-ae,v 1.10 2004/11/18 12:30:49 wiz Exp $
   *
   * MACH_TYPE is a string representation of the machine type.
   * OS_TYPE is analogous for the OS.
-@@ -983,6 +1003,21 @@ scm_get_stack_base ()
+@@ -985,6 +995,21 @@ scm_get_stack_base ()
  #    endif
  # endif
  
diff --git a/lang/guile/patches/patch-ai b/lang/guile/patches/patch-ai
index f8fd94882b4..4853b0ef1f6 100644
--- a/lang/guile/patches/patch-ai
+++ b/lang/guile/patches/patch-ai
@@ -1,11 +1,11 @@
-$NetBSD: patch-ai,v 1.2 2004/11/18 12:30:49 wiz Exp $
+$NetBSD: patch-ai,v 1.3 2004/12/26 00:29:42 wiz Exp $
 
---- libguile/Makefile.in.orig	2004-10-05 05:34:09.000000000 +0200
+--- libguile/Makefile.in.orig	2004-12-21 18:26:02.000000000 +0100
 +++ libguile/Makefile.in
-@@ -343,7 +343,7 @@ noinst_HEADERS = coop-threads.c coop-thr
+@@ -344,7 +344,7 @@ noinst_HEADERS = coop-threads.c coop-thr
  
  libguile_la_DEPENDENCIES = @LIBLOBJS@
- libguile_la_LIBADD = @LIBLOBJS@ ../libguile-ltdl/libguile-ltdl.la $(THREAD_LIBS_LOCAL)
+ libguile_la_LIBADD = @LIBLOBJS@ @abs_top_builddir@/libguile-ltdl/libguile-ltdl.la $(THREAD_LIBS_LOCAL)
 -libguile_la_LDFLAGS = -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ -export-dynamic -no-undefined
 +libguile_la_LDFLAGS = -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ -export-dynamic