Upgrade lang/gauche package to 0.6.3.

4 files changed, 119 insertions, 15 deletions

diff --git a/lang/gauche/patches/patch-ad b/lang/gauche/patches/patch-ad
deleted file mode 100644
index a206b2a4308..00000000000
--- a/lang/gauche/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/02/01 08:10:40 minoura Exp $
---- gc/include/private/gcconfig.h.orig	Fri Dec 21 18:40:17 2001
-+++ gc/include/private/gcconfig.h	Fri Feb  1 16:37:01 2002
-@@ -1012,6 +1012,11 @@
- #   endif
- #   ifdef NETBSD
- #	define OS_TYPE "NETBSD"
-+#       ifdef __ELF__
-+          /* minoura: I'm not sure this is safe; at least it seems to work on
-+             NetBSD/i386, ELF, but I haven't confirmed. */
-+#         define DYNAMIC_LOADING
-+#	endif
- #   endif
- #   ifdef THREE86BSD
- #	define OS_TYPE "THREE86BSD"
diff --git a/lang/gauche/patches/patch-ae b/lang/gauche/patches/patch-ae
new file mode 100644
index 00000000000..69cb6eb9a6a
--- /dev/null
+++ b/lang/gauche/patches/patch-ae
@@ -0,0 +1,30 @@
+#	$NetBSD: patch-ae,v 1.1 2002/10/02 08:25:16 minoura Exp $
+--- doc/Makefile.in.orig	Sun Sep  8 04:25:49 2002
++++ doc/Makefile.in	Tue Oct  1 06:17:22 2002
+@@ -12,7 +12,7 @@
+ prefix  = @prefix@
+ datadir = @datadir@
+ mandir  = $(datadir)/man/man1
+-infodir = $(datadir)/info
++infodir = $(prefix)/info
+ 
+ all: info
+ 
+@@ -63,7 +63,7 @@
+ 	texi2pdf gauche-refe.texi
+ 
+ gauche-refe.texi : gauche-ref.texi extract
+-	gosh ./extract -en -o gauche-refe.texi gauche-ref.texi
++	$(GOSH) ./extract -en -o gauche-refe.texi gauche-ref.texi
+ 
+ gauche-refe.info.gz : gauche-refe.texi
+ 	if test X$(MAKEINFO) != X -a X$(GZIP_PROGRAM) != X; then \
+@@ -85,7 +85,7 @@
+ 	texi2pdf gauche-refj.texi
+ 
+ gauche-refj.texi : gauche-ref.texi extract
+-	gosh ./extract -jp -o gauche-refj.texi gauche-ref.texi
++	$(GOSH) ./extract -jp -o gauche-refj.texi gauche-ref.texi
+ 
+ gauche-refj.info.gz : gauche-refj.texi
+ 	if test X$(MAKEINFO) != X -a X$(GZIP_PROGRAM) != X; then \
diff --git a/lang/gauche/patches/patch-af b/lang/gauche/patches/patch-af
new file mode 100644
index 00000000000..944df5761b3
--- /dev/null
+++ b/lang/gauche/patches/patch-af
@@ -0,0 +1,21 @@
+#	$NetBSD: patch-af,v 1.1 2002/10/02 08:25:17 minoura Exp $
+--- doc/gauche-ref.texi.orig	Sun Sep 22 09:58:17 2002
++++ doc/gauche-ref.texi	Tue Oct  1 06:03:49 2002
+@@ -3,9 +3,17 @@
+ @c EN
+ @setfilename gauche-refe.info
+ @settitle Gauche Reference Manual
++@dircategory The Algorithmic Language Scheme
++@direntry
++* Gauche Reference: (gauche-refe.info).	An R5RS Scheme implementation.
++@end direntry
+ @c JP
+ @setfilename gauche-refj.info
+ @settitle Gauche リファレンスマニュアル
++@dircategory The Algorithmic Language Scheme
++@direntry
++* Gauche Reference (ja): (gauche-refj.info).	An R5RS Scheme implementation.
++@end direntry
+ @c COMMON
+ @comment %**end of header
+ 
diff --git a/lang/gauche/patches/patch-ba b/lang/gauche/patches/patch-ba
new file mode 100644
index 00000000000..df0b4c3367b
--- /dev/null
+++ b/lang/gauche/patches/patch-ba
@@ -0,0 +1,68 @@
+#	$NetBSD: patch-ba,v 1.1 2002/10/02 08:25:17 minoura Exp $
+
+There is a problem in ext/charconv/jconv.c which may
+cause gosh hang, due to the wrong state management.
+Specifically, it happens if you specify "iso-2022-jp"
+as the output code, instead of "iso2022jp" or "iso2022-jp".
+
+--shiro
+
+
+
+*** ext/charconv/jconv.c	17 Jun 2002 05:41:04 -0000	1.9
+--- ext/charconv/jconv.c	26 Sep 2002 05:22:59 -0000
+***************
+*** 1294,1299 ****
+--- 1294,1305 ----
+  
+  /* case (5) */
+  #ifdef HAVE_ICONV_H
++ /* NB: although iconv manages states, we need to keep track of whether
++  * we're sure in default status (JIS_ASCII) or not (we use JIS_UNKNOWN for it).
++  * It's because jconv_iconv_reset will be called twice if there is any
++  * reset sequence; the first call should emit the sequence, but the second
++  * call shoudn't.
++  */
+  static size_t jconv_iconv(ScmConvInfo *info, const char **iptr, size_t *iroom,
+                            char **optr, size_t *oroom)
+  {
+***************
+*** 1302,1307 ****
+--- 1308,1314 ----
+      fprintf(stderr, "jconv_iconv %s->%s\n", info->fromCode, info->toCode);
+  #endif
+      r = iconv(info->handle, (char **)iptr, iroom, optr, oroom);
++     info->ostate = JIS_UNKNOWN;
+      if (r == (size_t)-1) {
+          if (errno == EINVAL) return INPUT_NOT_ENOUGH;
+          if (errno == E2BIG)  return OUTPUT_NOT_ENOUGH;
+***************
+*** 1315,1325 ****
+  static size_t jconv_iconv_reset(ScmConvInfo *info, char *optr, size_t oroom)
+  {
+      size_t oroom_prev = oroom;
+!     size_t r = iconv(info->handle, NULL, 0, &optr, &oroom);
+      if (r == (size_t)-1) {
+          if (errno == E2BIG)  return OUTPUT_NOT_ENOUGH;
+          Scm_Panic("jconv_iconv_reset: unknown error number %d\n", errno);
+      }
+      return oroom_prev - oroom;
+  }
+  #endif /*HAVE_ICONV_H*/
+--- 1322,1335 ----
+  static size_t jconv_iconv_reset(ScmConvInfo *info, char *optr, size_t oroom)
+  {
+      size_t oroom_prev = oroom;
+!     size_t r;
+!     if (info->ostate == JIS_ASCII) return 0;
+!     r = iconv(info->handle, NULL, 0, &optr, &oroom);
+      if (r == (size_t)-1) {
+          if (errno == E2BIG)  return OUTPUT_NOT_ENOUGH;
+          Scm_Panic("jconv_iconv_reset: unknown error number %d\n", errno);
+      }
++     info->ostate = JIS_ASCII;
+      return oroom_prev - oroom;
+  }
+  #endif /*HAVE_ICONV_H*/
+
+