[pkgsrc/trunk]: pkgsrc/lang/guile Update to 1.8.2. Several patches are now a...

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8614b7b83d61
branches:  trunk
changeset: 531110:8614b7b83d61
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Fri Jul 20 00:09:21 2007 +0000

description:
Update to 1.8.2.  Several patches are now applied upstream.  Several
others required significant adjustment due to upstream changes.
Tested on NetBSD-current/i386.

Changes in 1.8.2 (since 1.8.1):

* New procedures (see the manual for details)

** set-program-arguments
** make-vtable

* Incompatible changes

** The body of a top-level `define' no longer sees the binding being created

In a top-level `define', the binding being created is no longer visible
from the `define' body.  This breaks code like
"(define foo (begin (set! foo 1) (+ foo 1)))", where `foo' is now
unbound in the body.  However, such code was not R5RS-compliant anyway,
per Section 5.2.1.

* Bugs fixed

** Fractions were not `equal?' if stored in unreduced form.
(A subtle problem, since printing a value reduced it, making it work.)
** srfi-60 `copy-bit' failed on 64-bit systems
** "guile --use-srfi" option at the REPL can replace core functions
(Programs run with that option were ok, but in the interactive REPL
the core bindings got priority, preventing SRFI replacements or
extensions.)
** `regexp-exec' doesn't abort() on #\nul in the input or bad flags arg
** `kill' on mingw throws an error for a PID other than oneself
** Procedure names are attached to procedure-with-setters
** Array read syntax works with negative lower bound
** `array-in-bounds?' fix if an array has different lower bounds on each index
** `*' returns exact 0 for "(* inexact 0)"
This follows what it always did for "(* 0 inexact)".
** SRFI-19: Value returned by `(current-time time-process)' was incorrect
** SRFI-19: `date->julian-day' did not account for timezone offset
** `ttyname' no longer crashes when passed a non-tty argument
** `inet-ntop' no longer crashes on SPARC when passed an `AF_INET' address
** Small memory leaks have been fixed in `make-fluid' and `add-history'
** GOOPS: Fixed a bug in `method-more-specific?'
** Build problems on Solaris fixed
** Build problems on HP-UX IA64 fixed
** Build problems on MinGW fixed

diffstat:

 lang/guile/Makefile         |      4 +-
 lang/guile/distinfo         |     27 +-
 lang/guile/patches/patch-aa |      4 +-
 lang/guile/patches/patch-ae |      4 +-
 lang/guile/patches/patch-af |     41 -
 lang/guile/patches/patch-ag |     25 +-
 lang/guile/patches/patch-ah |      4 +-
 lang/guile/patches/patch-aj |      6 +-
 lang/guile/patches/patch-ak |      4 +-
 lang/guile/patches/patch-al |     49 +-
 lang/guile/patches/patch-am |  11824 +-----------------------------------------
 lang/guile/patches/patch-ao |     42 -
 lang/guile/patches/patch-ap |     15 -
 13 files changed, 69 insertions(+), 11980 deletions(-)

diffs (truncated from 12195 to 300 lines):

diff -r 84476b02ffa2 -r 8614b7b83d61 lang/guile/Makefile
--- a/lang/guile/Makefile       Thu Jul 19 23:38:35 2007 +0000
+++ b/lang/guile/Makefile       Fri Jul 20 00:09:21 2007 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.74 2007/06/12 19:49:28 joerg Exp $
+# $NetBSD: Makefile,v 1.75 2007/07/20 00:09:21 gdt Exp $
 
-DISTNAME=              guile-1.8.1
+DISTNAME=              guile-1.8.2
 CATEGORIES=            lang
 MASTER_SITES=          ${MASTER_SITE_GNU:=guile/}
 
diff -r 84476b02ffa2 -r 8614b7b83d61 lang/guile/distinfo
--- a/lang/guile/distinfo       Thu Jul 19 23:38:35 2007 +0000
+++ b/lang/guile/distinfo       Fri Jul 20 00:09:21 2007 +0000
@@ -1,16 +1,13 @@
-$NetBSD: distinfo,v 1.30 2007/06/12 03:02:34 dmcmahill Exp $
+$NetBSD: distinfo,v 1.31 2007/07/20 00:09:21 gdt Exp $
 
-SHA1 (guile-1.8.1.tar.gz) = 184555def153fdbc322045b1fdd90a7b23a84fbd
-RMD160 (guile-1.8.1.tar.gz) = 9d15620de8f29aa1a2e0e445e338dc95f1b27c50
-Size (guile-1.8.1.tar.gz) = 3811979 bytes
-SHA1 (patch-aa) = 6d522c5e324a65fb7418887c87d6634efb1bcd82
-SHA1 (patch-ae) = b03df3f10946bdab572e70131a06c55f5fb45d15
-SHA1 (patch-af) = beeb85f1e347300b5eff8820e0d27ce494f6dbc8
-SHA1 (patch-ag) = 1dc4687bd1a3647c5f877fcfb1fc85ff0f11e05f
-SHA1 (patch-ah) = cfc1b0bf0b79fc94d356761b4c8f0e229e96897d
-SHA1 (patch-aj) = 82b9c1fa573582dccb230e2636711f657f2cb9d2
-SHA1 (patch-ak) = e1a4a72882a295df4a5297cb9bb9581287d062bc
-SHA1 (patch-al) = d370a64be31173e1473e81bdddd0ac93d32e2179
-SHA1 (patch-am) = 6eef960b461dba3c20c929bb1bd48d9d62a5d2e6
-SHA1 (patch-ao) = a2e7644f8f55b0483d7cccf5b32bbd5a7dc0d49f
-SHA1 (patch-ap) = 867547f687ea4de5f0f8dbfbc32d91664542560f
+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 (patch-aa) = 37fdeb8171b13468bfd0fa4e45aaf1770b8668ea
+SHA1 (patch-ae) = 479e1f1452c0589910aa757087743fa18f4de994
+SHA1 (patch-ag) = 8aeb781ba43597f37b1ce4aaa2fb0baba2e4ce9c
+SHA1 (patch-ah) = 7a33742c2b4ae21a6e673ceeccc48ccae6a26ba3
+SHA1 (patch-aj) = bcb095105f4a956a1766052893f0545f22e8b25f
+SHA1 (patch-ak) = 611701d9e768239b258d6144e451db8dc527945a
+SHA1 (patch-al) = b3cd5064fb3f91ea28fe9375b8fc15de05e4258b
+SHA1 (patch-am) = 396b184df21a89ba8a8be6e887b089f6cbcfa7f7
diff -r 84476b02ffa2 -r 8614b7b83d61 lang/guile/patches/patch-aa
--- a/lang/guile/patches/patch-aa       Thu Jul 19 23:38:35 2007 +0000
+++ b/lang/guile/patches/patch-aa       Fri Jul 20 00:09:21 2007 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.10 2007/06/12 03:02:34 dmcmahill Exp $
+$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      2006-02-18 06:08:45.000000000 +0000
+--- libguile/guile.c.orig      2007-05-09 16:22:03.000000000 -0400
 +++ libguile/guile.c
 @@ -68,7 +68,7 @@ main (int argc, char **argv)
  {
diff -r 84476b02ffa2 -r 8614b7b83d61 lang/guile/patches/patch-ae
--- a/lang/guile/patches/patch-ae       Thu Jul 19 23:38:35 2007 +0000
+++ b/lang/guile/patches/patch-ae       Fri Jul 20 00:09:21 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.12 2007/06/12 03:02:34 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.13 2007/07/20 00:09:22 gdt Exp $
 
 support for NetBSD/alpha, NetBSD/sparc64, and NetBSD/x86_64
 
---- libguile/gc_os_dep.c.orig  2006-04-15 23:34:26.000000000 +0000
+--- libguile/gc_os_dep.c.orig  2007-05-09 16:22:03.000000000 -0400
 +++ libguile/gc_os_dep.c
 @@ -110,6 +110,11 @@ typedef int GC_bool;
  #    define OPENBSD
diff -r 84476b02ffa2 -r 8614b7b83d61 lang/guile/patches/patch-af
--- a/lang/guile/patches/patch-af       Thu Jul 19 23:38:35 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-$NetBSD: patch-af,v 1.4 2007/06/12 03:02:34 dmcmahill Exp $
-
-Avoid a segfault if ttyname returns NULL.  Observed on NetBSD-2/alpha.
-
-Avoid len being undefined on solaris-2.9.  This guile function still
-doesn't work right on solaris-2.9 which is missing unsetenv().
-
---- libguile/posix.c.orig      2006-10-04 03:35:07.000000000 +0000
-+++ libguile/posix.c
-@@ -831,14 +831,20 @@ SCM_DEFINE (scm_ttyname, "ttyname", 1, 0
-   scm_i_scm_pthread_mutex_lock (&scm_i_misc_mutex);
-   SCM_SYSCALL (result = ttyname (fd));
-   err = errno;
--  ret = scm_from_locale_string (result);
--  scm_i_pthread_mutex_unlock (&scm_i_misc_mutex);
- 
-   if (!result)
-     {
-       errno = err;
-       SCM_SYSERROR;
-+      ret = scm_from_locale_string ("unknown");
-+    }
-+  else
-+    {
-+      ret = scm_from_locale_string (result);
-     }
-+
-+  scm_i_pthread_mutex_unlock (&scm_i_misc_mutex);
-+
-   return ret;
- }
- #undef FUNC_NAME
-@@ -1312,7 +1318,7 @@ SCM_DEFINE (scm_putenv, "putenv", 1, 0, 
- {
-   int rv;
-   char *c_str = scm_to_locale_string (str);
--#ifdef __MINGW32__
-+#if defined(__MINGW32__) || !defined(HAVE_UNSETENV)
-   size_t len = strlen (c_str);
- #endif
- 
diff -r 84476b02ffa2 -r 8614b7b83d61 lang/guile/patches/patch-ag
--- a/lang/guile/patches/patch-ag       Thu Jul 19 23:38:35 2007 +0000
+++ b/lang/guile/patches/patch-ag       Fri Jul 20 00:09:21 2007 +0000
@@ -1,18 +1,19 @@
-$NetBSD: patch-ag,v 1.4 2007/06/12 03:02:34 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.5 2007/07/20 00:09:22 gdt Exp $
 
 solaris-2.9 does not have stdint.h but does have inttypes.h
 
---- ./libguile/c-tokenize.c.orig       2003-08-23 13:35:14.000000000 -0400
-+++ ./libguile/c-tokenize.c    2007-06-04 14:43:50.729966000 -0400
-@@ -21,5 +21,11 @@
- #include <errno.h>
- #include <stdlib.h>
+--- libguile/c-tokenize.c.orig 2007-06-13 18:00:56.000000000 -0400
++++ libguile/c-tokenize.c
+@@ -39,7 +39,12 @@
+ #define __STDC_LIMIT_MACROS 1
+ #endif
+ 
 +#ifdef HAVE_STDINT_H
- #include <stdint.h> /* May break IA64 test-noansi-r */
++#include <stdint.h> /* May break IA64 test-noansi-r */
 +#else
-+#ifdef HAVE_INTTYPES_H
-+#include <inttypes.h>
+ #include <inttypes.h>
 +#endif
-+#endif
- 
- /* end standard C headers. */
++
+ typedef int8_t flex_int8_t;
+ typedef uint8_t flex_uint8_t;
+ typedef int16_t flex_int16_t;
diff -r 84476b02ffa2 -r 8614b7b83d61 lang/guile/patches/patch-ah
--- a/lang/guile/patches/patch-ah       Thu Jul 19 23:38:35 2007 +0000
+++ b/lang/guile/patches/patch-ah       Fri Jul 20 00:09:21 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.2 2007/06/12 03:02:34 dmcmahill Exp $
+$NetBSD: patch-ah,v 1.3 2007/07/20 00:09:23 gdt Exp $
 
---- guile-config/guile-config.in.orig  2006-09-20 00:19:02.000000000 +0000
+--- guile-config/guile-config.in.orig  2007-05-09 16:22:03.000000000 -0400
 +++ guile-config/guile-config.in
 @@ -155,7 +155,7 @@
                 (if (or (string=? libdir "/usr/lib")
diff -r 84476b02ffa2 -r 8614b7b83d61 lang/guile/patches/patch-aj
--- a/lang/guile/patches/patch-aj       Thu Jul 19 23:38:35 2007 +0000
+++ b/lang/guile/patches/patch-aj       Fri Jul 20 00:09:21 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.2 2007/06/12 03:02:35 dmcmahill Exp $
+$NetBSD: patch-aj,v 1.3 2007/07/20 00:09:23 gdt Exp $
 
---- libguile/_scm.h.orig       2006-10-04 03:35:06.000000000 +0000
+--- libguile/_scm.h.orig       2007-05-09 16:22:03.000000000 -0400
 +++ libguile/_scm.h
-@@ -116,7 +116,9 @@
+@@ -119,7 +119,9 @@
  # define SCM_SYSCALL(line) line;
  #endif /* ndef SCM_SYSCALL */
  
diff -r 84476b02ffa2 -r 8614b7b83d61 lang/guile/patches/patch-ak
--- a/lang/guile/patches/patch-ak       Thu Jul 19 23:38:35 2007 +0000
+++ b/lang/guile/patches/patch-ak       Fri Jul 20 00:09:21 2007 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ak,v 1.5 2007/06/12 03:02:35 dmcmahill Exp $
+$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       2006-07-29 18:00:18.000000000 +0000
+--- 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)
diff -r 84476b02ffa2 -r 8614b7b83d61 lang/guile/patches/patch-al
--- a/lang/guile/patches/patch-al       Thu Jul 19 23:38:35 2007 +0000
+++ b/lang/guile/patches/patch-al       Fri Jul 20 00:09:21 2007 +0000
@@ -1,32 +1,17 @@
-$NetBSD: patch-al,v 1.1 2007/06/12 03:02:35 dmcmahill Exp $
+$NetBSD: patch-al,v 1.2 2007/07/20 00:09:23 gdt Exp $
 
-echo -n is not portable and causes broken configure scripts.
-
-fix the test and fix the output for the braces test needed on
-solaris.
+Fix the test and fix the output for the braces test needed on
+Solaris.
 
---- ./configure.in.orig        2006-10-05 15:19:40.000000000 -0400
-+++ ./configure.in     2007-06-04 14:29:47.777075000 -0400
-@@ -28,6 +28,6 @@
- AC_PREREQ(2.53)
- 
--AC_INIT(m4_esyscmd(. ./GUILE-VERSION && echo -n ${PACKAGE}),
--        m4_esyscmd(. ./GUILE-VERSION && echo -n ${GUILE_VERSION}))
-+AC_INIT(m4_esyscmd(. ./GUILE-VERSION && printf ${PACKAGE}),
-+        m4_esyscmd(. ./GUILE-VERSION && printf ${GUILE_VERSION}))
- AC_CONFIG_AUX_DIR([.])
- AC_CONFIG_SRCDIR(GUILE-VERSION)
-@@ -1060,5 +1060,5 @@
-             , with_threads=yes)
- 
--AC_SUBST(SCM_I_GSC_NEED_BRACES_ON_PTHREAD_ONCE_INIT, 0)
-+SCM_I_GSC_NEED_BRACES_ON_PTHREAD_ONCE_INIT=0
- 
- case "$with_threads" in
-@@ -1088,4 +1088,14 @@
+(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
+@@ -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
@@ -38,16 +23,4 @@
 +
      AC_CACHE_CHECK([whether PTHREAD_ONCE_INIT needs braces],
        guile_cv_need_braces_on_pthread_once_init,
-@@ -1094,5 +1104,5 @@
-         [guile_cv_need_braces_on_pthread_once_init=no],
-         [guile_cv_need_braces_on_pthread_once_init=yes])])
--    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
-@@ -1105,4 +1115,5 @@
-   ;;
- esac
-+AC_SUBST([SCM_I_GSC_NEED_BRACES_ON_PTHREAD_ONCE_INIT], $SCM_I_GSC_NEED_BRACES_ON_PTHREAD_ONCE_INIT)
- 
- case "$with_threads" in
+       [AC_TRY_COMPILE([#include <pthread.h>],
diff -r 84476b02ffa2 -r 8614b7b83d61 lang/guile/patches/patch-am
--- a/lang/guile/patches/patch-am       Thu Jul 19 23:38:35 2007 +0000
+++ b/lang/guile/patches/patch-am       Fri Jul 20 00:09:21 2007 +0000
@@ -1,125 +1,11 @@
-$NetBSD: patch-am,v 1.1 2007/06/12 03:02:35 dmcmahill Exp $
+$NetBSD: patch-am,v 1.2 2007/07/20 00:09:23 gdt Exp $
 
 regen from patched configure.in
 
---- ./configure.orig   2006-10-06 23:54:24.000000000 -0400
-+++ ./configure        2007-06-04 14:30:42.044643000 -0400
-@@ -1,5 +1,5 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.60a for guile 1.8.1.
-+# Generated by GNU Autoconf 2.61 for guile 1.8.1.
- #
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-@@ -34,5 +34,6 @@
- ## --------------------- ##
- 
--# Be Bourne compatible
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-@@ -43,8 +44,11 @@
-   setopt NO_GLOB_SUBST
- else
--  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+  case `(set -o) 2>/dev/null` in
-+  *posix*) set -o posix ;;
-+esac
-+
- fi
--BIN_SH=xpg4; export BIN_SH # for Tru64
--DUALCASE=1; export DUALCASE # for MKS sh
-+
-+
-