Update to 0.9.6

* Use gmake for pattern rules

Changelog:
Release 0.9.6

Major feature upgrade

  * Notable feature enhancement:
  * New modules and procedures
      + R7RS-Large Red Edition support (WiLiKi:Gauche:R7RS-RedEdition)
      + New srfi support:
      + Other new modules and procedures:
  * Incompatible changes
  * Other bug fixes

Notable feature enhancement:

  * Static linking and standalone executable support: Now you can create a
    standalone executable from Gauche program. See blog entry and "Building
    standalone executables" section.
  * Single shell-script installer (blog entry).
  * REPL enhancement: Pretty printing (blog entry), online document display (
    blog entry) and search (blog entry).
  * Method dispatch optimizations (1, 2).
  * Procedure inlining optimizations (1, 2)
  * Windows console Japanese handling: Thanks to @hamayama, numerous fixes to
    use Japanese on Windows command prompt is incorporated.
  * Bump to Boehm gc 7.6.6, thanks to @qykth-git.
  * Support mbedTLS as an additional TLS support, thanks to @qykth-git. See
    rfc.tls for the details.
  * format finally supports floating number formatting ~f. It also supports a
    subtle rounding mode switch regarding binary to decimal conversion (blog
    post).
  * Support of using multiple versions of Gauche in parallel---from 0.9.6 and
    after, you can invoke a different version of Gauche by gosh -vVERSION, as
    far as VERSION of Gauche is also installed. This isn't much useful now
    (VERSION must be 0.9.6 or later), but will be handy with future releases.
  * Sampling profiler now works on Windows, thanks to Saito Atsushi and
    @hamayama (although it can only sample the attached thread).

New modules and procedures

R7RS-Large Red Edition support (WiLiKi:Gauche:R7RS-RedEdition)

12 libraries (out of 17) are supported:

  * scheme.list List library (formerly srfi-1)
  * scheme.vector Vector library (formerly srfi-133)
  * scheme.sort Sort libraries (formerly srfi-132)
  * scheme.set Sets and bags (formerly srfi-113)
  * scheme.charset Character-set library (formerly srfi-14)
  * scheme.hash-table Intermediate hash tables (formerly srfi-125)
  * scheme.ideque Immutable deques (formerly srfi-134
  * scheme.generator Generators (formerly srfi-121)
  * scheme.lseq Lazy sequences (formerly srfi-127)
  * scheme.box Boxes (formerly srfi-111)
  * scheme.list-queue Mutable queues (formerly srfi-117)
  * scheme.comparator Comparators (formerly srfi-128)

Those are still accessible as srfi-* names, but new code is recommended to use
the scheme.* names.

New srfi support:

  * srfi-64 A Scheme API for test suites
  * srfi-66 Octet vectors
  * srfi-74 Octet-addressed binary blocks
  * srfi-96 SLIB prerequisites
  * srfi-129 Titlecase procedures
  * srfi-141 Integer division
  * srfi-143 Fixnums
  * srfi-145 Assumptions (built-in)
  * srfi-146 Mappings
      + srfi-146.hash Hashmaps
  * srfi-149 Basic Syntax-rules template extensions (built-in)
  * srfi-151 Bitwise operations
  * srfi-152 String library (reduced)
  * srfi-158 Generators and accumulators

Other new modules and procedures:

  * pprint - pretty printer.
  * assume-type macro and type-error procedure.
  * define-inline is now official.
  * hash-table-compare-as-sets, tree-map-compare-as-sets - compare those
    mappings as sets
  * let-values, let*-values: now built-in.
  * In gauche.process: do-process!, do-pipeline, run-pipeline!.
  * In gauche.unicode: char-east-asian-width
  * In gauche.uvector: uvector-binary-search, u8vector=? ..., u8vector-compare
    ....
  * In gauche.charconv: Conversion routines accepts u8vector as well as
    strings.
  * In gauche.sequence: delete-neighbor-dups, delete-neighbor-dups!,
    delete-neighbor-dups-squeeze!, group-contiguous-sequence
  * In gauche.threads: atomic and atomic-update! allows more than one timeout
    values.
  * text.template: Simple template expander, based on built-in string
    interpolation feature.
  * Char-set can be immutable. char-set-freeze and char-set-freeze! are used to
    make a char set immutable. Literal char-sets are immutable, as other
    literal objects.
  * rfc.http: You can now use stunnel process to do https connection instead of
    Gauche's rfc.tls module. Note that it only works with command mode of
    stunnel---which isn't available on Windows.
  * rfc.tls: Now that we support mbedTLS and server certificate authentication,
    a minimal document is added.
  * binary.io: get-uint, get-sint, put-uint!, put-sint!.
  * gauche.generator: generator->uvector, generator->uvector!, generator->
    bytevector, generator->bytevector!.
  * data.random: regular-string$ - creates a generator that generates random
    strings that match the given regexp.
  * string-incomplete->complete: Add :escape mode to escape illegal bytes in
    lossless way.

Incompatible changes

Some change undocumented behaviors; others change because of bug fix.

  * Literal character sets (#[chars]) are now immutable, as other literal
    objects; it will raise an error if you try to mutate it.
  * getter-with-setter now associates the setter to the getter in immutable way
    ('locked'); it will raise an error if you try to change it. It is the way
    specified in srfi-17. It also allows Gauche to inline setters. (NB: Many
    predefined setters are now locked. If your existing code alters them it
    will cause an error.)
  * list*, cons* - Requires at least one arg, as specified in srfi-1. Zero
    argument doesn't make sense, although previous versions of Gauche allowed
    it.
  * append, append! - Now it is an error if the arguments except the last one
    is a dotted list. We've tolerated it before, but it's rather error prone.
  * util.match: The way to match record instance with positional variables are
    changed for more reasonable way. We hope no code depends on the previous
    way, which was broken anyway. See the blog entry for the details.
  * twos-complement-factor: We fix the behavior when 0 is passed; it used to
    return 0, now it returns -1. The latter is consistent with srfi-60.
    Unfortunately we documented the former behavior, so it breaks
    compatibility.
  * string-split: Splitting an empty string now yields an empty list instead of
    (""), as srfi-152 specifies

Other bug fixes

There are too many; we list up some notable ones.

  * The behavior of guard when no clauses are satisfied and the exception is
    reraised is now R7RS-compatible ( https://github.com/shirok/Gauche/pull/335
    ). When using R7RS, with-exception-handler is R7RS compatible (which is
    slightly different from built-in with-exception-handler, compatible to
    srfi-18).
  * unwind-protect: Fix bug with interaction of call/cc.
  * rfc.tls: axTLS interface had MT-hazard.
  * er-macro-transformer: Fix hygienity issue ( https://github.com/shirok/
    Gauche/issues/250 )

3 files changed, 123 insertions, 70 deletions

diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index 2b6b52db935..b687b9cc0b3 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2018/01/28 20:10:53 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2018/07/24 14:52:18 ryoon Exp $
 #
 
-DISTNAME=	Gauche-0.9.5
-#PKGREVISION=	1
-PKGREVISION=	1
+DISTNAME=	Gauche-0.9.6
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gauche/}
 EXTRACT_SUFX=	.tgz
@@ -37,7 +35,7 @@ ALL_ENV+=		\
 
 USE_LANGUAGES=	c c99
 USE_LIBTOOL=	yes
-USE_TOOLS+=	gzip makeinfo
+USE_TOOLS+=	gmake gzip makeinfo
 TEST_TARGET=	check
 INFO_FILES=	yes
 
diff --git a/lang/gauche/PLIST b/lang/gauche/PLIST
index 4ba9c681674..c64dcf4944a 100644
--- a/lang/gauche/PLIST
+++ b/lang/gauche/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2016/10/13 00:30:13 enami Exp $
+@comment $NetBSD: PLIST,v 1.31 2018/07/24 14:52:18 ryoon Exp $
 bin/gauche-cesconv
 bin/gauche-config
 bin/gauche-install
@@ -6,55 +6,6 @@ bin/gauche-package
 bin/gosh
 info/gauche-refe.info
 info/gauche-refj.info
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/binary--io.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/crypt--bcrypt.so
-${PLIST.gdbm}lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/dbm--gdbm.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/data--queue.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/data--sparse.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/dbm--ndbm.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/file--util.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--charconv.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--collection.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--fcntl.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--generator.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--hook.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--net.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--parameter.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--record.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--sequence.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--syslog.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--termios.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--threads.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--unicode.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--uvector.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche--vport.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche-cesconv
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche-config
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche-install
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche-package
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gosh
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/libgauche-0.9.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/math--mt-random.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/os--windows.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/parser--peg.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/rfc--822.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/rfc--md5.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/rfc--mime.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/rfc--sha.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/rfc--tls.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/rfc--zlib.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/srfi-1.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/srfi-13.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/srfi-133.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/srfi-19.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/srfi-43.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sxml--serializer.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sxml--ssax.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sxml--sxpath.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sxml--tools.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/text--gettext.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/text--tr.so
-lib/gauche-0.9/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/util--match.so
 lib/gauche-0.9/${PKGVERSION}/include/gauche.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/bignum.h
 lib/gauche-0.9/${PKGVERSION}/include/gauche/bits.h
@@ -113,9 +64,64 @@ lib/gauche-0.9/${PKGVERSION}/include/gc_pthread_redirects.h
 lib/gauche-0.9/${PKGVERSION}/include/gc_tiny_fl.h
 lib/gauche-0.9/${PKGVERSION}/include/gc_typed.h
 lib/gauche-0.9/${PKGVERSION}/include/gc_version.h
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/binary--io.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/crypt--bcrypt.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/data--queue.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/data--sparse.so
+${PLIST.gdbm}lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/dbm--gdbm.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/dbm--ndbm.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/file--util.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--charconv.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--collection.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--dictionary.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--fcntl.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--generator.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--hook.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--net.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--parameter.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--record.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--sequence.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--syslog.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--termios.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--threads.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--unicode.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--uvector.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche--vport.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche-cesconv
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche-config
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche-install
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gauche-package
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/gosh
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/libgauche-0.9.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/libgauche-0.9.so.0
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/libgauche-0.9.so.0.6
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/libgauche-static-0.9.a
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/math--mt-random.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/os--windows.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/parser--peg.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/rfc--822.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/rfc--md5.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/rfc--mime.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/rfc--sha.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/rfc--tls--mbed.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/rfc--tls.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/rfc--zlib.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/srfi-1.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/srfi-13.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/srfi-133.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/srfi-19.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/srfi-43.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/sxml--serializer.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/sxml--ssax.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/sxml--sxpath.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/sxml--tools.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/text--gettext.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/text--tr.so
+lib/gauche-0.9/${PKGVERSION}/x86_64--netbsd/util--match.so
 lib/libgauche-0.9.so
 lib/libgauche-0.9.so.0
-lib/libgauche-0.9.so.0.5
+lib/libgauche-0.9.so.0.6
+lib/libgauche-static-0.9.a
 man/man1/gauche-cesconv.1
 man/man1/gauche-config.1
 man/man1/gauche-install.1
@@ -126,12 +132,13 @@ share/gauche-0.9/${PKGVERSION}/aclocal.m4
 share/gauche-0.9/${PKGVERSION}/lib/binary/ftype.scm
 share/gauche-0.9/${PKGVERSION}/lib/binary/io.scm
 share/gauche-0.9/${PKGVERSION}/lib/binary/pack.scm
-share/gauche-0.9/${PKGVERSION}/lib/cesconv
 share/gauche-0.9/${PKGVERSION}/lib/build-standalone
+share/gauche-0.9/${PKGVERSION}/lib/cesconv
 share/gauche-0.9/${PKGVERSION}/lib/check-script
 share/gauche-0.9/${PKGVERSION}/lib/compat/chibi-test.scm
 share/gauche-0.9/${PKGVERSION}/lib/compat/jfilter.scm
 share/gauche-0.9/${PKGVERSION}/lib/compat/norational.scm
+share/gauche-0.9/${PKGVERSION}/lib/compat/r7rs-srfi-tests.scm
 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
@@ -186,9 +193,9 @@ 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
-share/gauche-0.9/${PKGVERSION}/lib/gauche/interactive/info.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/interactive/ed.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/interactive/editable-reader.scm
+share/gauche-0.9/${PKGVERSION}/lib/gauche/interactive/info.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/interactive/toplevel.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/interpolate.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/lazy.scm
@@ -216,7 +223,7 @@ share/gauche-0.9/${PKGVERSION}/lib/gauche/parameter.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/parseopt.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/partcont.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/portutil.scm
-share/gauche-0.9/${PKGVERSION}/lib/gauche/pp.scm
+share/gauche-0.9/${PKGVERSION}/lib/gauche/pputil.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/procedure.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/process.scm
 share/gauche-0.9/${PKGVERSION}/lib/gauche/record.scm
@@ -236,6 +243,7 @@ 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/test/script.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
@@ -256,6 +264,7 @@ 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/os/windows/console/codepage.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
@@ -269,32 +278,44 @@ share/gauche-0.9/${PKGVERSION}/lib/rfc/icmp.scm
 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/mime.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/tls/mbed.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/box.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/charset.scm
+share/gauche-0.9/${PKGVERSION}/lib/scheme/comparator.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/generator.scm
+share/gauche-0.9/${PKGVERSION}/lib/scheme/hash-table.scm
+share/gauche-0.9/${PKGVERSION}/lib/scheme/ideque.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/list-queue.scm
+share/gauche-0.9/${PKGVERSION}/lib/scheme/list.scm
 share/gauche-0.9/${PKGVERSION}/lib/scheme/load.scm
+share/gauche-0.9/${PKGVERSION}/lib/scheme/lseq.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/set.scm
+share/gauche-0.9/${PKGVERSION}/lib/scheme/sort.scm
 share/gauche-0.9/${PKGVERSION}/lib/scheme/time.scm
+share/gauche-0.9/${PKGVERSION}/lib/scheme/vector.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
@@ -305,14 +326,27 @@ share/gauche-0.9/${PKGVERSION}/lib/srfi-114.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi-117.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi-118.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi-121.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi-125.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi-127.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi-128.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi-129.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi-13.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi-131.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi-132.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi-133.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi-134.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi-14.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi-14/query.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi-14/set.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi-141.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi-143.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi-146.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi-146/hash.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi-151.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi-152.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi-154.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi-155.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi-158.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-25.scm
@@ -330,10 +364,14 @@ share/gauche-0.9/${PKGVERSION}/lib/srfi-43.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-60.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi-64.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi-66.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi-69.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi-7.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi-74.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi-78.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi-9.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi-96.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/srfi/0.scm
@@ -348,12 +386,24 @@ share/gauche-0.9/${PKGVERSION}/lib/srfi/114.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi/117.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi/118.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi/121.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/125.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/127.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi/128.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/129.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi/13.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi/131.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/132.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi/133.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi/134.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi/14.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/141.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/143.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/145.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/146.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/149.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/151.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/152.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/158.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
@@ -386,13 +436,17 @@ 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/64.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/66.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi/69.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi/7.scm
+share/gauche-0.9/${PKGVERSION}/lib/srfi/74.scm
 share/gauche-0.9/${PKGVERSION}/lib/srfi/78.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/96.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
@@ -403,6 +457,7 @@ share/gauche-0.9/${PKGVERSION}/lib/sxml/to-html.scm
 share/gauche-0.9/${PKGVERSION}/lib/sxml/tools.scm
 share/gauche-0.9/${PKGVERSION}/lib/sxml/tree-trans.scm
 share/gauche-0.9/${PKGVERSION}/lib/text/console.scm
+share/gauche-0.9/${PKGVERSION}/lib/text/console/generic.scm
 share/gauche-0.9/${PKGVERSION}/lib/text/console/windows.scm
 share/gauche-0.9/${PKGVERSION}/lib/text/csv.scm
 share/gauche-0.9/${PKGVERSION}/lib/text/diff.scm
@@ -414,6 +469,7 @@ share/gauche-0.9/${PKGVERSION}/lib/text/line-edit.scm
 share/gauche-0.9/${PKGVERSION}/lib/text/parse.scm
 share/gauche-0.9/${PKGVERSION}/lib/text/progress.scm
 share/gauche-0.9/${PKGVERSION}/lib/text/sql.scm
+share/gauche-0.9/${PKGVERSION}/lib/text/template.scm
 share/gauche-0.9/${PKGVERSION}/lib/text/tr.scm
 share/gauche-0.9/${PKGVERSION}/lib/text/tree.scm
 share/gauche-0.9/${PKGVERSION}/lib/text/unicode.scm
@@ -436,19 +492,18 @@ 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/util/unification.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}/lib/www/css.scm
 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.configure.ac
 share/gauche-0.9/${PKGVERSION}/template.extension.c
 share/gauche-0.9/${PKGVERSION}/template.extension.h
 share/gauche-0.9/${PKGVERSION}/template.extensionlib.stub
 share/gauche-0.9/${PKGVERSION}/template.module.scm
 share/gauche-0.9/${PKGVERSION}/template.package.scm
 share/gauche-0.9/${PKGVERSION}/template.test.scm
-@pkgdir lib/gauche-0.9/site/${MACHINE_GNU_PLATFORM}
 @pkgdir share/gauche-0.9/site/lib
-@exec %D/bin/gosh -ftest -uslib -E"require 'new-catalog" -Eexit || ${TRUE}
+@pkgdir lib/gauche-0.9/site/x86_64--netbsd
diff --git a/lang/gauche/distinfo b/lang/gauche/distinfo
index a40a0a92ef7..2076b184331 100644
--- a/lang/gauche/distinfo
+++ b/lang/gauche/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.37 2016/10/13 00:30:13 enami Exp $
+$NetBSD: distinfo,v 1.38 2018/07/24 14:52:18 ryoon Exp $
 
-SHA1 (Gauche-0.9.5.tgz) = c3e1ea21f3acc66fd26eced117caab3f86531db4
-RMD160 (Gauche-0.9.5.tgz) = 8a4b66746f4ad9ca18dfbdbf2cd4b792100d82d2
-SHA512 (Gauche-0.9.5.tgz) = 6d853d734c7a56a86f0015b1bfef378803d6acc1e0405ed841eab5afc08d1edef736d85df10c86d75fd5fb6b2def684bb1f2095a019133b9f497192f5511197a
-Size (Gauche-0.9.5.tgz) = 6458675 bytes
+SHA1 (Gauche-0.9.6.tgz) = 20f2a0a4b37c40ce0175e627d5767b32d8f4eb5d
+RMD160 (Gauche-0.9.6.tgz) = 36d77c87881978c408daf7958bc41048aa4b2edd
+SHA512 (Gauche-0.9.6.tgz) = 1d8a7f56fd9ca183d6dce1dedadfaec7c7150c29540e5158f2a61977f7406d7d7a8ab753ef1912865a7d7e9a9e2fa845d86b2eb4c5e07a176f1c60276bc1908f
+Size (Gauche-0.9.6.tgz) = 6927530 bytes
 SHA1 (patch-aa) = 0cc7f563f1750bff4c9630bc4a2d8ce95d3b323d
 SHA1 (patch-af) = 0962445f5eab8d788283455f60386aa1cfd70230
 SHA1 (patch-ag) = 524048e151225dc73d00c31623be25e84206920a