Updated Gauche package to latest release, 0.7.4.2.

Many changes were made from previous packaged version, 0.6.3;  Lots of
improvements and bug fixes, including security ones.  Please take a look
at its WWW page for more detailes.

http://www.shiro.dreamhost.com/scheme/gauche/

pkgsrc changes:

- support buildlink2.  buildlink3.mk is also added but not tested since
  I have not moved to buildlink3 environment yet.

- this package now uses libgcudevel/boehm-gc instead of self contained,
  slightly modified one.  It seems that this package runs under m68k.

12 files changed, 282 insertions, 141 deletions

diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index dd46bc5ceb4..2eef4153ac0 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -1,18 +1,16 @@
-# $NetBSD: Makefile,v 1.18 2003/09/17 16:52:10 yyamano Exp $
+# $NetBSD: Makefile,v 1.19 2004/03/29 09:34:26 kei Exp $
 #
 
-DISTNAME=	Gauche-0.6.3
-PKGREVISION=	3
+DISTNAME=	Gauche-0.7.4.2
+PKGREVISION=	#
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gauche/}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	minoura@NetBSD.org
 HOMEPAGE=	http://www.shiro.dreamhost.com/scheme/gauche/index.html
-COMMENT=	R5RS Scheme implementation developed to be a handy script interpreter
+COMMENT=	R5RS Scheme implementation aimed to be a handy tool for daily works
 
-# devel/boehm-gc cannot be used because Gauche requires PIC version
-#DEPENDS+=	boehm-gc-[0-9]*:../../devel/boehm-gc
 DEPENDS+=	slib-[0-9]*:../../devel/slib
 
 # Due to GC dynamic loading support, this package runs on limited platforms
@@ -46,6 +44,7 @@ CONFIGURE_ARGS+=	--enable-multibyte=${GAUCHE_MULTIBYTE}
 .if ${OPSYS} == "Darwin"
 .  include "../../devel/dlcompat/buildlink2.mk"
 .endif
+.include "../../devel/boehm-gc/buildlink2.mk"
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/lang/gauche/PLIST b/lang/gauche/PLIST
index eadb15acb3c..886df59716b 100644
--- a/lang/gauche/PLIST
+++ b/lang/gauche/PLIST
@@ -1,21 +1,24 @@
-@comment $NetBSD: PLIST,v 1.7 2004/03/02 11:03:54 seb Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/03/29 09:34:26 kei Exp $
 bin/gauche-config
 bin/gosh
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/auxsys.so
+lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/binary.so
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/fcntl.so
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche-config
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gosh
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/libcharconv.so
-lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/libgauche.a
+lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/libgauche-uvector.so
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/libgauche.so
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/libnet.so
-lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/libuvector.so
+lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/md5.so
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/mt-random.so
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/ndbm.so
+lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sha1.so
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/syslog.so
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/termios.so
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/threads.so
 lib/gauche/${PKGVERSION}/include/gauche.h
+lib/gauche/${PKGVERSION}/include/gauche/arch.h
 lib/gauche/${PKGVERSION}/include/gauche/char_euc_jp.h
 lib/gauche/${PKGVERSION}/include/gauche/char_none.h
 lib/gauche/${PKGVERSION}/include/gauche/char_sjis.h
@@ -24,64 +27,83 @@ lib/gauche/${PKGVERSION}/include/gauche/class.h
 lib/gauche/${PKGVERSION}/include/gauche/config.h
 lib/gauche/${PKGVERSION}/include/gauche/exception.h
 lib/gauche/${PKGVERSION}/include/gauche/extend.h
-lib/gauche/${PKGVERSION}/include/gauche/fcntl.h
+lib/gauche/${PKGVERSION}/include/gauche/int64.h
 lib/gauche/${PKGVERSION}/include/gauche/net.h
-lib/gauche/${PKGVERSION}/include/gauche/netconfig.h
-lib/gauche/${PKGVERSION}/include/gauche/predef-syms.h
 lib/gauche/${PKGVERSION}/include/gauche/pthread.h
-lib/gauche/${PKGVERSION}/include/gauche/termconfig.h
-lib/gauche/${PKGVERSION}/include/gauche/termios.h
+lib/gauche/${PKGVERSION}/include/gauche/scmconst.h
 lib/gauche/${PKGVERSION}/include/gauche/uthread.h
 lib/gauche/${PKGVERSION}/include/gauche/uvector.h
 lib/gauche/${PKGVERSION}/include/gauche/vm.h
 lib/gauche/${PKGVERSION}/include/gauche/vminsn.h
-lib/gauche/${PKGVERSION}/include/gc.h
-lib/gauche/${PKGVERSION}/include/gc_pthread_redirects.h
-lib/gauche/site/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/example.so
-lib/libgauche.a
+@exec ${MKDIR} %D/lib/gauche/site/${PKGVERSION}/${MACHINE_GNU_PLATFORM}
 lib/libgauche.so
 man/man1/gauche-config.1
 man/man1/gosh.1
+share/aclocal/gauche.m4
 share/gauche/${PKGVERSION}/aclocal.m4
+share/gauche/${PKGVERSION}/lib/binary/io.scm
+share/gauche/${PKGVERSION}/lib/binary/pack.scm
+share/gauche/${PKGVERSION}/lib/cesconv
+share/gauche/${PKGVERSION}/lib/compat/jfilter.scm
+share/gauche/${PKGVERSION}/lib/compat/stk.scm
 share/gauche/${PKGVERSION}/lib/dbm.scm
+share/gauche/${PKGVERSION}/lib/dbm/fsdbm.scm
 share/gauche/${PKGVERSION}/lib/dbm/ndbm.scm
 share/gauche/${PKGVERSION}/lib/file/filter.scm
 share/gauche/${PKGVERSION}/lib/file/util.scm
 share/gauche/${PKGVERSION}/lib/gauche-init.scm
 share/gauche/${PKGVERSION}/lib/gauche/array.scm
 share/gauche/${PKGVERSION}/lib/gauche/auxsys.scm
+share/gauche/${PKGVERSION}/lib/gauche/cgen.scm
 share/gauche/${PKGVERSION}/lib/gauche/charconv.scm
 share/gauche/${PKGVERSION}/lib/gauche/collection.scm
 share/gauche/${PKGVERSION}/lib/gauche/common-macros.scm
+share/gauche/${PKGVERSION}/lib/gauche/config.scm
 share/gauche/${PKGVERSION}/lib/gauche/defvalues.scm
 share/gauche/${PKGVERSION}/lib/gauche/fcntl.scm
+share/gauche/${PKGVERSION}/lib/gauche/fileutil.scm
+share/gauche/${PKGVERSION}/lib/gauche/hashutil.scm
+share/gauche/${PKGVERSION}/lib/gauche/hook.scm
 share/gauche/${PKGVERSION}/lib/gauche/interactive.scm
 share/gauche/${PKGVERSION}/lib/gauche/interactive/info.scm
 share/gauche/${PKGVERSION}/lib/gauche/interpolate.scm
+share/gauche/${PKGVERSION}/lib/gauche/ioutil.scm
 share/gauche/${PKGVERSION}/lib/gauche/let-opt.scm
+share/gauche/${PKGVERSION}/lib/gauche/libutil.scm
+share/gauche/${PKGVERSION}/lib/gauche/listener.scm
+share/gauche/${PKGVERSION}/lib/gauche/listutil.scm
 share/gauche/${PKGVERSION}/lib/gauche/logger.scm
 share/gauche/${PKGVERSION}/lib/gauche/logical.scm
 share/gauche/${PKGVERSION}/lib/gauche/macroutil.scm
+share/gauche/${PKGVERSION}/lib/gauche/modutil.scm
 share/gauche/${PKGVERSION}/lib/gauche/mop/instance-pool.scm
+share/gauche/${PKGVERSION}/lib/gauche/mop/propagate.scm
+share/gauche/${PKGVERSION}/lib/gauche/mop/singleton.scm
+share/gauche/${PKGVERSION}/lib/gauche/mop/validator.scm
 share/gauche/${PKGVERSION}/lib/gauche/net.scm
 share/gauche/${PKGVERSION}/lib/gauche/numerical.scm
 share/gauche/${PKGVERSION}/lib/gauche/object.scm
 share/gauche/${PKGVERSION}/lib/gauche/parameter.scm
 share/gauche/${PKGVERSION}/lib/gauche/parseopt.scm
-share/gauche/${PKGVERSION}/lib/gauche/port.scm
+share/gauche/${PKGVERSION}/lib/gauche/portutil.scm
 share/gauche/${PKGVERSION}/lib/gauche/procedure.scm
 share/gauche/${PKGVERSION}/lib/gauche/process.scm
+share/gauche/${PKGVERSION}/lib/gauche/redefutil.scm
 share/gauche/${PKGVERSION}/lib/gauche/regexp.scm
+share/gauche/${PKGVERSION}/lib/gauche/reload.scm
 share/gauche/${PKGVERSION}/lib/gauche/selector.scm
 share/gauche/${PKGVERSION}/lib/gauche/sequence.scm
 share/gauche/${PKGVERSION}/lib/gauche/serializer.scm
 share/gauche/${PKGVERSION}/lib/gauche/serializer/aserializer.scm
 share/gauche/${PKGVERSION}/lib/gauche/signal.scm
 share/gauche/${PKGVERSION}/lib/gauche/singleton.scm
+share/gauche/${PKGVERSION}/lib/gauche/sortutil.scm
+share/gauche/${PKGVERSION}/lib/gauche/stringutil.scm
 share/gauche/${PKGVERSION}/lib/gauche/syslog.scm
 share/gauche/${PKGVERSION}/lib/gauche/termios.scm
 share/gauche/${PKGVERSION}/lib/gauche/test.scm
 share/gauche/${PKGVERSION}/lib/gauche/threads.scm
+share/gauche/${PKGVERSION}/lib/gauche/time.scm
 share/gauche/${PKGVERSION}/lib/gauche/uvector.scm
 share/gauche/${PKGVERSION}/lib/gauche/validator.scm
 share/gauche/${PKGVERSION}/lib/gauche/version.scm
@@ -89,15 +111,17 @@ share/gauche/${PKGVERSION}/lib/gauche/vm/debugger.scm
 share/gauche/${PKGVERSION}/lib/gauche/vm/disasm.scm
 share/gauche/${PKGVERSION}/lib/gauche/with.scm
 share/gauche/${PKGVERSION}/lib/genstub
-share/gauche/${PKGVERSION}/lib/japanize-euc.scm
 share/gauche/${PKGVERSION}/lib/math/const.scm
 share/gauche/${PKGVERSION}/lib/math/mt-random.scm
-share/gauche/${PKGVERSION}/lib/port/jfilter.scm
-share/gauche/${PKGVERSION}/lib/port/stk.scm
 share/gauche/${PKGVERSION}/lib/rfc/822.scm
 share/gauche/${PKGVERSION}/lib/rfc/base64.scm
 share/gauche/${PKGVERSION}/lib/rfc/cookie.scm
+share/gauche/${PKGVERSION}/lib/rfc/hmac.scm
+share/gauche/${PKGVERSION}/lib/rfc/http.scm
+share/gauche/${PKGVERSION}/lib/rfc/md5.scm
+share/gauche/${PKGVERSION}/lib/rfc/mime.scm
 share/gauche/${PKGVERSION}/lib/rfc/quoted-printable.scm
+share/gauche/${PKGVERSION}/lib/rfc/sha1.scm
 share/gauche/${PKGVERSION}/lib/rfc/uri.scm
 share/gauche/${PKGVERSION}/lib/slib.scm
 share/gauche/${PKGVERSION}/lib/slibcat
@@ -141,31 +165,54 @@ share/gauche/${PKGVERSION}/lib/srfi-19/read-tai.scm
 share/gauche/${PKGVERSION}/lib/srfi-2.scm
 share/gauche/${PKGVERSION}/lib/srfi-26.scm
 share/gauche/${PKGVERSION}/lib/srfi-27.scm
+share/gauche/${PKGVERSION}/lib/srfi-29.scm
+share/gauche/${PKGVERSION}/lib/srfi-29/bundle.scm
+share/gauche/${PKGVERSION}/lib/srfi-29/format.scm
+share/gauche/${PKGVERSION}/lib/srfi-31.scm
+share/gauche/${PKGVERSION}/lib/srfi-37.scm
 share/gauche/${PKGVERSION}/lib/srfi-4.scm
+share/gauche/${PKGVERSION}/lib/srfi-5.scm
+share/gauche/${PKGVERSION}/lib/srfi-7.scm
 share/gauche/${PKGVERSION}/lib/srfi-9.scm
+share/gauche/${PKGVERSION}/lib/sxml/adaptor.scm
+share/gauche/${PKGVERSION}/lib/sxml/ssax.scm
+share/gauche/${PKGVERSION}/lib/sxml/sxpath.scm
+share/gauche/${PKGVERSION}/lib/sxml/to-html.scm
+share/gauche/${PKGVERSION}/lib/sxml/tools.scm
+share/gauche/${PKGVERSION}/lib/sxml/tree-trans.scm
 share/gauche/${PKGVERSION}/lib/text/csv.scm
+share/gauche/${PKGVERSION}/lib/text/diff.scm
+share/gauche/${PKGVERSION}/lib/text/gettext.scm
 share/gauche/${PKGVERSION}/lib/text/html-lite.scm
 share/gauche/${PKGVERSION}/lib/text/info.scm
 share/gauche/${PKGVERSION}/lib/text/parse.scm
 share/gauche/${PKGVERSION}/lib/text/tr.scm
 share/gauche/${PKGVERSION}/lib/text/tree.scm
+share/gauche/${PKGVERSION}/lib/util/combinations.scm
+share/gauche/${PKGVERSION}/lib/util/digest.scm
 share/gauche/${PKGVERSION}/lib/util/isomorph.scm
+share/gauche/${PKGVERSION}/lib/util/lcs.scm
+share/gauche/${PKGVERSION}/lib/util/list.scm
 share/gauche/${PKGVERSION}/lib/util/queue.scm
+share/gauche/${PKGVERSION}/lib/util/record.scm
 share/gauche/${PKGVERSION}/lib/util/toposort.scm
 share/gauche/${PKGVERSION}/lib/util/tree.scm
+share/gauche/${PKGVERSION}/lib/www/cgi-test.scm
 share/gauche/${PKGVERSION}/lib/www/cgi.scm
-share/gauche/site/lib/example.scm
+@exec ${MKDIR} %D/share/gauche/site
+@exec ${MKDIR} %D/share/gauche/site/lib
 @dirrm share/gauche/site/lib
 @dirrm share/gauche/site
 @dirrm share/gauche/${PKGVERSION}/lib/www
 @dirrm share/gauche/${PKGVERSION}/lib/util
 @dirrm share/gauche/${PKGVERSION}/lib/text
+@dirrm share/gauche/${PKGVERSION}/lib/sxml
+@dirrm share/gauche/${PKGVERSION}/lib/srfi-29
 @dirrm share/gauche/${PKGVERSION}/lib/srfi-19
 @dirrm share/gauche/${PKGVERSION}/lib/srfi-14
 @dirrm share/gauche/${PKGVERSION}/lib/srfi-13
 @dirrm share/gauche/${PKGVERSION}/lib/srfi-1
 @dirrm share/gauche/${PKGVERSION}/lib/rfc
-@dirrm share/gauche/${PKGVERSION}/lib/port
 @dirrm share/gauche/${PKGVERSION}/lib/math
 @dirrm share/gauche/${PKGVERSION}/lib/gauche/vm
 @dirrm share/gauche/${PKGVERSION}/lib/gauche/serializer
@@ -174,14 +221,17 @@ share/gauche/site/lib/example.scm
 @dirrm share/gauche/${PKGVERSION}/lib/gauche
 @dirrm share/gauche/${PKGVERSION}/lib/file
 @dirrm share/gauche/${PKGVERSION}/lib/dbm
+@dirrm share/gauche/${PKGVERSION}/lib/compat
+@dirrm share/gauche/${PKGVERSION}/lib/binary
 @dirrm share/gauche/${PKGVERSION}/lib
 @dirrm share/gauche/${PKGVERSION}
 @dirrm share/gauche
+@unexec ${RMDIR} %D/share/aclocal 2>/dev/null || ${TRUE}
 @dirrm lib/gauche/site/${PKGVERSION}/${MACHINE_GNU_PLATFORM}
 @dirrm lib/gauche/site/${PKGVERSION}
 @dirrm lib/gauche/site
 @dirrm lib/gauche/${PKGVERSION}/include/gauche
 @dirrm lib/gauche/${PKGVERSION}/include
-@dirrm lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}
+@dirrm lib/gauche/${PKGVERSION}/i386--netbsdelf
 @dirrm lib/gauche/${PKGVERSION}
 @dirrm lib/gauche
diff --git a/lang/gauche/buildlink2.mk b/lang/gauche/buildlink2.mk
new file mode 100644
index 00000000000..af03050e625
--- /dev/null
+++ b/lang/gauche/buildlink2.mk
@@ -0,0 +1,65 @@
+# $NetBSD: buildlink2.mk,v 1.1 2004/03/29 09:34:26 kei Exp $
+# XXX
+# XXX This file was created automatically using createbuildlink-3.4.
+# XXX After this file as been verified as correct, the comment lines
+# XXX beginning with "XXX" should be removed.  Please do not commit
+# XXX unverified buildlink[23].mk files.
+# XXX
+# XXX Packages that only install static libraries or headers should
+# XXX include the following line:
+# XXX
+# XXX	BUILDLINK_DEPMETHOD.Gauche?=	build
+
+.if !defined(GAUCHE_BUILDLINK2_MK)
+GAUCHE_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		Gauche
+BUILDLINK_DEPENDS.Gauche?=	Gauche>=0.7.4.2
+BUILDLINK_PKGSRCDIR.Gauche?=	../../lang/gauche
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.Gauche=Gauche
+BUILDLINK_PREFIX.Gauche_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/auxsys.*
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/binary.*
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/fcntl.*
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche-config
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gosh
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/libcharconv.*
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/libgauche-uvector.*
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/libgauche.*
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/libnet.*
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/md5.*
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/mt-random.*
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/ndbm.*
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sha1.*
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/syslog.*
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/termios.*
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/threads.*
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/include/gauche.h
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/include/gauche/arch.h
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/include/gauche/char_euc_jp.h
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/include/gauche/char_none.h
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/include/gauche/char_sjis.h
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/include/gauche/char_utf_8.h
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/include/gauche/class.h
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/include/gauche/config.h
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/include/gauche/exception.h
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/include/gauche/extend.h
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/include/gauche/int64.h
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/include/gauche/net.h
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/include/gauche/pthread.h
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/include/gauche/scmconst.h
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/include/gauche/uthread.h
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/include/gauche/uvector.h
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/include/gauche/vm.h
+BUILDLINK_FILES.Gauche+=	lib/gauche/${PKGVERSION}/include/gauche/vminsn.h
+BUILDLINK_FILES.Gauche+=	lib/libgauche.*
+
+.include "../../devel/boehm-gc/buildlink2.mk"
+.include "../../converters/libiconv/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	Gauche-buildlink
+
+Gauche-buildlink: _BUILDLINK_USE
+
+.endif	# GAUCHE_BUILDLINK2_MK
diff --git a/lang/gauche/buildlink3.mk b/lang/gauche/buildlink3.mk
new file mode 100644
index 00000000000..f320bebecfe
--- /dev/null
+++ b/lang/gauche/buildlink3.mk
@@ -0,0 +1,31 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/29 09:34:26 kei Exp $
+# XXX
+# XXX This file was created automatically using createbuildlink-3.4.
+# XXX After this file as been verified as correct, the comment lines
+# XXX beginning with "XXX" should be removed.  Please do not commit
+# XXX unverified buildlink[23].mk files.
+# XXX
+# XXX Packages that only install static libraries or headers should
+# XXX include the following line:
+# XXX
+# XXX	BUILDLINK_DEPMETHOD.Gauche?=	build
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GAUCHE_BUILDLINK3_MK:=	${GAUCHE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	Gauche
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGauche}
+BUILDLINK_PACKAGES+=	Gauche
+
+.if !empty(GAUCHE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.Gauche+=	Gauche>=0.7.4.2
+BUILDLINK_PKGSRCDIR.Gauche?=	../../lang/gauche
+.endif	# GAUCHE_BUILDLINK3_MK
+
+.include "../../devel/boehm-gc/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/gauche/distinfo b/lang/gauche/distinfo
index 832252baa53..c04669976e5 100644
--- a/lang/gauche/distinfo
+++ b/lang/gauche/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.10 2003/07/04 19:37:03 seb Exp $
+$NetBSD: distinfo,v 1.11 2004/03/29 09:34:26 kei Exp $
 
-SHA1 (Gauche-0.6.3.tgz) = e2a80b7f20a93eb7af7b649dce0b0667810bad40
-Size (Gauche-0.6.3.tgz) = 2449515 bytes
-SHA1 (patch-ae) = a8337687186ecd4668fd800cc12ff314a0dda53f
-SHA1 (patch-ag) = e786a63aa79a98a4ae5c38147d98f4f424e1c54f
-SHA1 (patch-ah) = 51aab47a05be6d8eedb562f98937a66485386733
-SHA1 (patch-ba) = ab0f7e77bc116b9975897f0381edde7981030b6c
+SHA1 (Gauche-0.7.4.2.tgz) = 87a48aa152ff1bda149453a2320e73e792db6cff
+Size (Gauche-0.7.4.2.tgz) = 2401071 bytes
+SHA1 (patch-aa) = 81a351b08cbd957242f88eb43d26c65ba95fe2f2
+SHA1 (patch-ab) = c08f8b9fbed9d9f41cddfddb386a756e8bd322cc
+SHA1 (patch-ac) = ba544ffef3b59d824033ada5c1fb050066613db7
diff --git a/lang/gauche/patches/patch-aa b/lang/gauche/patches/patch-aa
new file mode 100644
index 00000000000..ad730b21464
--- /dev/null
+++ b/lang/gauche/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.3 2004/03/29 09:34:27 kei Exp $
+
+--- doc/gauche-ref.texi.orig	2004-02-05 06:30:07.000000000 +0900
++++ doc/gauche-ref.texi	2004-03-29 01:55:04.000000000 +0900
+@@ -5,14 +5,14 @@
+ @settitle Gauche Reference Manual
+ @dircategory The Algorithmic Language Scheme
+ @direntry
+-* Gauche Reference: (gauche-refe.info).	An R5RS Scheme implementation.
++* Gauche Reference: (gauche-refe).	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.
++* Gauche Reference (ja): (gauche-refj).	An R5RS Scheme implementation.
+ @end direntry
+ @c COMMON
+ @comment %**end of header
diff --git a/lang/gauche/patches/patch-ab b/lang/gauche/patches/patch-ab
new file mode 100644
index 00000000000..44f65cfef4e
--- /dev/null
+++ b/lang/gauche/patches/patch-ab
@@ -0,0 +1,33 @@
+$NetBSD: patch-ab,v 1.3 2004/03/29 09:34:27 kei Exp $
+
+--- Makefile.in.orig	2004-03-29 08:52:23.000000000 +0900
++++ Makefile.in	2004-03-29 08:52:42.000000000 +0900
+@@ -13,8 +13,8 @@
+ srcdir      = @srcdir@
+ datadir     = @datadir@
+ 
+-SUBDIRS = gc src lib ext doc
+-SRIDBUS = doc ext lib src gc
++SUBDIRS = src lib ext doc
++SRIDBUS = doc ext lib src
+ MKINSTDIR = @top_srcdir@/mkinstalldirs
+ INSTALL = @INSTALL@
+ GAUCHE_VERSION  = @GAUCHE_VERSION@
+@@ -22,7 +22,7 @@
+ DESTDIR =
+ 
+ CONFIG_GENERATED = Makefile config.cache config.log config.status libtool \
+-	           configure.lineno autom4* gc/autom4*
++	           configure.lineno autom4*
+ AUTOCONF_GENERATED = $(CONFIG_GENERATED) configure
+ 
+ all:
+@@ -64,7 +64,7 @@
+ 
+ maintainer-clean: clean
+ 	for d in $(SRIDBUS); do (cd $$d; $(MAKE) maintainer-clean); done
+-	rm -rf $(AUTOCONF_GENERATED) VERSION INSTALL INSTALL.eucjp DIST_EXCLUDE_X gc/configure
++	rm -rf $(AUTOCONF_GENERATED) VERSION INSTALL INSTALL.eucjp DIST_EXCLUDE_X
+ 
+ dist:
+ 	@echo "To create a distribution tarball, use DIST script."
diff --git a/lang/gauche/patches/patch-ac b/lang/gauche/patches/patch-ac
new file mode 100644
index 00000000000..97af97f16e7
--- /dev/null
+++ b/lang/gauche/patches/patch-ac
@@ -0,0 +1,52 @@
+$NetBSD: patch-ac,v 1.3 2004/03/29 09:34:27 kei Exp $
+
+--- src/Makefile.in.orig	2004-01-27 20:08:04.000000000 +0900
++++ src/Makefile.in	2004-03-29 11:06:50.000000000 +0900
+@@ -46,7 +46,7 @@
+ # These are set by configure
+ DEFS     = @DEFS@
+ OPTFLAGS = @OPTFLAGS@
+-INCLUDES = -I$(srcdir) -I$(srcdir)/../gc/include @LOCAL_INC@
++INCLUDES = -I$(srcdir) -I@prefix@/include/gc @LOCAL_INC@
+ RANLIB   = @RANLIB@
+ OBJEXT   = @OBJEXT@
+ EXEEXT   = @EXEEXT@
+@@ -80,10 +80,7 @@
+ SITE_ARCH_DIR         = $(GAUCHE_ARCH_DIR)/site/@GAUCHE_VERSION@/@host@
+ ARCH = @host@
+ 
+-INSTALL_HEADERS = gauche.h \
+-	../gc/include/gc.h \
+-	../gc/include/gc_config_macros.h \
+-	../gc/include/gc_pthread_redirects.h
++INSTALL_HEADERS = gauche.h
+ INSTALL_SUBHEADERS = gauche/config.h gauche/vm.h gauche/vminsn.h      \
+                      gauche/char_euc_jp.h gauche/char_utf_8.h         \
+                      gauche/char_sjis.h gauche/char_none.h            \
+@@ -99,7 +96,7 @@
+ 
+ # build -----------------------------------------------
+ 
+-GCLIB = ../gc/libgc.la
++GCLIB = @prefix@/lib/libgc.la
+ 
+ gosh_SOURCES = main.c
+ gosh_OBJECTS = main.$(OBJEXT)
+@@ -131,7 +128,7 @@
+ 	$(LINK) $(gosh_LDFLAGS) -o gosh$(EXEEXT) $(gosh_OBJECTS) $(gosh_LDADD) $(LIBS)
+ 
+ relink :
+-	$(RELINK) $(libgauche_LDFLAGS) libgauche.$(SOEXT) $(libgauche_OBJECTS) ../gc/.libs/*.o $(LIBS)
++	$(RELINK) $(libgauche_LDFLAGS) libgauche.$(SOEXT) $(libgauche_OBJECTS) @prefix@/lib/libgc.$(SOEXT) $(LIBS)
+ 	$(RELINK) $(gosh_LDFLAGS) -o gosh$(EXEEXT)  $(gosh_OBJECTS) $(gosh_LDADD) $(LIBS)
+ 
+ $(OBJECTS) : $(HEADERS)
+@@ -153,7 +150,7 @@
+ load.$(OBJEXT) : dl_dlopen.c dl_dummy.c dl_win.c dl_darwin.c
+ 
+ libgauche.$(SOEXT) : $(libgauche_OBJECTS) $(GCLIB)
+-	$(LINK) $(libgauche_LDFLAGS) libgauche.$(SOEXT) $(libgauche_OBJECTS) ../gc/.libs/*.o $(LIBS)
++	$(LINK) $(libgauche_LDFLAGS) libgauche.$(SOEXT) $(libgauche_OBJECTS) @prefix@/lib/libgc.$(SOEXT) $(LIBS)
+ 	$(POSTBUILD)
+ 
+ gauche/arch.h :
diff --git a/lang/gauche/patches/patch-ae b/lang/gauche/patches/patch-ae
deleted file mode 100644
index 62f71cc152d..00000000000
--- a/lang/gauche/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2003/07/03 16:02:05 yyamano Exp $
-
---- doc/Makefile.in.orig	Sun Sep  8 13:25:49 2002
-+++ doc/Makefile.in
-@@ -11,8 +11,8 @@
- # make mandir=wherever
- prefix  = @prefix@
- datadir = @datadir@
--mandir  = $(datadir)/man/man1
--infodir = $(datadir)/info
-+mandir  = @mandir@/man1
-+infodir = @infodir@
- 
- all: info
- 
diff --git a/lang/gauche/patches/patch-ag b/lang/gauche/patches/patch-ag
deleted file mode 100644
index d646eaa0bbf..00000000000
--- a/lang/gauche/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2003/07/03 16:02:05 yyamano Exp $
-
---- doc/gauche-refe.texi.orig	Sun Sep 22 20:17:03 2002
-+++ doc/gauche-refe.texi
-@@ -3,4 +3,8 @@
- @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
- @comment %**end of header
- 
diff --git a/lang/gauche/patches/patch-ah b/lang/gauche/patches/patch-ah
deleted file mode 100644
index 9fe4505738e..00000000000
--- a/lang/gauche/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2003/07/03 16:02:06 yyamano Exp $
-
---- doc/gauche-refj.texi.orig	Sun Sep 22 20:17:12 2002
-+++ doc/gauche-refj.texi
-@@ -3,4 +3,8 @@
- @setfilename gauche-refj.info
- @settitle Gauche リファレンスマニュアル
-+@dircategory The Algorithmic Language Scheme
-+@direntry
-+* Gauche Reference (ja): (gauche-refj.info).	An R5RS Scheme implementation.
-+@end direntry
- @comment %**end of header
- 
diff --git a/lang/gauche/patches/patch-ba b/lang/gauche/patches/patch-ba
deleted file mode 100644
index d4214dc1eb1..00000000000
--- a/lang/gauche/patches/patch-ba
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-ba,v 1.2 2002/10/18 08:08:33 wiz 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*/
-
-