Update gauche to 0.9.4. Changes are:

Release 0.9.4

Major feature upgrade

  * R7RS support
  * Notable improvements
  * A bunch of new procedures and enhancements
  * Tons of bug fixes
      + Fixes that may break the compatibility
      + Miscellaneous fixes

R7RS support

Gauche now supports R7RS-small ( http://r7rs.org/ ). It can load R7RS libraries
and execute R7RS scripts seamlessly. (There are minor caveats; see ref:Standard
conformance). See also ref:Library modules - R7RS integration for the details
of how R7RS is integrated.

The backward compatibility to the legacy Gauche code is kept as much as
possible; in short, you can keep using existing Gauche code and write new code
in pretty much the same way.

It's up to you to write code in traditional Gauche way or R7RS way: If you plan
to make the code portable, you may want to stick with R7RS, but if you need to
depend on lots of Gauche-specific libraries, there's not much point to adopt
R7RS structure, for you can't run it in other implementations anyway.

Notable improvements

  * REPL is slightly improved: You can access history (ref:Working in REPL).
    And describe shows known bindings when called on symbols. The default
    writer now do not show shared structures, for it confused newcomers; it
    still shows circular structures in srfi:38 notation.
  * data.random: Random data generators.
  * math.prime module for lazy sequence of primes, testing primality, and prime
    factorization.
  * srfi-106: Basic socket interface.
  * PIPE signal handling is changed. By default, Gauche effectively ignores
    SIGPIPE; the system calls will generate EPIPE system-error instead. Since
    the signal delivery timing differ in the Scheme world from C world,
    handling SIGPIPE reasonably is difficult, while handling system error is
    straightforward and synchronous. Note that EPIPE error from stdout and
    stderr terminates the process immediately, so that the Gauche script don't
    spit error messsages when used in command pipelines and the destination
    command exits prematurely. See ref:Handling signals for the details.
  * write and display is now R7RS; that is, they won't explode by circular
    structures.
  * On Windows, system interface functions now properly handles multibyte
    filenames, command-line arguments and enviornment variables. Contribution
    from SAITO Atsushi.

A bunch of new procedures and enhancements

  * New numerical procedures:
      + On rationalization: rationalize, real->rational, continued-fraction;
        see Gauche-blog:20120925-rationalize. As a bonus, now converting
        flonums to exact number can produce more readable (simple) rational
        numbers; see Gauche-blog:20120930-exact.
      + On integer operations: exact-integer? (r7rs) expt-mod, twos-exponent,
        twos-exponent-factor,
      + Gamma functions: gamma, lgamma.
      + r7rs division operators floor/, floor-quotient, floor-remainder,
        truncate/, truncate-quotient, truncate-remainder.
  * expt now returns exact value if possible, even the exponent is non-integer
    (but exact rational).
  * New list and vector procedures: length<=?, list-set!, vector-map (r7rs),
    vector-for-each (r7rs), vector-tabulate.
  * New regex procedures: rxmatch-substrings, rxmatch-positions,
    rxmatch-named-groups.
      + Also, regex objects now have read-write invariance.
  * rfc.json: Now you can customize mappings between json array/object and
    Scheme objects. Also parse-json* is added to parse multiple JSON objects
    from a single source.
  * gauche.generator: New procedures: gconcatenate, gmerge, gbuffer-filter.
  * gauche.lazy: New procedure: lconcatenate
  * gauche.uvector:
      + u8vector-multi-copy!, u8vector-append (and all other TAG variations).
      + string->u8vector etc.: Added immutable? optional argument to produce
        immutable uvector, which avoids copying the string contents. u8vector->
        string also avoids copying if the source vector is immutable.
  * rfc.http: Support for basic authentication added.
  * file.filter: file-filter may leave the destination file untouched if it
    won't be changed, by :leave-unchanged option. Also added new procedures:
    file-filter-for-each, file-filter-fold, file-filter-map.
  * You can now load script from non-regular files (e.g. device files). Useful
    for one-liner such as gosh -E... /dev/null.
  * Char-set now adopts collection framework, and also they're applicable
    object to test membership.
  * Trie (util.trie) now adopts dictionary framework.
  * make-tree-map accepts single compare argument instead of = and <.
  * rfc.hmac: Pick appropriate block size according to the digest algorithm
    metaclasses.
  * string-split: Accept an optional argument to limit the number of the
    result, much like Perl's similar operator.
  * command-line (r7rs)
  * include and include-ci (r7rs)
  * util.sparse: sparse-vector-ref and sparse-table-ref now have generalized
    setters.
  * symbol=?, boolean=? (r7rs).
  * Reader supports #true and #false for r7rs.
  * Negative zeros (-0.0) are recognized when it matters.
  * generator-find
  * cond-expand supports library clause (r7rs).
  * text.unicode: utf8->string, string->utf8 (r7rs); string-ci=? etc. that
    handles Unicode full case mapping, as required by R7RS.
  * dotimes and dolist now supports omission of variable.
  * letrec* (r7rs).
  * rfc.base64: base64-decode and base64-encode support :url-safe keyword
    argument to use url-safe alternative characters.
  * syntax-rules: Support r7rs enhancements.
  * define-values: Made r7rs compliant.
  * sys-errno->symbol, sys-symbol->errno.
  * Built-in sort procedures now supports srfi-95. See ref:Comparison and
    sorting.
  * digit->integer, integer->digit: Extended to handle digit characters other
    than [0-9]; Unicode defines a bunch of them.
  * gauche.dictionary: Bimap can have default conflict resolution.
  * os.windows: Console procedures are enhanced. Contribution from github.com/
    Hamayama.

Tons of bug fixes

Fixes that may break the compatibility

  * The reader syntax \xNN is now interpreted as R7RS-way by default
    (semicolon-terminated, Unicode codepoint). If we don't find the terminating
    semicolon, we interpret it as the legacy syntax. However, there are
    ambiguous cases that lead to incompatible behavior. You can switch the
    reader mode by reader-lexical-mode to make it fully comatiple to the old
    Gauche.
  * The hash function for char-set behaved poorly, so we changed it. If you
    have saved the hash value of char-sets in the previous versions of Gauche,
    you need to recalculate them.
  * We no longer coerce the result to inexact when dividing an exact numebr by
    exact zero; we used to return +inf.0, but that interpretation is no longer
    allowed since R6RS. Now it raises an error.
  * It is now an error to pass strings containing NUL characters to external
    libraries that expects strings. For example, passing "foo.scm\0.exe" to
    open-input-file throws an error. Allowing it would make potential security
    issue. If you need to pass a byte array that may contain 0, consider using
    u8vector instead of strings.
  * copy-bit-field: The argument order is switched - Gauche was following the
    old SLIB interface, but it was changed during SRFI-60 discussion. We now
    comply the new argument order for the portability, and the old code that
    uses this procedure need to be changed.
  * rfc.uri: Use uppercase for percent-encoding of special chars, as
    recommended in RFC3986. Watch out if the code relying on the case of
    percent-encoding.
  * srfi-13: Switched the argument order of string-filter and string-delete;
    they are changed after finalization, to be in sync with srfi:13's reference
    implementation. (Usually reference implementation is fixed to match the
    spec, but in this case, quite a few Scheme implementations had been using
    the reference implementation as it was, and changing it would have broken
    existing code.) Fortunately we could support both order so that the
    existing code will keep working, but we recommend to change the code to
    match the new order if possible.

Miscellaneous fixes

  * Fix: thread-terminate! caused SEGV when called on a thread that's not
    running.
  * Fix: Character reader produced incorrect values in some #\uxxxxx input.
  * Fixed incorrect/missing stack traces, contributed from Vitaly Magerya.
  * Fixed subtle bugs in conversion between rationals and flonums.
  * util.match: Fixed match-define.
  * force: Fixed leak, introduced between 0.9.2 and 0.9.3.
  * write-ber-integer ignored the port argument.
  * gauche.net: On Windows, the socket code had a fd leak.
  * text.diff: diff ignored :equal keyword argument.
  * rfc.tls: Fixed file descriptor leak.
  * rfc.json: Propertly handles surrogate pairs.
  * unwind-protect: The cleanup handler wasn't called properly if the process
    exits within the body.

7 files changed, 89 insertions, 108 deletions

diff --git a/lang/gauche/DESCR b/lang/gauche/DESCR
index 5dc6d610d19..a355e7d943a 100644
--- a/lang/gauche/DESCR
+++ b/lang/gauche/DESCR
@@ -1,4 +1,4 @@
-Gauche is an R5RS Scheme implementation developed to be a handy script
+Gauche is an R7RS Scheme implementation developed to be a handy script
 interpreter, which allows programmers and system administrators to write small
 to large scripts for their daily chores. Quick startup, built-in system
 interface, native multilingual support are some of my goals.
diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index 2f3c6428571..7e61873d48d 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2012/10/02 20:11:39 asau Exp $
+# $NetBSD: Makefile,v 1.63 2014/07/21 07:40:07 enami Exp $
 #
 
-DISTNAME=	Gauche-0.9.3.3
+DISTNAME=	Gauche-0.9.4
 #PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gauche/}
diff --git a/lang/gauche/PLIST b/lang/gauche/PLIST
index e8c153c82e2..ad1ee57e468 100644
--- a/lang/gauche/PLIST
+++ b/lang/gauche/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2012/05/13 08:22:48 enami Exp $
+@comment $NetBSD: PLIST,v 1.29 2014/07/21 07:40:07 enami Exp $
 bin/gauche-cesconv
 bin/gauche-config
 bin/gauche-install
@@ -51,11 +51,9 @@ lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/util--match.so
 lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/util--queue.so
 lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/util--sparse.so
 lib/gauche-0.9/${PKGVERSION}/include/gauche.h
-lib/gauche-0.9/${PKGVERSION}/include/gauche/arch.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/bignum.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/bits.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/bits_inline.h
-lib/gauche-0.9/${PKGVERSION}/include/gauche/builtin-syms.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/bytes_inline.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/char_euc_jp.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/char_none.h
@@ -65,6 +63,7 @@ lib/gauche-0.9/${PKGVERSION}/include/gauche/charset.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/class.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/code.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/collection.h
+lib/gauche-0.9/${PKGVERSION}/include/gauche/compare.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/config.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/config_threads.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/exception.h
@@ -74,7 +73,6 @@ lib/gauche-0.9/${PKGVERSION}/include/gauche/float.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/gloc.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/hash.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/int64.h
-lib/gauche-0.9/${PKGVERSION}/include/gauche/keyword.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/load.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/macro.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/module.h
@@ -98,6 +96,7 @@ lib/gauche-0.9/${PKGVERSION}/include/gauche/vm.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/vminsn.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/weak.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/win-compat.h
+lib/gauche-0.9/${PKGVERSION}/include/gauche/writer.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/wthread.h
 lib/gauche-0.9/${PKGVERSION}/include/gc.h
 lib/gauche-0.9/${PKGVERSION}/include/gc_allocator.h
@@ -111,7 +110,7 @@ lib/gauche-0.9/${PKGVERSION}/include/gc_typed.h
 lib/gauche-0.9/${PKGVERSION}/include/gc_version.h
 lib/libgauche-0.9.so
 lib/libgauche-0.9.so.0
-lib/libgauche-0.9.so.0.3
+lib/libgauche-0.9.so.0.4
 man/man1/gauche-cesconv.1
 man/man1/gauche-config.1
 man/man1/gauche-install.1
@@ -129,6 +128,7 @@ share/gauche-0.9/${PKGVERSION}/lib/compat/stk.scm
 share/gauche-0.9/${PKGVERSION}/lib/control/job.scm
 share/gauche-0.9/${PKGVERSION}/lib/control/thread-pool.scm
 share/gauche-0.9/${PKGVERSION}/lib/crypt/bcrypt.scm
+share/gauche-0.9/${PKGVERSION}/lib/data/random.scm
 share/gauche-0.9/${PKGVERSION}/lib/dbd/null.scm
 share/gauche-0.9/${PKGVERSION}/lib/dbi.scm
 share/gauche-0.9/${PKGVERSION}/lib/dbm.scm
@@ -139,11 +139,11 @@ share/gauche-0.9/${PKGVERSION}/lib/dbm/ndbm.scm
 share/gauche-0.9/${PKGVERSION}/lib/dbm/restore
 share/gauche-0.9/${PKGVERSION}/lib/file/filter.scm
 share/gauche-0.9/${PKGVERSION}/lib/file/util.scm
-share/gauche-0.9/${PKGVERSION}/lib/gauche-init.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/array.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/cgen.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/cgen/cise.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/cgen/literal.scm
+share/gauche-0.9/${PKGVERSION}/lib/gauche/cgen/optimizer.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/cgen/precomp.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/cgen/stub.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/cgen/tmodule.scm
@@ -154,6 +154,7 @@ share/gauche-0.9/${PKGVERSION}/lib/gauche/collection.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/common-macros.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/condutil.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/config.scm
+share/gauche-0.9/${PKGVERSION}/lib/gauche/configure.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/defvalues.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/dictionary.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/experimental/app.scm
@@ -162,6 +163,7 @@ share/gauche-0.9/${PKGVERSION}/lib/gauche/experimental/ref.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/fcntl.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/fileutil.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/generator.scm
+share/gauche-0.9/${PKGVERSION}/lib/gauche/generic-sortutil.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/hashutil.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/hook.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/interactive.scm
@@ -209,11 +211,13 @@ share/gauche-0.9/${PKGVERSION}/lib/gauche/syslog.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/sysutil.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/termios.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/test.scm
+share/gauche-0.9/${PKGVERSION}/lib/gauche/test/generative.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/threads.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/time.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/treeutil.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/uvector.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/validator.scm
+share/gauche-0.9/${PKGVERSION}/lib/gauche/vecutil.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/version.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/vm/debugger.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/vm/insn-core.scm
@@ -224,9 +228,11 @@ share/gauche-0.9/${PKGVERSION}/lib/gencomp
 share/gauche-0.9/${PKGVERSION}/lib/genstub
 share/gauche-0.9/${PKGVERSION}/lib/math/const.scm
 share/gauche-0.9/${PKGVERSION}/lib/math/mt-random.scm
+share/gauche-0.9/${PKGVERSION}/lib/math/prime.scm
 share/gauche-0.9/${PKGVERSION}/lib/os/windows.scm
 share/gauche-0.9/${PKGVERSION}/lib/parser/peg.scm
 share/gauche-0.9/${PKGVERSION}/lib/precomp
+share/gauche-0.9/${PKGVERSION}/lib/r7rs.scm
 share/gauche-0.9/${PKGVERSION}/lib/rfc/822.scm
 share/gauche-0.9/${PKGVERSION}/lib/rfc/base64.scm
 share/gauche-0.9/${PKGVERSION}/lib/rfc/cookie.scm
@@ -238,16 +244,34 @@ share/gauche-0.9/${PKGVERSION}/lib/rfc/ip.scm
 share/gauche-0.9/${PKGVERSION}/lib/rfc/json.scm
 share/gauche-0.9/${PKGVERSION}/lib/rfc/md5.scm
 share/gauche-0.9/${PKGVERSION}/lib/rfc/mime.scm
+share/gauche-0.9/${PKGVERSION}/lib/rfc/mime-port.scm
 share/gauche-0.9/${PKGVERSION}/lib/rfc/quoted-printable.scm
 share/gauche-0.9/${PKGVERSION}/lib/rfc/sha.scm
 share/gauche-0.9/${PKGVERSION}/lib/rfc/sha1.scm
 share/gauche-0.9/${PKGVERSION}/lib/rfc/tls.scm
 share/gauche-0.9/${PKGVERSION}/lib/rfc/uri.scm
 share/gauche-0.9/${PKGVERSION}/lib/rfc/zlib.scm
+share/gauche-0.9/${PKGVERSION}/lib/scheme/base.scm
+share/gauche-0.9/${PKGVERSION}/lib/scheme/case-lambda.scm
+share/gauche-0.9/${PKGVERSION}/lib/scheme/char.scm
+share/gauche-0.9/${PKGVERSION}/lib/scheme/complex.scm
+share/gauche-0.9/${PKGVERSION}/lib/scheme/cxr.scm
+share/gauche-0.9/${PKGVERSION}/lib/scheme/eval.scm
+share/gauche-0.9/${PKGVERSION}/lib/scheme/file.scm
+share/gauche-0.9/${PKGVERSION}/lib/scheme/inexact.scm
+share/gauche-0.9/${PKGVERSION}/lib/scheme/lazy.scm
+share/gauche-0.9/${PKGVERSION}/lib/scheme/load.scm
+share/gauche-0.9/${PKGVERSION}/lib/scheme/process-context.scm
+share/gauche-0.9/${PKGVERSION}/lib/scheme/r5rs.scm
+share/gauche-0.9/${PKGVERSION}/lib/scheme/read.scm
+share/gauche-0.9/${PKGVERSION}/lib/scheme/repl.scm
+share/gauche-0.9/${PKGVERSION}/lib/scheme/time.scm
+share/gauche-0.9/${PKGVERSION}/lib/scheme/write.scm
 share/gauche-0.9/${PKGVERSION}/lib/slib.scm
 @unexec ${RM} -f %D/share/gauche-0.9/${PKGVERSION}/lib/slibcat || ${TRUE}
 share/gauche-0.9/${PKGVERSION}/lib/srfi-0.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi-1.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi-106.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi-11.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi-13.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi-14.scm
@@ -270,6 +294,51 @@ share/gauche-0.9/${PKGVERSION}/lib/srfi-60.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi-7.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi-9.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi-98.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/0.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/1.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/10.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/106.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/11.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/13.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/14.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/16.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/17.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/18.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/19.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/2.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/22.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/23.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/25.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/26.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/27.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/28.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/29.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/30.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/31.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/34.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/35.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/36.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/37.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/38.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/39.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/4.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/40.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/42.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/43.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/45.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/5.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/55.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/6.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/60.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/61.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/62.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/7.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/8.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/87.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/9.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/95.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/98.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/99.scm
 share/gauche-0.9/${PKGVERSION}/lib/sxml/adaptor.scm
 share/gauche-0.9/${PKGVERSION}/lib/sxml/serializer.scm
 share/gauche-0.9/${PKGVERSION}/lib/sxml/ssax.scm
@@ -303,12 +372,14 @@ share/gauche-0.9/${PKGVERSION}/lib/util/stream.scm
 share/gauche-0.9/${PKGVERSION}/lib/util/toposort.scm
 share/gauche-0.9/${PKGVERSION}/lib/util/tree.scm
 share/gauche-0.9/${PKGVERSION}/lib/util/trie.scm
+share/gauche-0.9/${PKGVERSION}/lib/www/css.scm
 share/gauche-0.9/${PKGVERSION}/lib/www/cgi-test.scm
 share/gauche-0.9/${PKGVERSION}/lib/www/cgi.scm
 share/gauche-0.9/${PKGVERSION}/lib/www/cgi/test.scm
 share/gauche-0.9/${PKGVERSION}/template.DIST
 share/gauche-0.9/${PKGVERSION}/template.Makefile.in
 share/gauche-0.9/${PKGVERSION}/template.configure.ac
+share/gauche-0.9/${PKGVERSION}/template.configure
 share/gauche-0.9/${PKGVERSION}/template.extension.c
 share/gauche-0.9/${PKGVERSION}/template.extension.h
 share/gauche-0.9/${PKGVERSION}/template.extensionlib.stub
diff --git a/lang/gauche/distinfo b/lang/gauche/distinfo
index 42a79237f98..1452c91cdf7 100644
--- a/lang/gauche/distinfo
+++ b/lang/gauche/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.31 2012/05/30 02:50:11 enami Exp $
+$NetBSD: distinfo,v 1.32 2014/07/21 07:40:07 enami Exp $
 
-SHA1 (Gauche-0.9.3.3.tgz) = 71d7ca3eceb9adc1de33455c1616cbed89d226f7
-RMD160 (Gauche-0.9.3.3.tgz) = d5a2fd474b068f8bbc52cb5fe93685ba4bc73b90
-Size (Gauche-0.9.3.3.tgz) = 5042189 bytes
-SHA1 (patch-aa) = 44221973454aeb2b4ad1a4c9675f801a64de2806
+SHA1 (Gauche-0.9.4.tgz) = 2f0068d19adbc8e7fd3c04ab8e6576d0fac21ad6
+RMD160 (Gauche-0.9.4.tgz) = 88f44c10badc4d4be463ee0c84a0b4065d53dc00
+Size (Gauche-0.9.4.tgz) = 5601987 bytes
+SHA1 (patch-aa) = 9f740c5e0b5e761a5bf2ba2a5920a867f97d5847
 SHA1 (patch-af) = 0741e1a047ee7935bffa215a69cc417ba67b81f2
 SHA1 (patch-ag) = ee9946e364d6723b0efe3b260fc5d02ccb04621d
-SHA1 (patch-gc_configure) = 58af779f9610199ec538d37b2c359607eddbae9b
-SHA1 (patch-gc_dyn__load.c) = 72e09b13b060fbc6dc17b689fc4c9f496901e5b8
diff --git a/lang/gauche/patches/patch-aa b/lang/gauche/patches/patch-aa
index e59c6f7c284..f0ffde5bd4a 100644
--- a/lang/gauche/patches/patch-aa
+++ b/lang/gauche/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.11 2010/12/16 03:42:09 asau Exp $
+$NetBSD: patch-aa,v 1.12 2014/07/21 07:40:07 enami Exp $
 
 --- configure.orig	2010-12-13 03:45:32.000000000 +0300
 +++ configure	2010-12-16 06:00:33.000000000 +0300
@@ -12,12 +12,12 @@ $NetBSD: patch-aa,v 1.11 2010/12/16 03:42:09 asau Exp $
    arm*)
      # ARM processor may use a special mixed endian for doubles.  It can
      # be switched by processor configuration.  So we check it at runtime.
-@@ -6161,7 +6164,7 @@
+@@ -6377,7 +6380,7 @@ _ACEOF
  
  fi
  
--for ac_func in isnan isinf trunc rint
-+for ac_func in isnan isinf trunc
+-for ac_func in isnan isinf trunc rint tgamma lgamma
++for ac_func in isnan isinf trunc tgamma lgamma
  do :
    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
  ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
diff --git a/lang/gauche/patches/patch-gc_configure b/lang/gauche/patches/patch-gc_configure
deleted file mode 100644
index 3eb3537a34c..00000000000
--- a/lang/gauche/patches/patch-gc_configure
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-gc_configure,v 1.1 2012/05/30 02:50:11 enami Exp $
-
-Copied from devel/boehm-gc/patches/patch-ab.
-
---- gc/configure.orig	2012-05-28 16:01:24.000000000 +0000
-+++ gc/configure
-@@ -5228,7 +5228,7 @@ $as_echo "#define DARWIN_DONT_PARSE_STAC
- 
- fi
- 
--if test "$GCC" == yes; then
-+if test "$GCC" = yes; then
-   # Disable aliasing optimization unless forced to.
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc supports -fno-strict-aliasing" >&5
- $as_echo_n "checking whether gcc supports -fno-strict-aliasing... " >&6; }
-@@ -5436,8 +5436,8 @@ esac
- $as_echo "$enable_shared" >&6; }
- 
- # Compile with GC_DLL defined unless building static libraries.
--if test "${enable_shared}" == yes; then
--  if test "${enable_static}" == no; then
-+if test "${enable_shared}" = yes; then
-+  if test "${enable_static}" = no; then
-     $as_echo "#define GC_DLL 1" >>confdefs.h
- 
-     # FIXME: Also pass -fvisibility=hidden option if GCC v4+ and not Win32.
-@@ -5491,6 +5491,9 @@ $as_echo "#define SOLARIS25_PROC_VDB_BUG
-  sparc*-*-openbsd*)
-     machdep="mach_dep.lo sparc_mach_dep.lo"
-     ;;
-+ sparc64-*-netbsd*)
-+    machdep="mach_dep.lo sparc_mach_dep.lo"
-+    ;;
-  sparc-sun-solaris2.3)
-     machdep="mach_dep.lo sparc_mach_dep.lo"
- 
-@@ -16422,7 +16425,7 @@ $as_echo "#define SMALL_CONFIG 1" >>conf
- 
- fi
- 
--if test "$enable_gc_debug" == "no"; then
-+if test "$enable_gc_debug" = "no"; then
- 
- $as_echo "#define NO_DEBUGGING 1" >>confdefs.h
- 
diff --git a/lang/gauche/patches/patch-gc_dyn__load.c b/lang/gauche/patches/patch-gc_dyn__load.c
deleted file mode 100644
index 937fd7e98f5..00000000000
--- a/lang/gauche/patches/patch-gc_dyn__load.c
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-gc_dyn__load.c,v 1.1 2012/05/30 02:50:11 enami Exp $
-
-commit a378494312ac9aedcb08fa7a9593506ce5620878
-Author: Shiro Kawai <shiro@acm.org>
-Date:   Mon May 28 17:22:14 2012 -1000
-
-    Backport a gc patch for NetBSD 6
-
---- gc/dyn_load.c.orig	2012-05-26 10:42:03.000000000 +0000
-+++ gc/dyn_load.c
-@@ -77,6 +77,8 @@ STATIC GC_has_static_roots_func GC_has_s
- #endif
- 
- #if defined(NETBSD)
-+#   include <sys/param.h>
-+#   include <dlfcn.h>
- #   include <machine/elf_machdep.h>
- #   define ELFSIZE ARCH_ELFSIZE
- #endif
-@@ -644,6 +646,15 @@ GC_FirstDLOpenedLinkMap(void)
-         return(0);
-     }
-     if( cachedResult == 0 ) {
-+#if defined(NETBSD) && defined(RTLD_DI_LINKMAP)
-+        struct link_map *lm = NULL;
-+        int rv = dlinfo(RTLD_SELF, RTLD_DI_LINKMAP, &lm); 
-+        if (rv != 0)
-+            return (0);
-+        if (lm == NULL)
-+            return (0);
-+        cachedResult = lm;
-+#else  /* !(defined(NETBSD) && defined(RTLD_DI_LINKMAP)) */
-         int tag;
-         for( dp = _DYNAMIC; (tag = dp->d_tag) != 0; dp++ ) {
-             if( tag == DT_DEBUG ) {
-@@ -653,6 +664,7 @@ GC_FirstDLOpenedLinkMap(void)
-                 break;
-             }
-         }
-+#endif /* !(defined(NETBSD) && defined(RTLD_DI_LINKMAP)) */
-     }
-     return cachedResult;
- }