Update to 1.8.3. Several patches were merged upstream.

Changes in 1.8.3 (since 1.8.2)

* New modules (see the manual for details)

** `(srfi srfi-35)'
** `(srfi srfi-37)'

* Bugs fixed

** The `(ice-9 slib)' module now works as expected
** Expressions like "(set! 'x #t)" no longer yield a crash
** Warnings about duplicate bindings now go to stderr
** A memory leak in `make-socket-address' was fixed
** Alignment issues (e.g., on SPARC) in network routines were fixed
** A threading issue that showed up at least on NetBSD was fixed
** Build problems on Solaris and IRIX fixed

* Implementation improvements

** The reader is now faster, which reduces startup time
** Procedures returned by `record-accessor' and `record-modifier' are faster

7 files changed, 24 insertions, 294 deletions

diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 477d11865a9..c8f87285e06 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.77 2007/12/28 01:00:10 gdt Exp $
+# $NetBSD: Makefile,v 1.78 2008/01/03 13:30:25 gdt Exp $
 
-DISTNAME=		guile-1.8.2
-PKGREVISION=		1
+DISTNAME=		guile-1.8.3
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=guile/}
 
@@ -16,14 +15,17 @@ USE_TOOLS+=		gmake makeinfo
 USE_LIBTOOL=		YES
 USE_GNU_READLINE=	YES
 PTHREAD_AUTO_VARS=	YES
-INFO_FILES=		# PLIST
+INFO_FILES=		YES
+
+# 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
 # compiling ${WRKSRC}/libguile/filesys.c.  The warning is that readdir64_r was missing
 # a prototype.
 CONFIGURE_ARGS+=	--disable-error-on-warning
-#CONFIGURE_ARGS+=	--without-threads
-TEST_DIRS=		${WRKSRC}
+
+TEST_DIRS=		.
 TEST_TARGET=		check
+
 OWN_DIRS=		${PREFIX}/share/guile/site
 
 .include "../../mk/bsd.prefs.mk"
@@ -39,8 +41,8 @@ OWN_DIRS=		${PREFIX}/share/guile/site
 # http://lists.gnu.org/archive/html/guile-user/2006-11/msg00035.html
 post-patch:
 	${TOUCH} ${WRKSRC}/libguile/scmconfig.h
-	echo "(define-module (ice-9 slib))" > ${WRKSRC}/ice-9/slib.scm
-	echo "(load-from-path \"slib/guile.init\")" >> ${WRKSRC}/ice-9/slib.scm
+	${ECHO} "(define-module (ice-9 slib))" > ${WRKSRC}/ice-9/slib.scm
+	${ECHO} "(load-from-path \"slib/guile.init\")" >> ${WRKSRC}/ice-9/slib.scm
 
 .if ${OPSYS} == "DragonFly"
 CONFIGURE_ARGS+=	ac_cv_type_complex_double=no
@@ -49,10 +51,15 @@ CONFIGURE_ARGS+=	ac_cv_type_complex_double=no
 .if ${OPSYS} == "Darwin"
 CPPFLAGS+=		-Dmacosx
 
+# Darwin does not use -rpath, so back out the patch that adds it.  It
+# is not clear that guile works properly if directories with modules
+# are not in LTDL_LIBRARY_PATH or LD_LIBRARY_PATH.  See the following
+# PRs:
+#   http://www.NetBSD.org/cgi-bin/query-pr-single.pl?number=33665
+#   http://www.NetBSD.org/cgi-bin/query-pr-single.pl?number=36975
 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
 
 .include "../../devel/gmp/buildlink3.mk"
diff --git a/lang/guile/PLIST b/lang/guile/PLIST
index 73484326dfa..d2911ae460f 100644
--- a/lang/guile/PLIST
+++ b/lang/guile/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2007/06/12 03:02:33 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.19 2008/01/03 13:30:26 gdt Exp $
 bin/guile
 bin/guile-config
 bin/guile-snarf
@@ -258,6 +258,8 @@ share/guile/1.8/srfi/srfi-2.scm
 share/guile/1.8/srfi/srfi-26.scm
 share/guile/1.8/srfi/srfi-31.scm
 share/guile/1.8/srfi/srfi-34.scm
+share/guile/1.8/srfi/srfi-35.scm
+share/guile/1.8/srfi/srfi-37.scm
 share/guile/1.8/srfi/srfi-39.scm
 share/guile/1.8/srfi/srfi-4.scm
 share/guile/1.8/srfi/srfi-6.scm
diff --git a/lang/guile/distinfo b/lang/guile/distinfo
index 97dae50b6b9..b1d5fb14959 100644
--- a/lang/guile/distinfo
+++ b/lang/guile/distinfo
@@ -1,14 +1,10 @@
-$NetBSD: distinfo,v 1.32 2007/12/28 01:00:10 gdt Exp $
+$NetBSD: distinfo,v 1.33 2008/01/03 13:30:26 gdt Exp $
 
-SHA1 (guile-1.8.2.tar.gz) = b5c624b152a45f302e185e20a468a02f2eb73e38
-RMD160 (guile-1.8.2.tar.gz) = aa7af82866457caa6521817bf49e895f6b1c350c
-Size (guile-1.8.2.tar.gz) = 3762973 bytes
+SHA1 (guile-1.8.3.tar.gz) = 26cf7b70d4caff8fe2a5fbcc363f2457bc591c2b
+RMD160 (guile-1.8.3.tar.gz) = 6255e99dbd175700dba6b861aaa64631c5bd6d49
+Size (guile-1.8.3.tar.gz) = 3871450 bytes
 SHA1 (patch-aa) = 37fdeb8171b13468bfd0fa4e45aaf1770b8668ea
-SHA1 (patch-ab) = d54a49a8cd24cb4925d7f1ef07f4e1ff6be71506
 SHA1 (patch-ae) = 479e1f1452c0589910aa757087743fa18f4de994
 SHA1 (patch-ag) = 8aeb781ba43597f37b1ce4aaa2fb0baba2e4ce9c
 SHA1 (patch-ah) = 7a33742c2b4ae21a6e673ceeccc48ccae6a26ba3
 SHA1 (patch-aj) = bcb095105f4a956a1766052893f0545f22e8b25f
-SHA1 (patch-ak) = 611701d9e768239b258d6144e451db8dc527945a
-SHA1 (patch-al) = 6038b669cebd4e096520b19eae5957364e5a447f
-SHA1 (patch-am) = b3f6a482a1edd2f9ff3ecb99e42e78c69e0a2739
diff --git a/lang/guile/patches/patch-ab b/lang/guile/patches/patch-ab
deleted file mode 100644
index 2a0b14226e2..00000000000
--- a/lang/guile/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2007/12/28 01:00:11 gdt Exp $
-
---- libguile/numbers.c.orig	2007-05-09 16:22:03.000000000 -0400
-+++ libguile/numbers.c
-@@ -6011,7 +6011,7 @@ SCM_DEFINE (scm_log, "log", 1, 0, 0,
- {
-   if (SCM_COMPLEXP (z))
-     {
--#if HAVE_COMPLEX_DOUBLE
-+#if HAVE_COMPLEX_DOUBLE && HAVE_CLOG
-       return scm_from_complex_double (clog (SCM_COMPLEX_VALUE (z)));
- #else
-       double re = SCM_COMPLEX_REAL (z);
-@@ -6077,7 +6077,7 @@ SCM_DEFINE (scm_exp, "exp", 1, 0, 0,
- {
-   if (SCM_COMPLEXP (z))
-     {
--#if HAVE_COMPLEX_DOUBLE
-+#if HAVE_COMPLEX_DOUBLE && HAVE_CEXP
-       return scm_from_complex_double (cexp (SCM_COMPLEX_VALUE (z)));
- #else
-       return scm_c_make_polar (exp (SCM_COMPLEX_REAL (z)),
diff --git a/lang/guile/patches/patch-ak b/lang/guile/patches/patch-ak
deleted file mode 100644
index b526abcb2fb..00000000000
--- a/lang/guile/patches/patch-ak
+++ /dev/null
@@ -1,134 +0,0 @@
-$NetBSD: patch-ak,v 1.6 2007/07/20 00:09:23 gdt Exp $
-
-Avoid lots of errors like this on NetBSD/alpha:
-test-conversion.c:32: warning: long long int format, scm_t_intmax arg (arg 4)
-which in turn causes the build to fail since guile uses -Wall -Werror.
-
---- test-suite/standalone/test-conversion.c.orig	2007-05-09 16:22:03.000000000 -0400
-+++ test-suite/standalone/test-conversion.c
-@@ -29,7 +29,7 @@ test_1 (const char *str, scm_t_intmax mi
-   if (r != result)
-     {
-       fprintf (stderr, "fail: scm_is_signed_integer (%s, %Ld, %Ld) == %d\n",
--	       str, min, max, result);
-+	       str, (long long) min, (long long) max, result);
-       exit (1);
-     }
- }
-@@ -114,7 +114,7 @@ test_2 (const char *str, scm_t_uintmax m
-   if (r != result)
-     {
-       fprintf (stderr, "fail: scm_is_unsigned_integer (%s, %Lu, %Lu) == %d\n",
--	       str, min, max, result);
-+	       str, (unsigned long long) min, (unsigned long long) max, result);
-       exit (1);
-     }
- }
-@@ -234,7 +234,7 @@ test_3 (const char *str, scm_t_intmax mi
- 	{
- 	  fprintf (stderr,
- 		   "fail: scm_to_signed_int (%s, %Ld, %Ld) -> out of range\n",
--		   str, min, max);
-+		   str, (long long) min, (long long) max);
- 	  exit (1);
- 	}
-     }
-@@ -246,7 +246,7 @@ test_3 (const char *str, scm_t_intmax mi
- 	{
- 	  fprintf (stderr,
- 		   "fail: scm_to_signed_int (%s, %Ld, %Ld) -> wrong type\n",
--		   str, min, max);
-+		   str, (long long) min, (long long) max);
- 	  exit (1);
- 	}
-     }
-@@ -259,7 +259,7 @@ test_3 (const char *str, scm_t_intmax mi
- 	{
- 	  fprintf (stderr,
- 		   "fail: scm_to_signed_int (%s, %Ld, %Ld) = %Ld\n",
--		   str, min, max, result);
-+		   str, (long long) min, (long long) max, (long long) result);
- 	  exit (1);
- 	}
-     }
-@@ -366,7 +366,7 @@ test_4 (const char *str, scm_t_uintmax m
- 	{
- 	  fprintf (stderr,
- 		   "fail: scm_to_unsigned_int (%s, %Lu, %Lu) -> out of range\n",
--		   str, min, max);
-+		   str, (unsigned long long) min, (unsigned long long) max);
- 	  exit (1);
- 	}
-     }
-@@ -378,7 +378,7 @@ test_4 (const char *str, scm_t_uintmax m
- 	{
- 	  fprintf (stderr,
- 		   "fail: scm_to_unsigned_int (%s, %Lu, %Lu) -> wrong type\n",
--		   str, min, max);
-+		   str, (unsigned long long) min, (unsigned long long) max);
- 	  exit (1);
- 	}
-     }
-@@ -391,7 +391,7 @@ test_4 (const char *str, scm_t_uintmax m
- 	{
- 	  fprintf (stderr,
- 		   "fail: scm_to_unsigned_int (%s, %Lu, %Lu) == %Lu\n",
--		   str, min, max, result);
-+		   str, (unsigned long long) min, (unsigned long long) max, (unsigned long long) result);
- 	  exit (1);
- 	}
-     }
-@@ -447,7 +447,7 @@ test_5 (scm_t_intmax val, const char *re
-   if (scm_is_false (scm_equal_p (scm_from_signed_integer (val), res)))
-     {
-       fprintf (stderr, "fail: scm_from_signed_integer (%Ld) == %s\n",
--	       val, result);
-+	       (long long) val, result);
-       exit (1);
-     }
- }
-@@ -479,7 +479,7 @@ test_6 (scm_t_uintmax val, const char *r
-   if (scm_is_false (scm_equal_p (scm_from_unsigned_integer (val), res)))
-     {
-       fprintf (stderr, "fail: scm_from_unsigned_integer (%Lu) == %s\n",
--	       val, result);
-+	       (unsigned long long) val, result);
-       exit (1);
-     }
- }
-@@ -507,7 +507,7 @@ test_7s (SCM n, scm_t_intmax c_n, const 
- 
-   if (scm_is_false (scm_equal_p (n, r)))
-     {
--      fprintf (stderr, "fail: %s (%Ld) == %s\n", func, c_n, result);
-+      fprintf (stderr, "fail: %s (%Ld) == %s\n", func, (long long) c_n, result);
-       exit (1);
-     }
- }
-@@ -521,7 +521,7 @@ test_7u (SCM n, scm_t_uintmax c_n, const
- 
-   if (scm_is_false (scm_equal_p (n, r)))
-     {
--      fprintf (stderr, "fail: %s (%Lu) == %s\n", func, c_n, result);
-+      fprintf (stderr, "fail: %s (%Lu) == %s\n", func, (unsigned long long) c_n, result);
-       exit (1);
-     }
- }
-@@ -580,7 +580,7 @@ test_8s (const char *str, scm_t_intmax (
- 	  || data.result != result)
- 	{
- 	  fprintf (stderr,
--		   "fail: %s (%s) = %Ld\n", func_name, str, result);
-+		   "fail: %s (%s) = %Ld\n", func_name, str, (long long) result);
- 	  exit (1);
- 	}
-     }
-@@ -638,7 +638,7 @@ test_8u (const char *str, scm_t_uintmax 
- 	  || data.result != result)
- 	{
- 	  fprintf (stderr,
--		   "fail: %s (%s) = %Ld\n", func_name, str, result);
-+		   "fail: %s (%s) = %Ld\n", func_name, str, (long long) result);
- 	  exit (1);
- 	}
-     }
diff --git a/lang/guile/patches/patch-al b/lang/guile/patches/patch-al
deleted file mode 100644
index c5af7a3c7af..00000000000
--- a/lang/guile/patches/patch-al
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-al,v 1.3 2007/12/28 01:00:11 gdt Exp $
-
-Fix the test and fix the output for the braces test needed on
-Solaris.
-
-(Note that previous versions of this patch adjusted the AC_SUBST call,
-and that change seems incorrect.)
-
---- configure.in.orig	2007-05-09 16:22:03.000000000 -0400
-+++ configure.in
-@@ -635,7 +635,7 @@ AC_CHECK_HEADERS([assert.h crt_externs.h
- #   isblank - available as a GNU extension or in C99
- #   _NSGetEnviron - Darwin specific
- #
--AC_CHECK_FUNCS([DINFINITY DQNAN chsize clog10 ctermid fesetround ftime ftruncate fchown getcwd geteuid gettimeofday gmtime_r ioctl lstat mkdir mknod nice pipe _pipe readdir_r readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction siginterrupt stat64 strftime strptime symlink sync sysconf tcgetpgrp tcsetpgrp times uname waitpid strdup system usleep atexit on_exit chown link fcntl ttyname getpwent getgrent kill getppid getpgrp fork setitimer getitimer strchr strcmp index bcopy memcpy rindex truncate unsetenv isblank _NSGetEnviron])
-+AC_CHECK_FUNCS([DINFINITY DQNAN chsize clog10 clog cexp ctermid fesetround ftime ftruncate fchown getcwd geteuid gettimeofday gmtime_r ioctl lstat mkdir mknod nice pipe _pipe readdir_r readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction siginterrupt stat64 strftime strptime symlink sync sysconf tcgetpgrp tcsetpgrp times uname waitpid strdup system usleep atexit on_exit chown link fcntl ttyname getpwent getgrent kill getppid getpgrp fork setitimer getitimer strchr strcmp index bcopy memcpy rindex truncate unsetenv isblank _NSGetEnviron])
- 
- # Reasons for testing:
- #   netdb.h - not in mingw
-@@ -1120,6 +1120,15 @@ case "$with_threads" in
-     # glibc (2.3.6 at least) works both with or without braces, so the
-     # test checks whether it works without.
-     #
-+    # If we're using GCC, ask for aggressive warnings.  Otherwise the test
-+    # below for braces may pass but then fail during compilation due to 
-+    # stricter checks at compile time
-+    case "$GCC" in
-+        yes )
-+            CFLAGS="${CFLAGS} -Wall -Werror"
-+            ;;
-+    esac
-+
-     AC_CACHE_CHECK([whether PTHREAD_ONCE_INIT needs braces],
-       guile_cv_need_braces_on_pthread_once_init,
-       [AC_TRY_COMPILE([#include <pthread.h>],
diff --git a/lang/guile/patches/patch-am b/lang/guile/patches/patch-am
deleted file mode 100644
index 95a5edbb3bf..00000000000
--- a/lang/guile/patches/patch-am
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-am,v 1.3 2007/12/28 01:00:11 gdt Exp $
-
-regen from patched configure.in
-
---- configure.orig	2007-07-15 10:27:53.000000000 -0400
-+++ configure
-@@ -942,11 +942,11 @@ POSUB
- ALLOCA
- SCM_I_GSC_USE_PTHREAD_THREADS
- SCM_I_GSC_USE_NULL_THREADS
--SCM_I_GSC_NEED_BRACES_ON_PTHREAD_ONCE_INIT
- acx_pthread_config
- PTHREAD_CC
- PTHREAD_LIBS
- PTHREAD_CFLAGS
-+SCM_I_GSC_NEED_BRACES_ON_PTHREAD_ONCE_INIT
- cross_compiling
- CC_FOR_BUILD
- CCLD_FOR_BUILD
-@@ -34925,7 +34925,7 @@ done
- 
- 
- 
--for ac_func in DINFINITY DQNAN chsize clog10 ctermid fesetround ftime ftruncate fchown getcwd geteuid gettimeofday gmtime_r ioctl lstat mkdir mknod nice pipe _pipe readdir_r readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction siginterrupt stat64 strftime strptime symlink sync sysconf tcgetpgrp tcsetpgrp times uname waitpid strdup system usleep atexit on_exit chown link fcntl ttyname getpwent getgrent kill getppid getpgrp fork setitimer getitimer strchr strcmp index bcopy memcpy rindex truncate unsetenv isblank _NSGetEnviron
-+for ac_func in DINFINITY DQNAN chsize clog10 clog cexp ctermid fesetround ftime ftruncate fchown getcwd geteuid gettimeofday gmtime_r ioctl lstat mkdir mknod nice pipe _pipe readdir_r readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction siginterrupt stat64 strftime strptime symlink sync sysconf tcgetpgrp tcsetpgrp times uname waitpid strdup system usleep atexit on_exit chown link fcntl ttyname getpwent getgrent kill getppid getpgrp fork setitimer getitimer strchr strcmp index bcopy memcpy rindex truncate unsetenv isblank _NSGetEnviron
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -41504,7 +41504,6 @@ fi
- 
- SCM_I_GSC_NEED_BRACES_ON_PTHREAD_ONCE_INIT=0
- 
--
- case "$with_threads" in
-   "yes" | "pthread" | "pthreads" | "pthread-threads" | "")
- 
-@@ -42053,6 +42052,16 @@ done
-     # glibc (2.3.6 at least) works both with or without braces, so the
-     # test checks whether it works without.
-     #
-+
-+    # If we're using GCC, ask for aggressive warnings.  Otherwise the test
-+    # below for braces may pass but then fail during compilation due to
-+    # stricter checks at compile time
-+    case "$GCC" in
-+        yes )
-+            CFLAGS="${CFLAGS} -Wall -Werror"
-+            ;;
-+    esac
-+
-     { echo "$as_me:$LINENO: checking whether PTHREAD_ONCE_INIT needs braces" >&5
- echo $ECHO_N "checking whether PTHREAD_ONCE_INIT needs braces... $ECHO_C" >&6; }
- if test "${guile_cv_need_braces_on_pthread_once_init+set}" = set; then
-@@ -42102,7 +42111,7 @@ rm -f core conftest.err conftest.$ac_obj
- fi
- { echo "$as_me:$LINENO: result: $guile_cv_need_braces_on_pthread_once_init" >&5
- echo "${ECHO_T}$guile_cv_need_braces_on_pthread_once_init" >&6; }
--    if test "$guile_cv_need_braces_on_pthread_once_init" = yes; then
-+    if test "$guile_cv_need_braces_on_pthread_once_init" = "yes"; then
-       SCM_I_GSC_NEED_BRACES_ON_PTHREAD_ONCE_INIT=1
-     fi
- 
-@@ -42195,6 +42204,8 @@ fi
- 
-   ;;
- esac
-+SCM_I_GSC_NEED_BRACES_ON_PTHREAD_ONCE_INIT=$SCM_I_GSC_NEED_BRACES_ON_PTHREAD_ONCE_INIT
-+
- 
- case "$with_threads" in
-   "pthreads")
-@@ -43377,11 +43388,11 @@ POSUB!$POSUB$ac_delim
- ALLOCA!$ALLOCA$ac_delim
- SCM_I_GSC_USE_PTHREAD_THREADS!$SCM_I_GSC_USE_PTHREAD_THREADS$ac_delim
- SCM_I_GSC_USE_NULL_THREADS!$SCM_I_GSC_USE_NULL_THREADS$ac_delim
--SCM_I_GSC_NEED_BRACES_ON_PTHREAD_ONCE_INIT!$SCM_I_GSC_NEED_BRACES_ON_PTHREAD_ONCE_INIT$ac_delim
- acx_pthread_config!$acx_pthread_config$ac_delim
- PTHREAD_CC!$PTHREAD_CC$ac_delim
- PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim
- PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim
-+SCM_I_GSC_NEED_BRACES_ON_PTHREAD_ONCE_INIT!$SCM_I_GSC_NEED_BRACES_ON_PTHREAD_ONCE_INIT$ac_delim
- cross_compiling!$cross_compiling$ac_delim
- CC_FOR_BUILD!$CC_FOR_BUILD$ac_delim
- CCLD_FOR_BUILD!$CCLD_FOR_BUILD$ac_delim