4 files changed, 11 insertions, 29 deletions

diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index 8f2224b27029..df48e556ec85 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gauche
-PORTVERSION=	0.8.3	# Keep databases/gauche-gdbm in sync with this
-PORTREVISION=	2
+PORTVERSION=	0.8.4	# Keep databases/gauche-gdbm in sync with this
 CATEGORIES=	lang scheme
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/lang/gauche/distinfo b/lang/gauche/distinfo
index a6db756ac0df..51f532a4af63 100644
--- a/lang/gauche/distinfo
+++ b/lang/gauche/distinfo
@@ -1,2 +1,2 @@
-MD5 (Gauche-0.8.3.tgz) = 434fb8802da5f0e69ab95d75a6ecec87
-SIZE (Gauche-0.8.3.tgz) = 2534879
+MD5 (Gauche-0.8.4.tgz) = 3798df425ad97ba9008801a2ea377147
+SIZE (Gauche-0.8.4.tgz) = 2772432
diff --git a/lang/gauche/files/patch-src_gauche_arith_i386.h b/lang/gauche/files/patch-src_gauche_arith_i386.h
deleted file mode 100644
index df4d1410e34f..000000000000
--- a/lang/gauche/files/patch-src_gauche_arith_i386.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/gauche/arith_i386.h.orig	Sat Jul  5 11:29:13 2003
-+++ src/gauche/arith_i386.h	Sun Dec  5 23:19:45 2004
-@@ -167,6 +167,7 @@
-  *  else r <- x * y, v = 0
-  */
- 
-+#if 0
- #define UMULOV(r, v, x, y) \
-     asm("movl %2, %%eax;" \
-         "mull %3;" \
-@@ -199,6 +200,8 @@
-            :"=r" (r), "=&r" (v) \
-            :"g" (x), "r" (y) \
-            :"%eax", "%edx")
-+
-+#endif
- 
- #endif /*__GNUC__*/
- 
diff --git a/lang/gauche/pkg-plist b/lang/gauche/pkg-plist
index b9e854393c76..d447177c4b28 100644
--- a/lang/gauche/pkg-plist
+++ b/lang/gauche/pkg-plist
@@ -31,10 +31,12 @@ lib/gauche/%%VERSION%%/include/gauche/char_none.h
 lib/gauche/%%VERSION%%/include/gauche/char_sjis.h
 lib/gauche/%%VERSION%%/include/gauche/char_utf_8.h
 lib/gauche/%%VERSION%%/include/gauche/class.h
+lib/gauche/%%VERSION%%/include/gauche/code.h
 lib/gauche/%%VERSION%%/include/gauche/config.h
 lib/gauche/%%VERSION%%/include/gauche/exception.h
 lib/gauche/%%VERSION%%/include/gauche/extend.h
 lib/gauche/%%VERSION%%/include/gauche/int64.h
+lib/gauche/%%VERSION%%/include/gauche/mingw-compat.h
 lib/gauche/%%VERSION%%/include/gauche/net.h
 lib/gauche/%%VERSION%%/include/gauche/pthread.h
 lib/gauche/%%VERSION%%/include/gauche/scmconst.h
@@ -47,10 +49,11 @@ lib/gauche/%%VERSION%%/include/gc_config_macros.h
 lib/gauche/%%VERSION%%/include/gc_pthread_redirects.h
 lib/gauche/site/%%VERSION%%/%%TARGET%%/.keepme
 lib/libgauche.so
-lib/libgauche.so.0
 lib/libgauche.so.%%VERSION%%
+lib/libgauche.so.0
 share/aclocal/gauche.m4
 share/gauche/%%VERSION%%/aclocal.m4
+share/gauche/%%VERSION%%/lib/.packages/.keepme
 share/gauche/%%VERSION%%/lib/binary/io.scm
 share/gauche/%%VERSION%%/lib/binary/pack.scm
 share/gauche/%%VERSION%%/lib/cesconv
@@ -81,7 +84,6 @@ share/gauche/%%VERSION%%/lib/gauche/interpolate.scm
 share/gauche/%%VERSION%%/lib/gauche/let-opt.scm
 share/gauche/%%VERSION%%/lib/gauche/libutil.scm
 share/gauche/%%VERSION%%/lib/gauche/listener.scm
-share/gauche/%%VERSION%%/lib/gauche/listutil.scm
 share/gauche/%%VERSION%%/lib/gauche/logger.scm
 share/gauche/%%VERSION%%/lib/gauche/logical.scm
 share/gauche/%%VERSION%%/lib/gauche/macroutil.scm
@@ -123,9 +125,9 @@ share/gauche/%%VERSION%%/lib/gauche/uvector.scm
 share/gauche/%%VERSION%%/lib/gauche/validator.scm
 share/gauche/%%VERSION%%/lib/gauche/version.scm
 share/gauche/%%VERSION%%/lib/gauche/vm/debugger.scm
-share/gauche/%%VERSION%%/lib/gauche/vm/disasm.scm
+share/gauche/%%VERSION%%/lib/gauche/vm/insn.scm
+share/gauche/%%VERSION%%/lib/gauche/vm/profiler.scm
 share/gauche/%%VERSION%%/lib/gauche/vport.scm
-share/gauche/%%VERSION%%/lib/gauche/with.scm
 share/gauche/%%VERSION%%/lib/genstub
 share/gauche/%%VERSION%%/lib/math/const.scm
 share/gauche/%%VERSION%%/lib/math/mt-random.scm
@@ -177,7 +179,6 @@ share/gauche/%%VERSION%%/lib/srfi-14/set.scm
 share/gauche/%%VERSION%%/lib/srfi-19.scm
 share/gauche/%%VERSION%%/lib/srfi-19/format.scm
 share/gauche/%%VERSION%%/lib/srfi-19/read-tai.scm
-share/gauche/%%VERSION%%/lib/srfi-2.scm
 share/gauche/%%VERSION%%/lib/srfi-26.scm
 share/gauche/%%VERSION%%/lib/srfi-27.scm
 share/gauche/%%VERSION%%/lib/srfi-29.scm
@@ -186,7 +187,9 @@ share/gauche/%%VERSION%%/lib/srfi-29/format.scm
 share/gauche/%%VERSION%%/lib/srfi-31.scm
 share/gauche/%%VERSION%%/lib/srfi-37.scm
 share/gauche/%%VERSION%%/lib/srfi-4.scm
+share/gauche/%%VERSION%%/lib/srfi-42.scm
 share/gauche/%%VERSION%%/lib/srfi-5.scm
+share/gauche/%%VERSION%%/lib/srfi-55.scm
 share/gauche/%%VERSION%%/lib/srfi-7.scm
 share/gauche/%%VERSION%%/lib/srfi-9.scm
 share/gauche/%%VERSION%%/lib/text/csv.scm
@@ -209,7 +212,6 @@ share/gauche/%%VERSION%%/lib/util/toposort.scm
 share/gauche/%%VERSION%%/lib/util/tree.scm
 share/gauche/%%VERSION%%/lib/www/cgi-test.scm
 share/gauche/%%VERSION%%/lib/www/cgi.scm
-share/gauche/%%VERSION%%/lib/.packages/.keepme
 share/gauche/site/lib/.packages/.keepme
 %%DOCSDIR%%/.keepme
 %%EXAMPLESDIR%%/.keepme