Update from 0.5.0 to 0.6.2. From Jorge Ramon Acereda Macia <al004046 at anubis

dot uji dot es> in PR 23635.

User-visible changes between 0.6.1 and 0.6.2:

Bug fixes (in particular, gforth-0.6.2 compiles with gcc-3.3)
New words: LATEST, LATESTXT (LASTXT deprecated)
Operating environment: Added optional support for a C interface built
  on the ffcall libraries (more portable and powerful than the old
  one, but still not documented).  To use it, the ffcall libraries
  have to be installed before building Gforth (see INSTALL).
Miscellaneous: Gforth-fast now uses static superinstructions (some
  speedup on some platforms); generally this is transparent (apart
  from the speedup), but there are lots of command-line options for
  controlling the static superinstruction generation.

User-visible changes between 0.6.0 and 0.6.1:

Bug fixes (installation on big-endian machines sometimes did not work)

User-visible changes between 0.5.0 and 0.6.0:

Changes in behaviour:

S": interpreted use now ALLOCATEs the string (they live until BYE).
Long word names (512MB on 32-bit systems) are now supported (change to
  the header format).
New threaded code execution method: primitive-centric (allows the
  following), hybrid direct/indirect threaded (easier portability),
  with dynamic superinstructions (typical speedup on Athlon: factor
  2).  New engine gforth-itc for dealing with some potential
  backwards-compatibility problems (see "Direct or Indirect Threaded?"
  in the manual).

Operating environment:

Default dictionary size is now 4MB.
Large file support on OSs that support them (i.e., files with more
  than 2GB on 32-bit machines).
Gforth can now deal well with broken pipes in most situations.
vi tags files can be built with tags.fs (usage like etags.fs).
gforth.el mostly rewritten.
New image file format.

New words:

Keyboard input: EDIT-LINE K-PRIOR K-NEXT K-DELETE
File input: SLURP-FILE SLURP-FID
Programming tools: ID. .ID WORDLIST-WORDS SIMPLE-SEE
Conditional execution: [DEFINED] [UNDEFINED]
Defining Words: CONST-DOES> ]]
Input stream: PARSE-WORD EXECUTE-PARSING EXECUTE-PARSING-FILE
String comparison: STR= STR< STRING-PREFIX?
String literals: S\" .\" \"-PARSE
Floating point output: F.RDP F>STR-RDP F>BUF-RDP

Miscellaneous:

Generalized prims2x.fs into Vmgen (see README.vmgen etc.); used the
  new capabilities in prims (e.g., automatic handling of the return
  stack and instruction stream).

5 files changed, 273 insertions, 208 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index 57708a2e8ae..be139f114c6 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.3975 2003/12/04 20:53:10 xtraeme Exp $
+$NetBSD: CHANGES,v 1.3976 2003/12/05 00:26:38 uebayasi Exp $
 
 Changes to the packages collection and infrastructure in 2003:
 
@@ -4967,3 +4967,4 @@ Changes to the packages collection and infrastructure in 2003:
 	Updated xfce4-trigger-launcher to 4.0.1nb1 [xtraeme 2003-12-04]
 	Updated xscreensaver to 4.13nb1 [xtraeme 2003-12-04]
 	Updated xscreensaver-gnome to 4.13nb2 [xtraeme 2003-12-04]
+	Updated gforce to 0.6.2 [uebayasi 2003-12-05]
diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile
index 3956ed21344..804e62ade03 100644
--- a/lang/gforth/Makefile
+++ b/lang/gforth/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2003/11/03 18:35:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2003/12/05 00:26:38 uebayasi Exp $
 
-DISTNAME=		gforth-0.5.0
-PKGREVISION=		1
+DISTNAME=		gforth-0.6.2
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=gforth/}
+MASTER_SITES+=		http://www.complang.tuwien.ac.at/forth/gforth/
 
 MAINTAINER=		simonb@NetBSD.org
 HOMEPAGE=		http://www.complang.tuwien.ac.at/forth/gforth/
@@ -11,17 +11,26 @@ COMMENT=		Fast interpreter for the Forth language
 
 ONLY_FOR_PLATFORM=	*-*-alpha *-*-i386 *-*-m68k *-*-powerpc *-*-sparc
 
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
+
 # Make sure elisp will be installed even if no emacs installed.
 CONFIGURE_ENV+=		EMACS=${PREFIX}/bin/emacs
 CFLAGS+=		-Dunix
-INFO_FILES=		gforth.info
+INFO_FILES=		gforth.info vmgen.info
 
 PLIST_SRC=	${WRKDIR}/PLIST
 
-# kernel image filename is arch dependent
+TEST_TARGET=	test
+
+# Kernel image filename is arch dependent
 KERNEL_FI=	`cd ${WRKSRC} && (${ECHO} 'prkern:'; ${ECHO} '	@${ECHO} $$(kernel_fi)'; ${ECHO}; ${CAT} Makefile) | ${MAKE} -f - prkern`
 
+# XXX Need test.
+#.if ${OPSYS} == "Darwin"
+#.  include "../../devel/dlcompat/buildlink2.mk"
+#.endif
+
 post-build:
 	@${ECHO}; ${ECHO} building PLIST...
 	@k=${KERNEL_FI} && ${ECHO} "using kernel image: $$k" &&	\
@@ -30,4 +39,6 @@ post-build:
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
 
+.include "../../devel/ffcall/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/gforth/PLIST b/lang/gforth/PLIST
index 20cf0d93d32..8f507b99861 100644
--- a/lang/gforth/PLIST
+++ b/lang/gforth/PLIST
@@ -1,10 +1,14 @@
-@comment $NetBSD: PLIST,v 1.6 2003/07/05 10:41:35 seb Exp $
-bin/${PKGNAME}
+@comment $NetBSD: PLIST,v 1.7 2003/12/05 00:26:38 uebayasi Exp $
 bin/gforth
+bin/${PKGNAME}
 bin/gforth-fast
-bin/gforth-fast-0.5.0
+bin/gforth-fast-${PKGVERSION}
+bin/gforth-itc
+bin/gforth-itc-${PKGVERSION}
 bin/gforthmi
-bin/gforthmi-0.5.0
+bin/gforthmi-${PKGVERSION}
+bin/vmgen
+bin/vmgen-${PKGVERSION}
 info/gforth.info
 info/gforth.info-1
 info/gforth.info-10
@@ -12,6 +16,7 @@ info/gforth.info-11
 info/gforth.info-12
 info/gforth.info-13
 info/gforth.info-14
+info/gforth.info-15
 info/gforth.info-2
 info/gforth.info-3
 info/gforth.info-4
@@ -20,192 +25,227 @@ info/gforth.info-6
 info/gforth.info-7
 info/gforth.info-8
 info/gforth.info-9
-lib/gforth/0.5.0/gforth-ditc
-lib/gforth/0.5.0/gforth.fi
+info/vmgen.info
+info/vmgen.info-1
+info/vmgen.info-2
+lib/gforth/${PKGVERSION}/gforth-ditc
+lib/gforth/${PKGVERSION}/gforth.fi
 man/man1/gforth.1
 share/emacs/site-lisp/gforth.el
-share/gforth/0.5.0/TAGS
-share/gforth/0.5.0/add.fs
-share/gforth/0.5.0/ans-report.fs
-share/gforth/0.5.0/ansi.fs
-share/gforth/0.5.0/answords.fs
-share/gforth/0.5.0/arch/386/asm.fs
-share/gforth/0.5.0/arch/386/disasm.fs
-share/gforth/0.5.0/arch/alpha/asm.fs
-share/gforth/0.5.0/arch/alpha/disasm.fs
-share/gforth/0.5.0/arch/mips/asm.fs
-share/gforth/0.5.0/arch/mips/disasm.fs
-share/gforth/0.5.0/arch/mips/insts.fs
-share/gforth/0.5.0/asm/README
-share/gforth/0.5.0/asm/basic.fs
-share/gforth/0.5.0/asm/bitmask.fs
-share/gforth/0.5.0/asm/generic.fs
-share/gforth/0.5.0/asm/numref.fs
-share/gforth/0.5.0/asm/target.fs
-share/gforth/0.5.0/assert.fs
-share/gforth/0.5.0/backtrac.fs
-share/gforth/0.5.0/blocked.fb
-share/gforth/0.5.0/blocks.fs
-share/gforth/0.5.0/bubble.fs
-share/gforth/0.5.0/bufio.fs
-share/gforth/0.5.0/chains.fs
-share/gforth/0.5.0/code.fs
-share/gforth/0.5.0/colorize.fs
-share/gforth/0.5.0/comp-i.fs
-share/gforth/0.5.0/compat/README
-share/gforth/0.5.0/compat/anslocal.fs
-share/gforth/0.5.0/compat/assert.fs
-share/gforth/0.5.0/compat/control.fs
-share/gforth/0.5.0/compat/defer.fs
-share/gforth/0.5.0/compat/exception.fs
-share/gforth/0.5.0/compat/loops.fs
-share/gforth/0.5.0/compat/required.fs
-share/gforth/0.5.0/compat/struct.fs
-share/gforth/0.5.0/compat/vocabulary.fs
-share/gforth/0.5.0/cross.fs
-share/gforth/0.5.0/debug.fs
-share/gforth/0.5.0/debugs.fs
-share/gforth/0.5.0/doc/makedoc.fs
-share/gforth/0.5.0/doskey.fs
-share/gforth/0.5.0/ds2texi.fs
-share/gforth/0.5.0/ec/README
-share/gforth/0.5.0/ec/builttag.fs
-share/gforth/0.5.0/ec/dotx.fs
-share/gforth/0.5.0/ec/mirror.fs
-share/gforth/0.5.0/ec/nesting.fs
-share/gforth/0.5.0/ec/shex.fs
-share/gforth/0.5.0/ekey.fs
-share/gforth/0.5.0/environ.fs
-share/gforth/0.5.0/envos.dos
-share/gforth/0.5.0/envos.fs
-share/gforth/0.5.0/envos.os2
-share/gforth/0.5.0/errors.fs
-share/gforth/0.5.0/etags.fs
-share/gforth/0.5.0/exboot.fs
-share/gforth/0.5.0/except.fs
-share/gforth/0.5.0/extend.fs
-share/gforth/0.5.0/fi2c.fs
-share/gforth/0.5.0/fib.fs
-share/gforth/0.5.0/filedump.fs
-share/gforth/0.5.0/float.fs
-share/gforth/0.5.0/glocals.fs
-share/gforth/0.5.0/glosgen.fs
-share/gforth/0.5.0/gray.fs
-share/gforth/0.5.0/hash.fs
-share/gforth/0.5.0/history.fs
-share/gforth/0.5.0/httpd.fs
-share/gforth/0.5.0/intcomp.fs
-share/gforth/0.5.0/kernel/accept.fs
-share/gforth/0.5.0/kernel/aliases.fs
-share/gforth/0.5.0/kernel/aliases0.fs
-share/gforth/0.5.0/kernel/args.fs
-share/gforth/0.5.0/kernel/basics.fs
-share/gforth/0.5.0/kernel/cbr.fs
-share/gforth/0.5.0/kernel/cloop.fs
-share/gforth/0.5.0/kernel/comp.fs
-share/gforth/0.5.0/kernel/cond-old.fs
-share/gforth/0.5.0/kernel/cond.fs
-share/gforth/0.5.0/kernel/doers.fs
-share/gforth/0.5.0/kernel/errore.fs
-share/gforth/0.5.0/kernel/files.fs
-share/gforth/0.5.0/kernel/getdoers.fs
-share/gforth/0.5.0/kernel/int.fs
-share/gforth/0.5.0/kernel/io.fs
-share/gforth/0.5.0/kernel/kernel.fs
-share/gforth/0.5.0/kernel/license.fs
-share/gforth/0.5.0/kernel/main.fs
-share/gforth/0.5.0/kernel/nio.fs
-share/gforth/0.5.0/kernel/pass.fs
-share/gforth/0.5.0/kernel/paths.fs
-share/gforth/0.5.0/kernel/prim0.fs
-share/gforth/0.5.0/kernel/quotes.fs
-share/gforth/0.5.0/kernel/require.fs
-share/gforth/0.5.0/kernel/saccept.fs
-share/gforth/0.5.0/kernel/tools.fs
-share/gforth/0.5.0/kernel/toolsext.fs
-share/gforth/0.5.0/kernel/vars.fs
-share/gforth/0.5.0/@KERNEL_FI@
-share/gforth/0.5.0/lib.fs
-share/gforth/0.5.0/locals.fs
-share/gforth/0.5.0/look.fs
-share/gforth/0.5.0/mach16b.fs
-share/gforth/0.5.0/mach16l.fs
-share/gforth/0.5.0/mach32b.fs
-share/gforth/0.5.0/mach32l.fs
-share/gforth/0.5.0/mach64b.fs
-share/gforth/0.5.0/mach64l.fs
-share/gforth/0.5.0/machpc.fs
-share/gforth/0.5.0/make-app.fs
-share/gforth/0.5.0/matrix.fs
-share/gforth/0.5.0/mini-oof.fs
-share/gforth/0.5.0/moof-exm.fs
-share/gforth/0.5.0/moofglos.fs
-share/gforth/0.5.0/more.fs
-share/gforth/0.5.0/objects.fs
-share/gforth/0.5.0/objexamp.fs
-share/gforth/0.5.0/oof.fs
-share/gforth/0.5.0/oofsampl.fs
-share/gforth/0.5.0/other.fs
-share/gforth/0.5.0/prim
-share/gforth/0.5.0/prims2x.fs
-share/gforth/0.5.0/random.fs
-share/gforth/0.5.0/savesys.fs
-share/gforth/0.5.0/search.fs
-share/gforth/0.5.0/see-ext.fs
-share/gforth/0.5.0/see.fs
-share/gforth/0.5.0/siev.fs
-share/gforth/0.5.0/sieve.fs
-share/gforth/0.5.0/sokoban.fs
-share/gforth/0.5.0/source.fs
-share/gforth/0.5.0/startup.fs
-share/gforth/0.5.0/string.fs
-share/gforth/0.5.0/struct.fs
-share/gforth/0.5.0/stuff.fs
-share/gforth/0.5.0/table.fs
-share/gforth/0.5.0/tasker.fs
-share/gforth/0.5.0/termsize.fs
-share/gforth/0.5.0/test/checkans.fs
-share/gforth/0.5.0/test/coretest.fs
-share/gforth/0.5.0/test/dbltest.fs
-share/gforth/0.5.0/test/other.fs
-share/gforth/0.5.0/test/postpone.fs
-share/gforth/0.5.0/test/tester.fs
-share/gforth/0.5.0/tt.fs
-share/gforth/0.5.0/unbuffer.fs
-share/gforth/0.5.0/vt100.fs
-share/gforth/0.5.0/vt100key.fs
-share/gforth/0.5.0/wordinfo.fs
-share/gforth/0.5.0/wordsets.fs
+share/gforth/${PKGVERSION}/TAGS
+share/gforth/${PKGVERSION}/add.fs
+share/gforth/${PKGVERSION}/ans-report.fs
+share/gforth/${PKGVERSION}/ansi.fs
+share/gforth/${PKGVERSION}/answords.fs
+share/gforth/${PKGVERSION}/arch/386/asm.fs
+share/gforth/${PKGVERSION}/arch/386/disasm.fs
+share/gforth/${PKGVERSION}/arch/alpha/asm.fs
+share/gforth/${PKGVERSION}/arch/alpha/disasm.fs
+share/gforth/${PKGVERSION}/arch/mips/asm.fs
+share/gforth/${PKGVERSION}/arch/mips/disasm.fs
+share/gforth/${PKGVERSION}/arch/mips/insts.fs
+share/gforth/${PKGVERSION}/asm/README
+share/gforth/${PKGVERSION}/asm/basic.fs
+share/gforth/${PKGVERSION}/asm/bitmask.fs
+share/gforth/${PKGVERSION}/asm/generic.fs
+share/gforth/${PKGVERSION}/asm/numref.fs
+share/gforth/${PKGVERSION}/asm/target.fs
+share/gforth/${PKGVERSION}/assert.fs
+share/gforth/${PKGVERSION}/backtrac.fs
+share/gforth/${PKGVERSION}/blocked.fb
+share/gforth/${PKGVERSION}/blocks.fs
+share/gforth/${PKGVERSION}/bubble.fs
+share/gforth/${PKGVERSION}/bufio.fs
+share/gforth/${PKGVERSION}/chains.fs
+share/gforth/${PKGVERSION}/code.fs
+share/gforth/${PKGVERSION}/colorize.fs
+share/gforth/${PKGVERSION}/comp-i.fs
+share/gforth/${PKGVERSION}/compat/README
+share/gforth/${PKGVERSION}/compat/anslocal.fs
+share/gforth/${PKGVERSION}/compat/assert.fs
+share/gforth/${PKGVERSION}/compat/control.fs
+share/gforth/${PKGVERSION}/compat/defer.fs
+share/gforth/${PKGVERSION}/compat/exception.fs
+share/gforth/${PKGVERSION}/compat/loops.fs
+share/gforth/${PKGVERSION}/compat/required.fs
+share/gforth/${PKGVERSION}/compat/strcomp.fs
+share/gforth/${PKGVERSION}/compat/struct.fs
+share/gforth/${PKGVERSION}/compat/vocabulary.fs
+share/gforth/${PKGVERSION}/cross.fs
+share/gforth/${PKGVERSION}/debug.fs
+share/gforth/${PKGVERSION}/debugs.fs
+share/gforth/${PKGVERSION}/doc/makedoc.fs
+share/gforth/${PKGVERSION}/doskey.fs
+share/gforth/${PKGVERSION}/ds2texi.fs
+share/gforth/${PKGVERSION}/ec/README
+share/gforth/${PKGVERSION}/ec/builttag.fs
+share/gforth/${PKGVERSION}/ec/dotx.fs
+share/gforth/${PKGVERSION}/ec/mirror.fs
+share/gforth/${PKGVERSION}/ec/nesting.fs
+share/gforth/${PKGVERSION}/ec/shex.fs
+share/gforth/${PKGVERSION}/ekey.fs
+share/gforth/${PKGVERSION}/environ.fs
+share/gforth/${PKGVERSION}/envos.dos
+share/gforth/${PKGVERSION}/envos.fs
+share/gforth/${PKGVERSION}/envos.os2
+share/gforth/${PKGVERSION}/errors.fs
+share/gforth/${PKGVERSION}/etags.fs
+share/gforth/${PKGVERSION}/exboot.fs
+share/gforth/${PKGVERSION}/except.fs
+share/gforth/${PKGVERSION}/extend.fs
+share/gforth/${PKGVERSION}/fflib.fs
+share/gforth/${PKGVERSION}/fi2c.fs
+share/gforth/${PKGVERSION}/fib.fs
+share/gforth/${PKGVERSION}/filedump.fs
+share/gforth/${PKGVERSION}/fixpath.fs
+share/gforth/${PKGVERSION}/float.fs
+share/gforth/${PKGVERSION}/glocals.fs
+share/gforth/${PKGVERSION}/glosgen.fs
+share/gforth/${PKGVERSION}/gray.fs
+share/gforth/${PKGVERSION}/hash.fs
+share/gforth/${PKGVERSION}/history.fs
+share/gforth/${PKGVERSION}/httpd.fs
+share/gforth/${PKGVERSION}/intcomp.fs
+share/gforth/${PKGVERSION}/kernel/accept.fs
+share/gforth/${PKGVERSION}/kernel/aliases.fs
+share/gforth/${PKGVERSION}/kernel/aliases0.fs
+share/gforth/${PKGVERSION}/kernel/args.fs
+share/gforth/${PKGVERSION}/kernel/basics.fs
+share/gforth/${PKGVERSION}/kernel/cbr.fs
+share/gforth/${PKGVERSION}/kernel/cloop.fs
+share/gforth/${PKGVERSION}/kernel/comp.fs
+share/gforth/${PKGVERSION}/kernel/cond-old.fs
+share/gforth/${PKGVERSION}/kernel/cond.fs
+share/gforth/${PKGVERSION}/kernel/doers.fs
+share/gforth/${PKGVERSION}/kernel/errore.fs
+share/gforth/${PKGVERSION}/kernel/files.fs
+share/gforth/${PKGVERSION}/kernel/getdoers.fs
+share/gforth/${PKGVERSION}/kernel/input.fs
+share/gforth/${PKGVERSION}/kernel/int.fs
+share/gforth/${PKGVERSION}/kernel/io.fs
+share/gforth/${PKGVERSION}/kernel/kernel.fs
+share/gforth/${PKGVERSION}/kernel/license.fs
+share/gforth/${PKGVERSION}/kernel/main.fs
+share/gforth/${PKGVERSION}/kernel/nio.fs
+share/gforth/${PKGVERSION}/kernel/pass.fs
+share/gforth/${PKGVERSION}/kernel/paths.fs
+share/gforth/${PKGVERSION}/kernel/prim0.fs
+share/gforth/${PKGVERSION}/kernel/quotes.fs
+share/gforth/${PKGVERSION}/kernel/require.fs
+share/gforth/${PKGVERSION}/kernel/saccept.fs
+share/gforth/${PKGVERSION}/kernel/tools.fs
+share/gforth/${PKGVERSION}/kernel/toolsext.fs
+share/gforth/${PKGVERSION}/kernel/vars.fs
+share/gforth/${PKGVERSION}/@KERNEL_FI@
+share/gforth/${PKGVERSION}/lib.fs
+share/gforth/${PKGVERSION}/locals.fs
+share/gforth/${PKGVERSION}/locate.fs
+share/gforth/${PKGVERSION}/look.fs
+share/gforth/${PKGVERSION}/mach16b.fs
+share/gforth/${PKGVERSION}/mach16l.fs
+share/gforth/${PKGVERSION}/mach32b.fs
+share/gforth/${PKGVERSION}/mach32l.fs
+share/gforth/${PKGVERSION}/mach64b.fs
+share/gforth/${PKGVERSION}/mach64l.fs
+share/gforth/${PKGVERSION}/machpc.fs.in
+share/gforth/${PKGVERSION}/make-app.fs
+share/gforth/${PKGVERSION}/matrix.fs
+share/gforth/${PKGVERSION}/mini-oof.fs
+share/gforth/${PKGVERSION}/moof-exm.fs
+share/gforth/${PKGVERSION}/moofglos.fs
+share/gforth/${PKGVERSION}/more.fs
+share/gforth/${PKGVERSION}/objects.fs
+share/gforth/${PKGVERSION}/objexamp.fs
+share/gforth/${PKGVERSION}/oldlib.fs
+share/gforth/${PKGVERSION}/oof.fs
+share/gforth/${PKGVERSION}/oofsampl.fs
+share/gforth/${PKGVERSION}/other.fs
+share/gforth/${PKGVERSION}/prim
+share/gforth/${PKGVERSION}/prims2x.fs
+share/gforth/${PKGVERSION}/proxy.fs
+share/gforth/${PKGVERSION}/quotes.fs
+share/gforth/${PKGVERSION}/random.fs
+share/gforth/${PKGVERSION}/savesys.fs
+share/gforth/${PKGVERSION}/search.fs
+share/gforth/${PKGVERSION}/see-ext.fs
+share/gforth/${PKGVERSION}/see.fs
+share/gforth/${PKGVERSION}/siev.fs
+share/gforth/${PKGVERSION}/sieve.fs
+share/gforth/${PKGVERSION}/simp-see.fs
+share/gforth/${PKGVERSION}/sokoban.fs
+share/gforth/${PKGVERSION}/source.fs
+share/gforth/${PKGVERSION}/startup.fs
+share/gforth/${PKGVERSION}/string.fs
+share/gforth/${PKGVERSION}/struct.fs
+share/gforth/${PKGVERSION}/stuff.fs
+share/gforth/${PKGVERSION}/table.fs
+share/gforth/${PKGVERSION}/tags.fs
+share/gforth/${PKGVERSION}/tasker.fs
+share/gforth/${PKGVERSION}/termsize.fs
+share/gforth/${PKGVERSION}/test/checkans.fs
+share/gforth/${PKGVERSION}/test/coretest.fs
+share/gforth/${PKGVERSION}/test/dbltest.fs
+share/gforth/${PKGVERSION}/test/float.fs
+share/gforth/${PKGVERSION}/test/gforth.fs
+share/gforth/${PKGVERSION}/test/other.fs
+share/gforth/${PKGVERSION}/test/postpone.fs
+share/gforth/${PKGVERSION}/test/signals.fs
+share/gforth/${PKGVERSION}/test/string.fs
+share/gforth/${PKGVERSION}/test/tester.fs
+share/gforth/${PKGVERSION}/tt.fs
+share/gforth/${PKGVERSION}/unbuffer.fs
+share/gforth/${PKGVERSION}/unix/socket.fs
+share/gforth/${PKGVERSION}/vt100.fs
+share/gforth/${PKGVERSION}/vt100key.fs
+share/gforth/${PKGVERSION}/wordinfo.fs
+share/gforth/${PKGVERSION}/wordsets.fs
 share/gforth/site-forth/siteinit.fs
-@dirrm share/gforth/0.5.0/test
-@dirrm share/gforth/0.5.0/kernel
-@dirrm share/gforth/0.5.0/ec
-@dirrm share/gforth/0.5.0/doc
-@dirrm share/gforth/0.5.0/compat
-@dirrm share/gforth/0.5.0/asm
-@dirrm share/gforth/0.5.0/arch/386
-@dirrm share/gforth/0.5.0/arch/4stack
-@dirrm share/gforth/0.5.0/arch/6502
-@dirrm share/gforth/0.5.0/arch/8086
-@dirrm share/gforth/0.5.0/arch/alpha
-@dirrm share/gforth/0.5.0/arch/mips
-@dirrm share/gforth/0.5.0/arch/avr
-@dirrm share/gforth/0.5.0/arch/c165
-@dirrm share/gforth/0.5.0/arch/generic
-@dirrm share/gforth/0.5.0/arch/h8
-@dirrm share/gforth/0.5.0/arch/hppa
-@dirrm share/gforth/0.5.0/arch/ia64
-@dirrm share/gforth/0.5.0/arch/m68k
-@dirrm share/gforth/0.5.0/arch/misc
-@dirrm share/gforth/0.5.0/arch/power
-@dirrm share/gforth/0.5.0/arch/shboom
-@dirrm share/gforth/0.5.0/arch/sparc
-@dirrm share/gforth/0.5.0/arch
-@dirrm share/gforth/0.5.0
+@dirrm share/gforth/${PKGVERSION}/unix
+@dirrm share/gforth/${PKGVERSION}/test
+@dirrm share/gforth/${PKGVERSION}/kernel
+@dirrm share/gforth/${PKGVERSION}/ec
+@dirrm share/gforth/${PKGVERSION}/doc
+@dirrm share/gforth/${PKGVERSION}/compat
+@dirrm share/gforth/${PKGVERSION}/asm
+@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/sparc
+@dirrm share/gforth/${PKGVERSION}/arch/sparc
+@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/shboom
+@dirrm share/gforth/${PKGVERSION}/arch/shboom
+@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/sharc
+@dirrm share/gforth/${PKGVERSION}/arch/sharc
+@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/power
+@dirrm share/gforth/${PKGVERSION}/arch/power
+@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/misc
+@dirrm share/gforth/${PKGVERSION}/arch/misc
+@dirrm share/gforth/${PKGVERSION}/arch/mips
+@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/m68k
+@dirrm share/gforth/${PKGVERSION}/arch/m68k
+@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/ia64
+@dirrm share/gforth/${PKGVERSION}/arch/ia64
+@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/hppa
+@dirrm share/gforth/${PKGVERSION}/arch/hppa
+@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/h8
+@dirrm share/gforth/${PKGVERSION}/arch/h8
+@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/generic
+@dirrm share/gforth/${PKGVERSION}/arch/generic
+@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/c165
+@dirrm share/gforth/${PKGVERSION}/arch/c165
+@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/avr
+@dirrm share/gforth/${PKGVERSION}/arch/avr
+@dirrm share/gforth/${PKGVERSION}/arch/alpha
+@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/8086
+@dirrm share/gforth/${PKGVERSION}/arch/8086
+@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/6502
+@dirrm share/gforth/${PKGVERSION}/arch/6502
+@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/4stack
+@dirrm share/gforth/${PKGVERSION}/arch/4stack
+@dirrm share/gforth/${PKGVERSION}/arch/386
+@dirrm share/gforth/${PKGVERSION}/arch
+@dirrm share/gforth/${PKGVERSION}
+@dirrm lib/gforth/${PKGVERSION}
 @unexec ${RMDIR} %D/share/gforth/site-forth 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/gforth 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/emacs 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/lib/gforth/site-forth 2>/dev/null || ${TRUE}
-@dirrm lib/gforth/0.5.0
-@dirrm lib/gforth
+@unexec ${RMDIR} %D/lib/gforth 2>/dev/null || ${TRUE}
diff --git a/lang/gforth/distinfo b/lang/gforth/distinfo
index 8718e828357..ad4cd1d52c8 100644
--- a/lang/gforth/distinfo
+++ b/lang/gforth/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:00:50 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/12/05 00:26:38 uebayasi Exp $
 
-SHA1 (gforth-0.5.0.tar.gz) = 03c0ffdf9381e0b29ed229b36b1d52e6a6da6758
-Size (gforth-0.5.0.tar.gz) = 1472986 bytes
-SHA1 (patch-aa) = 426205f27609f24f818837a853c974134c0d4035
+SHA1 (gforth-0.6.2.tar.gz) = 926faeac7ccc00e86a74954dc7c693b19f13e616
+Size (gforth-0.6.2.tar.gz) = 1925536 bytes
+SHA1 (patch-aa) = 50bef56bbb5a6f2fe664d370d35d39d72d0982bf
 SHA1 (patch-ab) = a80fd7553acce1168931171b9c100eb25e2fa19a
 SHA1 (patch-ac) = d9155ee2d7f06b3aafeaa5fc2719948deb1c9c7e
diff --git a/lang/gforth/patches/patch-aa b/lang/gforth/patches/patch-aa
index 8de26b8c245..fa11b480bd5 100644
--- a/lang/gforth/patches/patch-aa
+++ b/lang/gforth/patches/patch-aa
@@ -1,19 +1,32 @@
-$NetBSD: patch-aa,v 1.2 2000/11/13 23:58:12 hubertf Exp $
+$NetBSD: patch-aa,v 1.3 2003/12/05 00:26:38 uebayasi Exp $
 
---- Makefile.in.orig	Sat Sep 23 20:21:57 2000
+--- Makefile.in.orig	Mon Aug 25 16:57:49 2003
 +++ Makefile.in
-@@ -461,11 +461,11 @@
- 		touch $(siteforthdir)/siteinit.fs
- 		-$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi
- 		-$(RM) $(bindir)/gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE)
--		$(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE)
-+		$(INSTALL_PROGRAM) gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE)
- 		(cd $(bindir) && $(LN_S) gforth-$(VERSION)$(EXE) gforth$(EXE))
--		$(INSTALL_PROGRAM) -s gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE)
-+		$(INSTALL_PROGRAM) gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE)
+@@ -51,7 +51,7 @@ osclass = @OSCLASS@
+ # -------------	Utility programs
+ 
+ SHELL	= /bin/sh
+-RM	= rm
++RM	= rm -f
+ RMTREE	= rm -rf
+ CP	= cp -p
+ MV	= mv
+@@ -60,6 +60,7 @@ INSTALL	= @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_INFO = @INSTALL_INFO@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ LN_S	= @LN_S@
+ GCC	= @CC@
+ CC	= $(GCC)
+@@ -528,8 +529,8 @@ install:	gforth$(EXE) $(FORTH_SRC) $(ker
  		(cd $(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXE) gforth-fast$(EXE))
+ 		$(INSTALL_PROGRAM) -s gforth-itc$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE)
+ 		(cd $(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EXE) gforth-itc$(EXE))
 -		$(INSTALL_PROGRAM) gforthmi $(bindir)/gforthmi-$(VERSION)
-+		$(BSD_INSTALL_SCRIPT) gforthmi $(bindir)/gforthmi-$(VERSION)
+-		$(INSTALL_PROGRAM) vmgen $(bindir)/vmgen-$(VERSION)
++		$(INSTALL_SCRIPT) gforthmi $(bindir)/gforthmi-$(VERSION)
++		$(INSTALL_SCRIPT) vmgen $(bindir)/vmgen-$(VERSION)
  		$(INSTALL_PROGRAM) gforth-ditc $(libdir)/gforth/$(VERSION)
  		(cd $(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi)
- 		-$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir)
+ 		(cd $(bindir) && $(LN_S) vmgen-$(VERSION) vmgen)