Update to version 2.1.3.

The NEWS file contains around 650 lines of changes from 1.95.10, so
I won't include it here.

5 files changed, 294 insertions, 98 deletions

diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index c6daa4dbb36..df230e0e478 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -1,33 +1,39 @@
-# $NetBSD: Makefile,v 1.14 2003/06/02 01:18:54 jschauma Exp $
-#
+# $NetBSD: Makefile,v 1.15 2003/07/02 00:00:22 jtb Exp $
 
-DISTNAME=	smalltalk-1.95.10
-CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_GNU:=smalltalk/}
+DISTNAME=		smalltalk-2.1.3
+CATEGORIES=		lang
+MASTER_SITES=		${MASTER_SITE_GNU:=smalltalk/}
 
-MAINTAINER=	tech-pkg@netbsd.org
-HOMEPAGE=	http://www.smalltalk.org/versions/GNUSmalltalk.html
-COMMENT=	GNU Smalltalk: A smalltalk-80 implementation
+MAINTAINER=		tech-pkg@netbsd.org
+HOMEPAGE=		http://www.smalltalk.org/versions/GNUSmalltalk.html
+COMMENT=		GNU Smalltalk: A smalltalk-80 implementation
+
+ONLY_FOR_PLATFORM=	*-*-i386 *-*-sparc *-*-powerpc
 
 USE_GMAKE=		YES
 USE_GNU_READLINE=	YES
 USE_BUILDLINK2=		YES
 
 GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--with-gmp=${BUILDLINK_PREFIX.gmp}/lib
 CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}/lib
+CONFIGURE_ARGS+=	--with-gdbm=${BUILDLINK_PREFIX.gdbm}/lib
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
 CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_PREFIX.tk}/lib
 CONFIGURE_ARGS+=	--without-libiconv
 CONFIGURE_ARGS+=	--without-glib --without-gtk
+CONFIGURE_ARGS+=	--with-lispdir=${PREFIX}/share/emacs/site-lisp
 CONFIGURE_ENV+=		CFLAGS="-O2 -fsigned-char"
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-ONLY_FOR_PLATFORM=	*-*-i386 *-*-sparc *-*-powerpc
+TEST_TARGET=		check
 
+.include "../../devel/gmp/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
 .include "../../lang/tcl/buildlink2.mk"
 .include "../../x11/tk/buildlink2.mk"
+.include "../../databases/gdbm/buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/smalltalk/PLIST b/lang/smalltalk/PLIST
index 99aa1a8c12b..144569c51ff 100644
--- a/lang/smalltalk/PLIST
+++ b/lang/smalltalk/PLIST
@@ -1,38 +1,62 @@
-@comment $NetBSD: PLIST,v 1.6 2003/03/10 07:43:57 jmc Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/07/02 00:00:22 jtb Exp $
 bin/gst
 bin/gst-config
 bin/gst-package
 include/gst.h
 include/gstpub.h
+include/sigsegv.h
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gst-base.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gst-libs.info
 @unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gst.info
+info/gst-base.info
+info/gst-base.info-1
+info/gst-base.info-10
+info/gst-base.info-11
+info/gst-base.info-12
+info/gst-base.info-13
+info/gst-base.info-14
+info/gst-base.info-15
+info/gst-base.info-16
+info/gst-base.info-2
+info/gst-base.info-3
+info/gst-base.info-4
+info/gst-base.info-5
+info/gst-base.info-6
+info/gst-base.info-7
+info/gst-base.info-8
+info/gst-base.info-9
+info/gst-libs.info
+info/gst-libs.info-1
+info/gst-libs.info-10
+info/gst-libs.info-2
+info/gst-libs.info-3
+info/gst-libs.info-4
+info/gst-libs.info-5
+info/gst-libs.info-6
+info/gst-libs.info-7
+info/gst-libs.info-8
+info/gst-libs.info-9
 info/gst.info
 info/gst.info-1
-info/gst.info-10
-info/gst.info-11
-info/gst.info-12
-info/gst.info-13
-info/gst.info-14
-info/gst.info-15
-info/gst.info-16
-info/gst.info-17
-info/gst.info-18
-info/gst.info-19
 info/gst.info-2
-info/gst.info-20
 info/gst.info-3
 info/gst.info-4
 info/gst.info-5
 info/gst.info-6
 info/gst.info-7
-info/gst.info-8
-info/gst.info-9
 @exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gst.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gst-base.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gst-libs.info
 lib/libgst.a
 lib/libgst.la
 lib/smalltalk/blox-tk-${PKGVERSION}.so
-lib/smalltalk/blox-tk.so
-lib/smalltalk/blox-tk.la
 lib/smalltalk/blox-tk.a
+lib/smalltalk/blox-tk.la
+lib/smalltalk/blox-tk.so
+lib/smalltalk/gdbm-${PKGVERSION}.so
+lib/smalltalk/gdbm.a
+lib/smalltalk/gdbm.la
+lib/smalltalk/gdbm.so
 lib/smalltalk/md5-${PKGVERSION}.so
 lib/smalltalk/md5.a
 lib/smalltalk/md5.la
@@ -46,61 +70,80 @@ lib/smalltalk/tcp.a
 lib/smalltalk/tcp.la
 lib/smalltalk/tcp.so
 man/man1/gst.1
+share/aclocal/gst.m4
+share/aclocal/snprintfv.m4
+share/emacs/site-lisp/gst-mode.el
+share/emacs/site-lisp/smalltalk-mode.el
 share/smalltalk/Load.st
 share/smalltalk/Reload.st
-share/smalltalk/blox/BrowShell.st
-share/smalltalk/blox/BrowserMain.st
-share/smalltalk/blox/ClassBrow.st
-share/smalltalk/blox/Colors.txt
-share/smalltalk/blox/CtxtInspect.st
-share/smalltalk/blox/DictInspect.st
-share/smalltalk/blox/GuiData.st
-share/smalltalk/blox/Inspector.st
-share/smalltalk/blox/Load.st
-share/smalltalk/blox/Manager.st
-share/smalltalk/blox/Menu.st
-share/smalltalk/blox/MethInspect.st
-share/smalltalk/blox/MethSetBrow.st
-share/smalltalk/blox/ModalDialog.st
-share/smalltalk/blox/Notifier.st
-share/smalltalk/blox/PCode.st
-share/smalltalk/blox/PList.st
-share/smalltalk/blox/PText.st
-share/smalltalk/blox/RadioForm.st
-share/smalltalk/blox/Run.st
-share/smalltalk/blox/StrcInspect.st
-share/smalltalk/blox/View.st
-share/smalltalk/blox/bear.gif
-share/smalltalk/blox/test.st
-share/smalltalk/blox/tk/Blox.st
-share/smalltalk/blox/tk/BloxBasic.st
-share/smalltalk/blox/tk/BloxCanvas.st
-share/smalltalk/blox/tk/BloxExtend.st
-share/smalltalk/blox/tk/BloxText.st
-share/smalltalk/blox/tk/BloxWidgets.st
+share/smalltalk/blox-gtk/GtkDecl.st
+share/smalltalk/blox-gtk/proof.st
+share/smalltalk/blox-tk/Blox.st
+share/smalltalk/blox-tk/BloxBasic.st
+share/smalltalk/blox-tk/BloxCanvas.st
+share/smalltalk/blox-tk/BloxExtend.st
+share/smalltalk/blox-tk/BloxText.st
+share/smalltalk/blox-tk/BloxWidgets.st
+share/smalltalk/blox-tk/colors.txt
+share/smalltalk/browser/BrowShell.st
+share/smalltalk/browser/BrowserMain.st
+share/smalltalk/browser/ButtonForm.st
+share/smalltalk/browser/ChangeLog
+share/smalltalk/browser/ClassBrow.st
+share/smalltalk/browser/ClassHierBrow.st
+share/smalltalk/browser/DebugSupport.st
+share/smalltalk/browser/Debugger.st
+share/smalltalk/browser/DictInspect.st
+share/smalltalk/browser/GuiData.st
+share/smalltalk/browser/Inspector.st
+share/smalltalk/browser/Load.st
+share/smalltalk/browser/Manager.st
+share/smalltalk/browser/Menu.st
+share/smalltalk/browser/MethInspect.st
+share/smalltalk/browser/MethSetBrow.st
+share/smalltalk/browser/ModalDialog.st
+share/smalltalk/browser/NamespBrow.st
+share/smalltalk/browser/Notifier.st
+share/smalltalk/browser/PCode.st
+share/smalltalk/browser/PList.st
+share/smalltalk/browser/PText.st
+share/smalltalk/browser/RadioForm.st
+share/smalltalk/browser/Run.st
+share/smalltalk/browser/StrcInspect.st
+share/smalltalk/browser/View.st
+share/smalltalk/browser/bear.gif
+share/smalltalk/browser/test.st
+share/smalltalk/compiler/ChangeLog
 share/smalltalk/compiler/Load.st
+share/smalltalk/compiler/ParseTreeSearcher.st
+share/smalltalk/compiler/RBFormatter.st
+share/smalltalk/compiler/RBParseNodes.st
+share/smalltalk/compiler/RBParser.st
+share/smalltalk/compiler/RBToken.st
 share/smalltalk/compiler/STCompLit.st
 share/smalltalk/compiler/STCompiler.st
-share/smalltalk/compiler/STFormatter.st
-share/smalltalk/compiler/STParseNodes.st
-share/smalltalk/compiler/STParser.st
+share/smalltalk/compiler/STDecompiler.st
+share/smalltalk/compiler/STLoader.st
+share/smalltalk/compiler/STLoaderObjs.st
 share/smalltalk/compiler/STSymTable.st
-share/smalltalk/compiler/STTok.st
-share/smalltalk/compiler/STToken.st
-share/smalltalk/compiler/STVisitor.st
 share/smalltalk/compiler/StartCompiler.st
 share/smalltalk/compiler/test.st
+share/smalltalk/db/ChangeLog
+share/smalltalk/db/DB.st
+share/smalltalk/db/MySQL.st
+share/smalltalk/db/MySQLTests.st
+share/smalltalk/db/README
+share/smalltalk/db/mysql-test.st
 share/smalltalk/examples/Application.st
 share/smalltalk/examples/Bench.st
-share/smalltalk/examples/Buffers.st
 share/smalltalk/examples/Case.st
-share/smalltalk/examples/CompFileSeg.st
-share/smalltalk/examples/Debugger.st
 share/smalltalk/examples/Dinner.st
 share/smalltalk/examples/EditStream.st
 share/smalltalk/examples/GenClasses.st
 share/smalltalk/examples/Lisp.st
+share/smalltalk/examples/Man.st
 share/smalltalk/examples/MemUsage.st
+share/smalltalk/examples/MiniDebugger.st
 share/smalltalk/examples/Prolog.st
 share/smalltalk/examples/PrtHier.st
 share/smalltalk/examples/Publish.st
@@ -112,17 +155,24 @@ share/smalltalk/examples/RecursLit.st
 share/smalltalk/examples/RegExp.st
 share/smalltalk/examples/Richards.st
 share/smalltalk/examples/SortCriter.st
+share/smalltalk/examples/StreamFilter.st
+share/smalltalk/examples/Sync.st
+share/smalltalk/examples/Tetris.st
+share/smalltalk/examples/Timer.st
 share/smalltalk/examples/Tokenizer.st
-share/smalltalk/examples/blox/Man.st
-share/smalltalk/examples/blox/Tetris.st
+share/smalltalk/examples/gdbm-c.st
+share/smalltalk/examples/gdbm.st
+share/smalltalk/examples/md5.st
 share/smalltalk/examples/modules/gdbm-c.st
 share/smalltalk/examples/modules/gdbm.st
 share/smalltalk/examples/modules/md5.st
 share/smalltalk/examples/modules/regex.st
 share/smalltalk/examples/pepe.sed
+share/smalltalk/examples/regex.st
 share/smalltalk/examples/shell
 share/smalltalk/examples/xml.sed
 share/smalltalk/gst.im
+share/smalltalk/i18n/ChangeLog
 share/smalltalk/i18n/Collation.st
 share/smalltalk/i18n/Expression.st
 share/smalltalk/i18n/GetText.st
@@ -131,6 +181,7 @@ share/smalltalk/i18n/Locale.st
 share/smalltalk/i18n/Numbers.st
 share/smalltalk/i18n/Sets.st
 share/smalltalk/i18n/Times.st
+share/smalltalk/kernel/AbstNamespc.st
 share/smalltalk/kernel/AnsiDates.st
 share/smalltalk/kernel/AnsiExcept.st
 share/smalltalk/kernel/Array.st
@@ -139,10 +190,10 @@ share/smalltalk/kernel/Association.st
 share/smalltalk/kernel/Autoload.st
 share/smalltalk/kernel/Bag.st
 share/smalltalk/kernel/Behavior.st
+share/smalltalk/kernel/BindingDict.st
 share/smalltalk/kernel/BlkClosure.st
 share/smalltalk/kernel/BlkContext.st
 share/smalltalk/kernel/Boolean.st
-share/smalltalk/kernel/Browser.st
 share/smalltalk/kernel/Builtins.st
 share/smalltalk/kernel/ByteArray.st
 share/smalltalk/kernel/ByteStream.st
@@ -150,6 +201,7 @@ share/smalltalk/kernel/CFuncs.st
 share/smalltalk/kernel/CObject.st
 share/smalltalk/kernel/CStruct.st
 share/smalltalk/kernel/CType.st
+share/smalltalk/kernel/CallinProcess.st
 share/smalltalk/kernel/CharArray.st
 share/smalltalk/kernel/Character.st
 share/smalltalk/kernel/Class.st
@@ -172,8 +224,12 @@ share/smalltalk/kernel/FileDescr.st
 share/smalltalk/kernel/FileSegment.st
 share/smalltalk/kernel/FileStream.st
 share/smalltalk/kernel/Float.st
+share/smalltalk/kernel/FloatD.st
+share/smalltalk/kernel/FloatE.st
+share/smalltalk/kernel/FloatQ.st
 share/smalltalk/kernel/Fraction.st
 share/smalltalk/kernel/HashedColl.st
+share/smalltalk/kernel/HomedAssoc.st
 share/smalltalk/kernel/IdentDict.st
 share/smalltalk/kernel/IdentitySet.st
 share/smalltalk/kernel/Integer.st
@@ -207,6 +263,7 @@ share/smalltalk/kernel/RWStream.st
 share/smalltalk/kernel/Random.st
 share/smalltalk/kernel/ReadStream.st
 share/smalltalk/kernel/Rectangle.st
+share/smalltalk/kernel/RecursionLock.st
 share/smalltalk/kernel/RootNamespc.st
 share/smalltalk/kernel/RunArray.st
 share/smalltalk/kernel/ScaledDec.st
@@ -225,59 +282,156 @@ share/smalltalk/kernel/Time.st
 share/smalltalk/kernel/TokenStream.st
 share/smalltalk/kernel/Transcript.st
 share/smalltalk/kernel/True.st
+share/smalltalk/kernel/URL.st
 share/smalltalk/kernel/UndefObject.st
+share/smalltalk/kernel/VFS.st
 share/smalltalk/kernel/ValueAdapt.st
+share/smalltalk/kernel/VarBinding.st
 share/smalltalk/kernel/WeakObjects.st
 share/smalltalk/kernel/WriteStream.st
-share/smalltalk/packages
+share/smalltalk/net/Base.st
+share/smalltalk/net/ChangeLog
+share/smalltalk/net/ContentHandler.st
+share/smalltalk/net/FTP.st
+share/smalltalk/net/HTTP.st
+share/smalltalk/net/IMAP.st
+share/smalltalk/net/Load.st
+share/smalltalk/net/MIME.st
+share/smalltalk/net/NNTP.st
+share/smalltalk/net/NetServer.st
+share/smalltalk/net/POP.st
+share/smalltalk/net/SMTP.st
+share/smalltalk/net/URIResolver.st
+share/smalltalk/net/httpd/FileServer.st
+share/smalltalk/net/httpd/Haiku.st
+share/smalltalk/net/httpd/Load.st
+share/smalltalk/net/httpd/STT.st
+share/smalltalk/net/httpd/WebServer.st
+share/smalltalk/net/httpd/WikiServer.st
+share/smalltalk/net/httpd/edit.jpg
+share/smalltalk/net/httpd/example1.stt
+share/smalltalk/net/httpd/example2.stt
+share/smalltalk/net/httpd/find.jpg
+share/smalltalk/net/httpd/head.jpg
+share/smalltalk/net/httpd/help.jpg
+share/smalltalk/net/httpd/history.jpg
+share/smalltalk/net/httpd/next.jpg
+share/smalltalk/net/httpd/prev.jpg
+share/smalltalk/net/httpd/recent.jpg
+share/smalltalk/net/httpd/rename.jpg
+share/smalltalk/net/httpd/test.st
+share/smalltalk/net/httpd/top.jpg
+share/smalltalk/numerics/Approximation.st
+share/smalltalk/numerics/Basic.st
+share/smalltalk/numerics/Distributions.st
+share/smalltalk/numerics/Functions.st
+share/smalltalk/numerics/Integration.st
+share/smalltalk/numerics/Load.st
+share/smalltalk/numerics/Matrixes.st
+share/smalltalk/numerics/NumericsAdds.st
+share/smalltalk/numerics/NumericsTests.st
+share/smalltalk/numerics/Optimization.st
+share/smalltalk/numerics/RNG.st
+share/smalltalk/numerics/Statistics.st
+share/smalltalk/packages.xml
 share/smalltalk/sunit/SUnit.st
 share/smalltalk/sunit/SUnitPreload.st
 share/smalltalk/sunit/SUnitScript.st
 share/smalltalk/sunit/SUnitTests.st
 share/smalltalk/tcp/AbstractSocketImpl.st
-share/smalltalk/tcp/ContentHandler.st
+share/smalltalk/tcp/Buffers.st
+share/smalltalk/tcp/ChangeLog
 share/smalltalk/tcp/Datagram.st
 share/smalltalk/tcp/IPSocketImpl.st
 share/smalltalk/tcp/SocketAddress.st
 share/smalltalk/tcp/Sockets.st
 share/smalltalk/tcp/TCP.st
 share/smalltalk/tcp/Tests.st
-share/smalltalk/tcp/URL.st
 share/smalltalk/tcp/cfuncs.st
 share/smalltalk/tcp/init.st
-share/smalltalk/web/FileServer.st
-share/smalltalk/web/Haiku.st
-share/smalltalk/web/Load.st
-share/smalltalk/web/NetServer.st
-share/smalltalk/web/WebServer.st
-share/smalltalk/web/WikiServer.st
-share/smalltalk/web/edit.jpg
-share/smalltalk/web/find.jpg
-share/smalltalk/web/head.jpg
-share/smalltalk/web/help.jpg
-share/smalltalk/web/history.jpg
-share/smalltalk/web/next.jpg
-share/smalltalk/web/prev.jpg
-share/smalltalk/web/recent.jpg
-share/smalltalk/web/rename.jpg
-share/smalltalk/web/test.st
-share/smalltalk/web/top.jpg
-share/smalltalk/xml/Id-DOM.st
-share/smalltalk/xml/Id-XWalker.st
+share/smalltalk/unsupported/BigExpr.st
+share/smalltalk/unsupported/CInt.st
+share/smalltalk/unsupported/CPP-test.st
+share/smalltalk/unsupported/CParseT1.st
+share/smalltalk/unsupported/CParseT2.st
+share/smalltalk/unsupported/CParseT3.st
+share/smalltalk/unsupported/CString.st
+share/smalltalk/unsupported/DLD.st
+share/smalltalk/unsupported/Extensn.st
+share/smalltalk/unsupported/IfError.st
+share/smalltalk/unsupported/Interr.st
+share/smalltalk/unsupported/ParseErr.st
+share/smalltalk/unsupported/Process1.st
+share/smalltalk/unsupported/Process2.st
+share/smalltalk/unsupported/Profile.st
+share/smalltalk/unsupported/Sorting.st
+share/smalltalk/unsupported/a.st
+share/smalltalk/unsupported/ba.st
+share/smalltalk/unsupported/binary.c
+share/smalltalk/unsupported/bug.st
+share/smalltalk/unsupported/bug2.st
+share/smalltalk/unsupported/bug4.st
+share/smalltalk/unsupported/cint/CDeclNode.st
+share/smalltalk/unsupported/cint/CExpressionNode.st
+share/smalltalk/unsupported/cint/CPP.st
+share/smalltalk/unsupported/cint/CPStrConc.st
+share/smalltalk/unsupported/cint/CPStrUnq.st
+share/smalltalk/unsupported/cint/CParseType.st
+share/smalltalk/unsupported/cint/CSymbol.st
+share/smalltalk/unsupported/cint/CSymbolTable.st
+share/smalltalk/unsupported/cint/CTok.st
+share/smalltalk/unsupported/cint/CToken.st
+share/smalltalk/unsupported/cint/CTreeBuilder.st
+share/smalltalk/unsupported/cint/CollapsedStream.st
+share/smalltalk/unsupported/cint/ExpansionStream.st
+share/smalltalk/unsupported/cint/ExpansionStreamStack.st
+share/smalltalk/unsupported/cint/LineStream.st
+share/smalltalk/unsupported/cint/LineTokenStream.st
+share/smalltalk/unsupported/cint/README
+share/smalltalk/unsupported/cint/StreamStack.st
+share/smalltalk/unsupported/er2.st
+share/smalltalk/unsupported/market.st
+share/smalltalk/unsupported/resolve.st
+share/smalltalk/unsupported/self.st
+share/smalltalk/unsupported/t.st
+share/smalltalk/unsupported/torture.st
+share/smalltalk/vfs/README
+share/smalltalk/vfs/deb
+share/smalltalk/vfs/lslR
+share/smalltalk/vfs/mailfs
+share/smalltalk/vfs/patchfs
+share/smalltalk/vfs/uar
+share/smalltalk/vfs/ucpio
+share/smalltalk/vfs/ulha
+share/smalltalk/vfs/urar
+share/smalltalk/vfs/utar
+share/smalltalk/vfs/uzip
+share/smalltalk/vfs/uzoo
+share/smalltalk/xml/ChangeLog
 share/smalltalk/xml/XML.st
+share/smalltalk/xml/XPath.st
+share/smalltalk/xml/XSL.st
 @dirrm share/smalltalk/xml
-@dirrm share/smalltalk/web
+@dirrm share/smalltalk/vfs
+@dirrm share/smalltalk/unsupported/cint
+@dirrm share/smalltalk/unsupported
 @dirrm share/smalltalk/tcp
 @dirrm share/smalltalk/sunit
+@dirrm share/smalltalk/numerics
+@dirrm share/smalltalk/net/httpd
+@dirrm share/smalltalk/net
 @dirrm share/smalltalk/kernel
 @dirrm share/smalltalk/i18n
 @dirrm share/smalltalk/examples/modules
-@dirrm share/smalltalk/examples/blox
 @dirrm share/smalltalk/examples
+@dirrm share/smalltalk/db
 @dirrm share/smalltalk/compiler
-@dirrm share/smalltalk/blox/tk
-@exec ${MKDIR} %D/share/smalltalk/blox/gtk
-@dirrm share/smalltalk/blox/gtk
-@dirrm share/smalltalk/blox
+@dirrm share/smalltalk/browser
+@dirrm share/smalltalk/blox-tk
+@dirrm share/smalltalk/blox-gtk
 @dirrm share/smalltalk
+@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/emacs 2>/dev/null || ${TRUE}
 @dirrm lib/smalltalk
+@exec ${MKDIR} %D/include/snprintfv
+@dirrm include/snprintfv
diff --git a/lang/smalltalk/distinfo b/lang/smalltalk/distinfo
index c6cbca6b114..19bb40bb263 100644
--- a/lang/smalltalk/distinfo
+++ b/lang/smalltalk/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/01/31 14:08:58 mjl Exp $
+$NetBSD: distinfo,v 1.6 2003/07/02 00:00:23 jtb Exp $
 
-SHA1 (smalltalk-1.95.10.tar.gz) = 7cfe11d39681f1114695f4b981ebcdd76e4dd553
-Size (smalltalk-1.95.10.tar.gz) = 2233844 bytes
+SHA1 (smalltalk-2.1.3.tar.gz) = c38735c51357f5535097234b19ab4401615992f5
+Size (smalltalk-2.1.3.tar.gz) = 3416268 bytes
+SHA1 (patch-aa) = 41e3ca795c13aef9ef5f837e5341e306bcfa9352
+SHA1 (patch-ab) = ad2fbdb3a63c2bcff9d080d563ba29294b7b8e03
diff --git a/lang/smalltalk/patches/patch-aa b/lang/smalltalk/patches/patch-aa
new file mode 100644
index 00000000000..cb35d7249ae
--- /dev/null
+++ b/lang/smalltalk/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.6 2003/07/02 00:00:23 jtb Exp $
+
+--- libgst/Makefile.in.orig
++++ libgst/Makefile.in
+@@ -212,7 +212,6 @@
+ 
+ libgst_la_LDFLAGS = -version-info $(VERSION_INFO)
+ libgst_la_DEPENDENCIES = $(top_builddir)/lib-src/library.la $(LIBSIGSEGV) \
+-	@LIBLTDL@ @LIBSNPRINTFV@ @LIBREADLINE@ @LIBGMP@
+ 
+ 
+ libgst_la_SOURCES = \
diff --git a/lang/smalltalk/patches/patch-ab b/lang/smalltalk/patches/patch-ab
new file mode 100644
index 00000000000..137fb8bdb5e
--- /dev/null
+++ b/lang/smalltalk/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.5 2003/07/02 00:00:23 jtb Exp $
+
+--- Makefile.in.orig
++++ Makefile.in
+@@ -111,7 +111,7 @@
+ LIBGMP = @LIBGMP@
+ LIBICONV = @LIBICONV@
+ LIBLTDL = @LIBLTDL@
+-LIBREADLINE = @LIBREADLINE@
++LIBREADLINE = @LIBREADLINE@ -lreadline -ltermcap
+ LIBS = @LIBS@
+ LIBSNPRINTFV = @LIBSNPRINTFV@
+ LIBTCLTK = @LIBTCLTK@
+@@ -349,7 +349,7 @@
+ 	done
+ gst$(EXEEXT): $(gst_OBJECTS) $(gst_DEPENDENCIES) 
+ 	@rm -f gst$(EXEEXT)
+-	$(LINK) $(gst_LDFLAGS) $(gst_OBJECTS) $(gst_LDADD) $(LIBS)
++	$(LINK) $(gst_LDFLAGS) $(gst_OBJECTS) $(gst_LDADD) $(LIBS) $(LIBREADLINE)
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ 	@$(NORMAL_INSTALL)