Upgrade Gauche pkgsrc to 0.5.

A quick NetBSD/i386 support patch is added.

5 files changed, 167 insertions, 120 deletions

diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index 00b20d88a6c..3761d89ff02 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:16 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/02/01 08:10:39 minoura Exp $
 #
 
-DISTNAME=	Gauche-0.4.2
+DISTNAME=	Gauche-0.5
 CATEGORIES=	lang
 MASTER_SITES=	http://prdownloads.sourceforge.net/gauche/
 EXTRACT_SUFX=	.tgz
@@ -18,13 +18,20 @@ DEPENDS+=	libiconv-[0-9]*:../../converters/libiconv
 
 # Due to GC dynamic loading support, this package runs on limited platforms
 # Plus, it is not LP64-safe
-ONLY_FOR_PLATFORM= NetBSD-*-sparc NetBSD-*-mipsel NetBSD-*-powerpc
+ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-sparc NetBSD-*-mipsel NetBSD-*-powerpc
 ONLY_FOR_PLATFORM+= Linux-*-* SunOS-*-*
+.include "../../mk/bsd.prefs.mk"
+.if (${MACHINE_ARCH} == "i386" && ${OPSYS} == "NetBSD")
+.  if ${OBJECT_FMT} != "ELF"
+BROKEN=Test required on NetBSD/i386 a.out
+.  endif
+.endif
 
 WRKSRC=		${WRKDIR}/Gauche
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-slib=${PREFIX}/share/slib
 CONFIGURE_ARGS+=	--with-iconv=${PREFIX} --with-iconv-lib=iconv
+CONFIGURE_ENV+=		AS="${CC} -x assembler-with-cpp -c"
 CFLAGS+=	-I${LOCALBASE}/include
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/lang/gauche/PLIST b/lang/gauche/PLIST
index 113f7b74905..a9059588839 100644
--- a/lang/gauche/PLIST
+++ b/lang/gauche/PLIST
@@ -1,107 +1,146 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:23:12 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/01 08:10:39 minoura Exp $
 bin/gauche-config
 bin/gosh
-lib/gauche/0.4.2/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}/gauche-config
-lib/gauche/0.4.2/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}/gosh
-lib/gauche/0.4.2/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}/libcharconv.so
-lib/gauche/0.4.2/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}/libgauche.a
-lib/gauche/0.4.2/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}/libgauche.so
-lib/gauche/0.4.2/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}/libnet.so
-lib/gauche/0.4.2/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}/libuvector.so
-lib/gauche/site/0.4.2/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}/example.so
+lib/gauche/0.5/${MACHINE_GNU_PLATFORM}/fcntl.so
+lib/gauche/0.5/${MACHINE_GNU_PLATFORM}/gauche-config
+lib/gauche/0.5/${MACHINE_GNU_PLATFORM}/gosh
+lib/gauche/0.5/${MACHINE_GNU_PLATFORM}/libcharconv.so
+lib/gauche/0.5/${MACHINE_GNU_PLATFORM}/libgauche.a
+lib/gauche/0.5/${MACHINE_GNU_PLATFORM}/libgauche.so
+lib/gauche/0.5/${MACHINE_GNU_PLATFORM}/libnet.so
+lib/gauche/0.5/${MACHINE_GNU_PLATFORM}/libuvector.so
+lib/gauche/0.5/${MACHINE_GNU_PLATFORM}/ndbm.so
+lib/gauche/0.5/${MACHINE_GNU_PLATFORM}/termios.so
+lib/gauche/site/0.5/${MACHINE_GNU_PLATFORM}/example.so
 lib/libgauche.a
 lib/libgauche.so
-share/gauche/0.4.2/include/gauche.h
-share/gauche/0.4.2/include/gauche/char_euc_jp.h
-share/gauche/0.4.2/include/gauche/char_none.h
-share/gauche/0.4.2/include/gauche/char_sjis.h
-share/gauche/0.4.2/include/gauche/char_utf_8.h
-share/gauche/0.4.2/include/gauche/config.h
-share/gauche/0.4.2/include/gauche/net.h
-share/gauche/0.4.2/include/gauche/netconfig.h
-share/gauche/0.4.2/include/gauche/portmacros.h
-share/gauche/0.4.2/include/gauche/predef-syms.h
-share/gauche/0.4.2/include/gauche/uvector.h
-share/gauche/0.4.2/include/gauche/vm.h
-share/gauche/0.4.2/include/gauche/vminsn.h
-share/gauche/0.4.2/include/gc.h
-share/gauche/0.4.2/lib/gauche-init.scm
-share/gauche/0.4.2/lib/gauche/charconv.scm
-share/gauche/0.4.2/lib/gauche/let-opt.scm
-share/gauche/0.4.2/lib/gauche/macroutil.scm
-share/gauche/0.4.2/lib/gauche/net.scm
-share/gauche/0.4.2/lib/gauche/numerical.scm
-share/gauche/0.4.2/lib/gauche/object.scm
-share/gauche/0.4.2/lib/gauche/parseopt.scm
-share/gauche/0.4.2/lib/gauche/process.scm
-share/gauche/0.4.2/lib/gauche/regexp.scm
-share/gauche/0.4.2/lib/gauche/serializer.scm
-share/gauche/0.4.2/lib/gauche/serializer/aserializer.scm
-share/gauche/0.4.2/lib/gauche/test.scm
-share/gauche/0.4.2/lib/gauche/vm/disasm.scm
-share/gauche/0.4.2/lib/gauche/with.scm
-share/gauche/0.4.2/lib/genstub
-share/gauche/0.4.2/lib/japanize-euc.scm
-share/gauche/0.4.2/lib/port/jfilter.scm
-share/gauche/0.4.2/lib/rfc/822.scm
-share/gauche/0.4.2/lib/rfc/base64.scm
-share/gauche/0.4.2/lib/slib.scm
-share/gauche/0.4.2/lib/srfi-0.scm
-share/gauche/0.4.2/lib/srfi-1.scm
-share/gauche/0.4.2/lib/srfi-1/cat.scm
-share/gauche/0.4.2/lib/srfi-1/filter.scm
-share/gauche/0.4.2/lib/srfi-1/finder.scm
-share/gauche/0.4.2/lib/srfi-1/folder.scm
-share/gauche/0.4.2/lib/srfi-1/generator.scm
-share/gauche/0.4.2/lib/srfi-1/mapper.scm
-share/gauche/0.4.2/lib/srfi-1/nary.scm
-share/gauche/0.4.2/lib/srfi-1/nth.scm
-share/gauche/0.4.2/lib/srfi-1/pred.scm
-share/gauche/0.4.2/lib/srfi-1/selector.scm
-share/gauche/0.4.2/lib/srfi-1/set.scm
-share/gauche/0.4.2/lib/srfi-1/zipper.scm
-share/gauche/0.4.2/lib/srfi-11.scm
-share/gauche/0.4.2/lib/srfi-13.scm
-share/gauche/0.4.2/lib/srfi-13/casemap.scm
-share/gauche/0.4.2/lib/srfi-13/comparer.scm
-share/gauche/0.4.2/lib/srfi-13/filter.scm
-share/gauche/0.4.2/lib/srfi-13/folder.scm
-share/gauche/0.4.2/lib/srfi-13/generator.scm
-share/gauche/0.4.2/lib/srfi-13/hash.scm
-share/gauche/0.4.2/lib/srfi-13/internal.scm
-share/gauche/0.4.2/lib/srfi-13/kmp.scm
-share/gauche/0.4.2/lib/srfi-13/misc.scm
-share/gauche/0.4.2/lib/srfi-13/pred.scm
-share/gauche/0.4.2/lib/srfi-13/prefix.scm
-share/gauche/0.4.2/lib/srfi-13/revapp.scm
-share/gauche/0.4.2/lib/srfi-13/rotator.scm
-share/gauche/0.4.2/lib/srfi-13/searcher.scm
-share/gauche/0.4.2/lib/srfi-13/selector.scm
-share/gauche/0.4.2/lib/srfi-14.scm
-share/gauche/0.4.2/lib/srfi-14/query.scm
-share/gauche/0.4.2/lib/srfi-14/set.scm
-share/gauche/0.4.2/lib/srfi-2.scm
-share/gauche/0.4.2/lib/srfi-4.scm
-share/gauche/0.4.2/lib/srfi-9.scm
+share/gauche/0.5/include/gauche.h
+share/gauche/0.5/include/gauche/char_euc_jp.h
+share/gauche/0.5/include/gauche/char_none.h
+share/gauche/0.5/include/gauche/char_sjis.h
+share/gauche/0.5/include/gauche/char_utf_8.h
+share/gauche/0.5/include/gauche/config.h
+share/gauche/0.5/include/gauche/fcntl.h
+share/gauche/0.5/include/gauche/net.h
+share/gauche/0.5/include/gauche/netconfig.h
+share/gauche/0.5/include/gauche/portmacros.h
+share/gauche/0.5/include/gauche/predef-syms.h
+share/gauche/0.5/include/gauche/termios.h
+share/gauche/0.5/include/gauche/uvector.h
+share/gauche/0.5/include/gauche/vm.h
+share/gauche/0.5/include/gauche/vminsn.h
+share/gauche/0.5/include/gc.h
+share/gauche/0.5/lib/dbm.scm
+share/gauche/0.5/lib/dbm/ndbm.scm
+share/gauche/0.5/lib/gauche-init.scm
+share/gauche/0.5/lib/gauche/charconv.scm
+share/gauche/0.5/lib/gauche/collection.scm
+share/gauche/0.5/lib/gauche/common-macros.scm
+share/gauche/0.5/lib/gauche/fcntl.scm
+share/gauche/0.5/lib/gauche/interactive.scm
+share/gauche/0.5/lib/gauche/let-opt.scm
+share/gauche/0.5/lib/gauche/logger.scm
+share/gauche/0.5/lib/gauche/logical.scm
+share/gauche/0.5/lib/gauche/macroutil.scm
+share/gauche/0.5/lib/gauche/net.scm
+share/gauche/0.5/lib/gauche/numerical.scm
+share/gauche/0.5/lib/gauche/object.scm
+share/gauche/0.5/lib/gauche/parseopt.scm
+share/gauche/0.5/lib/gauche/port.scm
+share/gauche/0.5/lib/gauche/process.scm
+share/gauche/0.5/lib/gauche/regexp.scm
+share/gauche/0.5/lib/gauche/selector.scm
+share/gauche/0.5/lib/gauche/sequence.scm
+share/gauche/0.5/lib/gauche/serializer.scm
+share/gauche/0.5/lib/gauche/serializer/aserializer.scm
+share/gauche/0.5/lib/gauche/signal.scm
+share/gauche/0.5/lib/gauche/singleton.scm
+share/gauche/0.5/lib/gauche/termios.scm
+share/gauche/0.5/lib/gauche/test.scm
+share/gauche/0.5/lib/gauche/validator.scm
+share/gauche/0.5/lib/gauche/vm/debugger.scm
+share/gauche/0.5/lib/gauche/vm/disasm.scm
+share/gauche/0.5/lib/gauche/with.scm
+share/gauche/0.5/lib/genstub
+share/gauche/0.5/lib/japanize-euc.scm
+share/gauche/0.5/lib/port/jfilter.scm
+share/gauche/0.5/lib/port/stk.scm
+share/gauche/0.5/lib/rfc/822.scm
+share/gauche/0.5/lib/rfc/base64.scm
+share/gauche/0.5/lib/rfc/cookie.scm
+share/gauche/0.5/lib/rfc/quoted-printable.scm
+share/gauche/0.5/lib/rfc/uri.scm
+share/gauche/0.5/lib/slib.scm
+share/gauche/0.5/lib/srfi-0.scm
+share/gauche/0.5/lib/srfi-1.scm
+share/gauche/0.5/lib/srfi-1/cat.scm
+share/gauche/0.5/lib/srfi-1/filter.scm
+share/gauche/0.5/lib/srfi-1/finder.scm
+share/gauche/0.5/lib/srfi-1/folder.scm
+share/gauche/0.5/lib/srfi-1/generator.scm
+share/gauche/0.5/lib/srfi-1/mapper.scm
+share/gauche/0.5/lib/srfi-1/nary.scm
+share/gauche/0.5/lib/srfi-1/nth.scm
+share/gauche/0.5/lib/srfi-1/pred.scm
+share/gauche/0.5/lib/srfi-1/selector.scm
+share/gauche/0.5/lib/srfi-1/set.scm
+share/gauche/0.5/lib/srfi-1/zipper.scm
+share/gauche/0.5/lib/srfi-11.scm
+share/gauche/0.5/lib/srfi-13.scm
+share/gauche/0.5/lib/srfi-13/casemap.scm
+share/gauche/0.5/lib/srfi-13/comparer.scm
+share/gauche/0.5/lib/srfi-13/filter.scm
+share/gauche/0.5/lib/srfi-13/folder.scm
+share/gauche/0.5/lib/srfi-13/generator.scm
+share/gauche/0.5/lib/srfi-13/hash.scm
+share/gauche/0.5/lib/srfi-13/internal.scm
+share/gauche/0.5/lib/srfi-13/kmp.scm
+share/gauche/0.5/lib/srfi-13/misc.scm
+share/gauche/0.5/lib/srfi-13/pred.scm
+share/gauche/0.5/lib/srfi-13/prefix.scm
+share/gauche/0.5/lib/srfi-13/revapp.scm
+share/gauche/0.5/lib/srfi-13/rotator.scm
+share/gauche/0.5/lib/srfi-13/searcher.scm
+share/gauche/0.5/lib/srfi-13/selector.scm
+share/gauche/0.5/lib/srfi-14.scm
+share/gauche/0.5/lib/srfi-14/query.scm
+share/gauche/0.5/lib/srfi-14/set.scm
+share/gauche/0.5/lib/srfi-2.scm
+share/gauche/0.5/lib/srfi-4.scm
+share/gauche/0.5/lib/srfi-9.scm
+share/gauche/0.5/lib/text/csv.scm
+share/gauche/0.5/lib/text/html-lite.scm
+share/gauche/0.5/lib/text/parse.scm
+share/gauche/0.5/lib/text/tr.scm
+share/gauche/0.5/lib/text/tree.scm
+share/gauche/0.5/lib/util/isomorph.scm
+share/gauche/0.5/lib/util/queue.scm
+share/gauche/0.5/lib/util/toposort.scm
+share/gauche/0.5/lib/util/tree.scm
+share/gauche/0.5/lib/www/cgi.scm
 share/gauche/site/lib/example.scm
+@dirrm lib/gauche/site/0.5/${MACHINE_GNU_PLATFORM}
+@dirrm lib/gauche/site/0.5
+@dirrm lib/gauche/site
+@dirrm lib/gauche/0.5/${MACHINE_GNU_PLATFORM}
+@dirrm lib/gauche/0.5
+@dirrm lib/gauche
 @dirrm share/gauche/site/lib
 @dirrm share/gauche/site
-@dirrm share/gauche/0.4.2/lib/srfi-14
-@dirrm share/gauche/0.4.2/lib/srfi-13
-@dirrm share/gauche/0.4.2/lib/srfi-1
-@dirrm share/gauche/0.4.2/lib/rfc
-@dirrm share/gauche/0.4.2/lib/port
-@dirrm share/gauche/0.4.2/lib/gauche/vm
-@dirrm share/gauche/0.4.2/lib/gauche/serializer
-@dirrm share/gauche/0.4.2/lib/gauche
-@dirrm share/gauche/0.4.2/lib
-@dirrm share/gauche/0.4.2/include/gauche
-@dirrm share/gauche/0.4.2/include
-@dirrm share/gauche/0.4.2
+@dirrm share/gauche/0.5/lib/www
+@dirrm share/gauche/0.5/lib/util
+@dirrm share/gauche/0.5/lib/text
+@dirrm share/gauche/0.5/lib/srfi-14
+@dirrm share/gauche/0.5/lib/srfi-13
+@dirrm share/gauche/0.5/lib/srfi-1
+@dirrm share/gauche/0.5/lib/rfc
+@dirrm share/gauche/0.5/lib/port
+@dirrm share/gauche/0.5/lib/gauche/vm
+@dirrm share/gauche/0.5/lib/gauche/serializer
+@dirrm share/gauche/0.5/lib/gauche
+@dirrm share/gauche/0.5/lib/dbm
+@dirrm share/gauche/0.5/lib
+@dirrm share/gauche/0.5/include/gauche
+@dirrm share/gauche/0.5/include
+@dirrm share/gauche/0.5
 @dirrm share/gauche
-@dirrm lib/gauche/site/0.4.2/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}
-@dirrm lib/gauche/site/0.4.2
-@dirrm lib/gauche/site
-@dirrm lib/gauche/0.4.2/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}
-@dirrm lib/gauche/0.4.2
-@dirrm lib/gauche
diff --git a/lang/gauche/distinfo b/lang/gauche/distinfo
index 127d1df2719..d56b548f300 100644
--- a/lang/gauche/distinfo
+++ b/lang/gauche/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/07/15 13:52:28 minoura Exp $
+$NetBSD: distinfo,v 1.3 2002/02/01 08:10:39 minoura Exp $
 
-SHA1 (Gauche-0.4.2.tgz) = 9f69c4469a04a76c064d5b946e70f5c96b69761e
-Size (Gauche-0.4.2.tgz) = 1036907 bytes
-SHA1 (patch-aa) = 135ace2c47c1512ff7a2750c83458688dc30d011
+SHA1 (Gauche-0.5.tgz) = a0c0f23855bb51eb98f876b49b10dc094aa77a6d
+Size (Gauche-0.5.tgz) = 1218216 bytes
+SHA1 (patch-ad) = 7574f5ffe95671ac01f4b5dc1775bc93f10d062e
diff --git a/lang/gauche/patches/patch-aa b/lang/gauche/patches/patch-aa
deleted file mode 100644
index e4958901477..00000000000
--- a/lang/gauche/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/05/31 09:56:59 minoura Exp $
---- src/Makefile.in.orig	Tue May  1 19:28:18 2001
-+++ src/Makefile.in	Sat May 12 10:24:47 2001
-@@ -2,8 +2,9 @@
- LIBS = @LIBS@
- DEFS = @DEFS@
- #CFLAGS = -g -O2 -I. -I../gc -I../gc/include @SHLIB_SO_CFLAGS@
--CFLAGS = -g -O2 -I. -I../gc -I../gc/include @SHLIB_SO_CFLAGS@
-+#CFLAGS = -g -O2 -I. -I../gc -I../gc/include @SHLIB_SO_CFLAGS@
- #CFLAGS = -O2 -I. -I../gc -I../gc/include
-+CFLAGS = -O2 -I. -I../gc -I../gc/include @SHLIB_SO_CFLAGS@
- LDFLAGS = @SHLIB_MAIN_LDFLAGS@
- AR = ar
- 
diff --git a/lang/gauche/patches/patch-ad b/lang/gauche/patches/patch-ad
new file mode 100644
index 00000000000..a206b2a4308
--- /dev/null
+++ b/lang/gauche/patches/patch-ad
@@ -0,0 +1,15 @@
+$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"