Update to GNU Smalltalk 3.1.

There're numerous changes, which include various improvements,
new features and bug fixes.

Most notable changes include async. signal safety, threads support,
remote control of Smalltalk VM via TCP socket, DBI improvements,
bindings to Cairo, LibSDL, OpenGL and GLUT, Swazoo web server,
newer Seaside application server and web framework.

6 files changed, 152 insertions, 337 deletions

diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index b0cf1e8f0c7..a7f493dd991 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2008/09/06 17:54:15 ahoka Exp $
+# $NetBSD: Makefile,v 1.44 2009/04/10 17:36:42 asau Exp $
 
-DISTNAME=	smalltalk-2.3.5
-PKGREVISION=	1
+DISTNAME=	smalltalk-3.1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=smalltalk/}
 
@@ -11,10 +10,16 @@ COMMENT=	GNU Smalltalk: A smalltalk-80 implementation
 
 ONLY_FOR_PLATFORM=	*-*-i386 *-*-sparc *-*-powerpc
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+MAKE_JOBS_SAFE=		no
+
 USE_TOOLS+=		gawk gmake makeinfo pkg-config
 USE_GNU_READLINE=	YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--with-system-libsigsegv=${BUILDLINK_PREFIX.libsigsegv}/lib
+CONFIGURE_ARGS+=	--with-system-libffi=${BUILDLINK_PREFIX.libffi}/lib
 CONFIGURE_ARGS+=	--with-gdbm=${BUILDLINK_PREFIX.gdbm}/lib
 CONFIGURE_ARGS+=	--with-gmp=${BUILDLINK_PREFIX.gmp}/lib
 CONFIGURE_ARGS+=	--with-lispdir=${PREFIX}/share/emacs/site-lisp
@@ -25,18 +30,18 @@ CONFIGURE_ARGS+=	--without-emacs
 #CONFIGURE_ARGS+=	--without-glib --without-gtk
 #CONFIGURE_ENV+=		CFLAGS="-O2 -fsigned-char"
 
-SUBST_CLASSES+=		sed
-SUBST_STAGE.sed=	pre-configure
-SUBST_MESSAGE.sed=	Replacing sed interpreter.
-SUBST_FILES.sed=	examples/*.sed
-SUBST_SED.sed=		-e "s|/bin/sed|${SED}|"
-
-REPLACE_PERL+=		vfs/mailfs vfs/deb
-
 IGNORE_LIBTOOLIZE=	lib/smalltalk/libc.la
 INFO_FILES=		YES
 TEST_TARGET=		check
 
+REPLACE_PERL=		packages/vfs/deb packages/vfs/mailfs
+REPLACE_SED=		examples/pepe.sed examples/xml.sed
+
+REPLACE_INTERPRETER+=	sys-sed
+REPLACE.sys-sed.old=	[^[:space:]]*sed
+REPLACE.sys-sed.new=	${SED}
+REPLACE_FILES.sys-sed=	${REPLACE_SED}
+
 post-extract:
 	sed -e "s/long double/double/g" -e "s/1.0L/1.0/g" -e  "s/0.0L/0.0/g" \
 	-e "s/LDBL_EPSILON/DBL_EPSILON/g" -e "s/truncl/trunc/g" \
@@ -45,8 +50,13 @@ post-extract:
 	-e "s/LDBL_EPSILON/FLT_EPSILON/g" -e "s/truncl/truncf/g" \
 	${WRKSRC}/lib-src/truncl.c > ${WRKSRC}/lib-src/truncf.c
 
+.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/gdbm/buildlink3.mk"
+.include "../../devel/libsigsegv/buildlink3.mk"
+.include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/lang/smalltalk/PLIST b/lang/smalltalk/PLIST
index d39537ed513..ed00fe45105 100644
--- a/lang/smalltalk/PLIST
+++ b/lang/smalltalk/PLIST
@@ -1,106 +1,112 @@
-@comment $NetBSD: PLIST,v 1.16 2007/09/03 13:36:28 obache Exp $
+@comment $NetBSD: PLIST,v 1.17 2009/04/10 17:36:43 asau Exp $
 bin/gst
+bin/gst-blox
 bin/gst-config
+bin/gst-convert
+bin/gst-doc
 bin/gst-load
 bin/gst-package
 bin/gst-reload
+bin/gst-remote
 bin/gst-sunit
 include/gst.h
 include/gstpub.h
-include/sigsegv.h
 info/gst-base.info
 info/gst-libs.info
 info/gst.info
 lib/libgst.la
 lib/pkgconfig/gnu-smalltalk.pc
 lib/smalltalk/blox-tk.la
+lib/smalltalk/digest.la
 lib/smalltalk/gdbm.la
 lib/smalltalk/gst-gtk.la
+lib/smalltalk/gstglut.la
+lib/smalltalk/gstopengl.la
 lib/smalltalk/i18n.la
+lib/smalltalk/iconv.la
 lib/smalltalk/libc.la
-lib/smalltalk/md5.la
-lib/smalltalk/tcp.la
+lib/smalltalk/sockets.la
 lib/smalltalk/zlib.la
+libexec/smalltalk/vfs/deb
+libexec/smalltalk/vfs/lslR
+libexec/smalltalk/vfs/mailfs
+libexec/smalltalk/vfs/patchfs
+libexec/smalltalk/vfs/uar
+libexec/smalltalk/vfs/ucpio
+libexec/smalltalk/vfs/ulha
+libexec/smalltalk/vfs/urar
+libexec/smalltalk/vfs/utar
+libexec/smalltalk/vfs/uzip
+libexec/smalltalk/vfs/uzoo
+man/man1/gst-config.1
+man/man1/gst-convert.1
+man/man1/gst-doc.1
+man/man1/gst-load.1
+man/man1/gst-package.1
+man/man1/gst-reload.1
+man/man1/gst-sunit.1
 man/man1/gst.1
+share/aclocal/gst-package.m4
 share/aclocal/gst.m4
 share/aclocal/snprintfv.m4
-share/smalltalk/blox-gtk/Blox.st
-share/smalltalk/blox-gtk/BloxBasic.st
-share/smalltalk/blox-gtk/BloxExtend.st
-share/smalltalk/blox-gtk/BloxText.st
-share/smalltalk/blox-gtk/BloxWidgets.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/OrderedSet.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/RewriteTests.st
-share/smalltalk/compiler/STCompLit.st
-share/smalltalk/compiler/STCompiler.st
-share/smalltalk/compiler/STDecompiler.st
-share/smalltalk/compiler/STLoader.st
-share/smalltalk/compiler/STLoaderObjs.st
-share/smalltalk/compiler/STSymTable.st
-share/smalltalk/compiler/StartCompiler.st
-share/smalltalk/compiler/test.st
-share/smalltalk/db/ChangeLog
-share/smalltalk/db/DB.st
-share/smalltalk/db/Glorp.st
-share/smalltalk/db/GlorpMySQL.st
-share/smalltalk/db/GlorpPort.st
-share/smalltalk/db/GlorpTest.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/Blox.star
+share/smalltalk/BloxGTK.star
+share/smalltalk/BloxTK.star
+share/smalltalk/Browser.star
+share/smalltalk/CParser.star
+share/smalltalk/Cairo.star
+share/smalltalk/ClassPublisher.star
+share/smalltalk/Compiler.star
+share/smalltalk/Complex.star
+share/smalltalk/Continuations.star
+share/smalltalk/DBD-MySQL.star
+share/smalltalk/DBI.star
+share/smalltalk/DebugTools.star
+share/smalltalk/DhbNumericalMethods.star
+share/smalltalk/Digest.star
+share/smalltalk/GDBM.star
+share/smalltalk/GLUT.star
+share/smalltalk/GNUPlot.star
+share/smalltalk/GTK.star
+share/smalltalk/Glorp.star
+share/smalltalk/I18N.star
+share/smalltalk/Iconv.star
+share/smalltalk/Java.star
+share/smalltalk/Magritte-Seaside.star
+share/smalltalk/Magritte.star
+share/smalltalk/NetClients.star
+share/smalltalk/OpenGL.star
+share/smalltalk/Parser.star
+share/smalltalk/ROE.star
+share/smalltalk/SUnit.star
+share/smalltalk/Seaside-Core.star
+share/smalltalk/Seaside-Development.star
+share/smalltalk/Seaside-Examples.star
+share/smalltalk/Seaside.star
+share/smalltalk/Sockets.star
+share/smalltalk/Sport.star
+share/smalltalk/Swazoo.star
+share/smalltalk/VFSAddOns.star
+share/smalltalk/WebServer.star
+share/smalltalk/XML-DOM.star
+share/smalltalk/XML-SAXDriver.star
+share/smalltalk/XML-SAXParser.star
+share/smalltalk/XML-XMLNodeBuilder.star
+share/smalltalk/XML-XMLParser.star
+share/smalltalk/XPath.star
+share/smalltalk/XSL.star
+share/smalltalk/ZLib.star
 share/smalltalk/examples/Bench.st
+share/smalltalk/examples/CairoBlit.st
+share/smalltalk/examples/CairoDemo.st
 share/smalltalk/examples/Case.st
-share/smalltalk/examples/Continuations.st
-share/smalltalk/examples/Debugger.st
 share/smalltalk/examples/DeltaBlue.st
 share/smalltalk/examples/Dinner.st
 share/smalltalk/examples/EditStream.st
 share/smalltalk/examples/Gen2.st
+share/smalltalk/examples/Gen3.st
 share/smalltalk/examples/GenClasses.st
-share/smalltalk/examples/Generator.st
+share/smalltalk/examples/JSON.st
 share/smalltalk/examples/LazyCollection.st
 share/smalltalk/examples/Lisp.st
 share/smalltalk/examples/Man.st
@@ -110,105 +116,19 @@ share/smalltalk/examples/MiniDebugger.st
 share/smalltalk/examples/PipeStream.st
 share/smalltalk/examples/Prolog.st
 share/smalltalk/examples/PrtHier.st
-share/smalltalk/examples/Publish.st
-share/smalltalk/examples/PushBack.st
 share/smalltalk/examples/Queens.st
 share/smalltalk/examples/README
-share/smalltalk/examples/RandomInt.st
 share/smalltalk/examples/RegExp.st
 share/smalltalk/examples/Richards.st
 share/smalltalk/examples/SortCriter.st
 share/smalltalk/examples/Sync.st
 share/smalltalk/examples/Tetris.st
 share/smalltalk/examples/Timer.st
+share/smalltalk/examples/TokenStream.st
 share/smalltalk/examples/Tokenizer.st
-share/smalltalk/examples/gdbm-c.st
-share/smalltalk/examples/gdbm.st
-share/smalltalk/examples/gdbmtests.st
-share/smalltalk/examples/md5.st
-share/smalltalk/examples/md5tests.st
-share/smalltalk/examples/modules/gdbm-c.st
-share/smalltalk/examples/modules/gdbm.st
-share/smalltalk/examples/modules/md5.st
-share/smalltalk/examples/modules/zlib.st
-share/smalltalk/examples/modules/zlibtests.st
-share/smalltalk/examples/ncurses.st
 share/smalltalk/examples/pepe.sed
 share/smalltalk/examples/shell
 share/smalltalk/examples/xml.sed
-share/smalltalk/examples/zlib.st
-share/smalltalk/examples/zlibtests.st
-share/smalltalk/gst.im
-share/smalltalk/gtk/Enums.st
-share/smalltalk/gtk/Funcs.st
-share/smalltalk/gtk/GtkDecl.st
-share/smalltalk/gtk/GtkImpl.st
-share/smalltalk/gtk/Libs.st
-share/smalltalk/gtk/MoreFuncs.st
-share/smalltalk/gtk/MoreStructs.st
-share/smalltalk/gtk/Structs.st
-share/smalltalk/gtk/example_arrow.st
-share/smalltalk/gtk/example_aspectframe.st
-share/smalltalk/gtk/example_buttonbox.st
-share/smalltalk/gtk/example_entry.st
-share/smalltalk/gtk/example_eventbox.st
-share/smalltalk/gtk/example_hello.st
-share/smalltalk/gtk/example_tictactoe.st
-share/smalltalk/gtk/example_tree.st
-share/smalltalk/i18n/ChangeLog
-share/smalltalk/i18n/Collation.st
-share/smalltalk/i18n/Expression.st
-share/smalltalk/i18n/GetText.st
-share/smalltalk/i18n/Locale.st
-share/smalltalk/i18n/Numbers.st
-share/smalltalk/i18n/Sets.st
-share/smalltalk/i18n/Times.st
-share/smalltalk/java/Java.st
-share/smalltalk/java/JavaClassFiles.st
-share/smalltalk/java/JavaExtensions.st
-share/smalltalk/java/JavaMetaobjects.st
-share/smalltalk/java/JavaRuntime.st
-share/smalltalk/java/JavaTranslation.st
-share/smalltalk/java/extract-native.awk
-share/smalltalk/java/gnu_gcj_convert_IOConverter.st
-share/smalltalk/java/gnu_gcj_runtime_StackTrace.st
-share/smalltalk/java/gnu_gcj_runtime_StringBuffer.st
-share/smalltalk/java/gnu_java_net_PlainDatagramSocketImpl.st
-share/smalltalk/java/gnu_java_net_PlainSocketImpl.st
-share/smalltalk/java/gnu_java_nio_FileLockImpl.st
-share/smalltalk/java/gnu_java_nio_SelectorImpl.st
-share/smalltalk/java/java_io_File.st
-share/smalltalk/java/java_io_FileDescriptor.st
-share/smalltalk/java/java_io_ObjectInputStream.st
-share/smalltalk/java/java_io_VMObjectStreamClass.st
-share/smalltalk/java/java_lang_Character.st
-share/smalltalk/java/java_lang_Class.st
-share/smalltalk/java/java_lang_ConcreteProcess.st
-share/smalltalk/java/java_lang_Double.st
-share/smalltalk/java/java_lang_Float.st
-share/smalltalk/java/java_lang_Math.st
-share/smalltalk/java/java_lang_Object.st
-share/smalltalk/java/java_lang_Runtime.st
-share/smalltalk/java/java_lang_String.st
-share/smalltalk/java/java_lang_StringBuffer.st
-share/smalltalk/java/java_lang_System.st
-share/smalltalk/java/java_lang_Thread.st
-share/smalltalk/java/java_lang_VMClassLoader.st
-share/smalltalk/java/java_lang_ref_Reference.st
-share/smalltalk/java/java_lang_reflect_Array.st
-share/smalltalk/java/java_lang_reflect_Constructor.st
-share/smalltalk/java/java_lang_reflect_Field.st
-share/smalltalk/java/java_lang_reflect_Method.st
-share/smalltalk/java/java_lang_reflect_Proxy.st
-share/smalltalk/java/java_net_InetAddress.st
-share/smalltalk/java/java_net_NetworkInterface.st
-share/smalltalk/java/java_nio_DirectByteBufferImpl.st
-share/smalltalk/java/java_nio_channels_FileChannelImpl.st
-share/smalltalk/java/java_text_Collator.st
-share/smalltalk/java/java_util_ResourceBundle.st
-share/smalltalk/java/java_util_TimeZone.st
-share/smalltalk/java/java_util_zip_Deflater.st
-share/smalltalk/java/java_util_zip_Inflater.st
 share/smalltalk/kernel/AbstNamespc.st
 share/smalltalk/kernel/AnsiDates.st
 share/smalltalk/kernel/AnsiExcept.st
@@ -224,7 +144,8 @@ share/smalltalk/kernel/BlkContext.st
 share/smalltalk/kernel/Boolean.st
 share/smalltalk/kernel/Builtins.st
 share/smalltalk/kernel/ByteArray.st
-share/smalltalk/kernel/ByteStream.st
+share/smalltalk/kernel/CCallable.st
+share/smalltalk/kernel/CCallback.st
 share/smalltalk/kernel/CFuncs.st
 share/smalltalk/kernel/CObject.st
 share/smalltalk/kernel/CStruct.st
@@ -239,8 +160,10 @@ share/smalltalk/kernel/CompildCode.st
 share/smalltalk/kernel/CompildMeth.st
 share/smalltalk/kernel/CompiledBlk.st
 share/smalltalk/kernel/ContextPart.st
+share/smalltalk/kernel/Continuation.st
 share/smalltalk/kernel/DLD.st
 share/smalltalk/kernel/Date.st
+share/smalltalk/kernel/DeferBinding.st
 share/smalltalk/kernel/Delay.st
 share/smalltalk/kernel/Dictionary.st
 share/smalltalk/kernel/DirMessage.st
@@ -249,6 +172,7 @@ share/smalltalk/kernel/ExcHandling.st
 share/smalltalk/kernel/False.st
 share/smalltalk/kernel/File.st
 share/smalltalk/kernel/FileDescr.st
+share/smalltalk/kernel/FilePath.st
 share/smalltalk/kernel/FileSegment.st
 share/smalltalk/kernel/FileStream.st
 share/smalltalk/kernel/Float.st
@@ -256,6 +180,7 @@ share/smalltalk/kernel/FloatD.st
 share/smalltalk/kernel/FloatE.st
 share/smalltalk/kernel/FloatQ.st
 share/smalltalk/kernel/Fraction.st
+share/smalltalk/kernel/Generator.st
 share/smalltalk/kernel/Getopt.st
 share/smalltalk/kernel/HashedColl.st
 share/smalltalk/kernel/HomedAssoc.st
@@ -263,6 +188,7 @@ share/smalltalk/kernel/IdentDict.st
 share/smalltalk/kernel/IdentitySet.st
 share/smalltalk/kernel/Integer.st
 share/smalltalk/kernel/Interval.st
+share/smalltalk/kernel/Iterable.st
 share/smalltalk/kernel/LargeInt.st
 share/smalltalk/kernel/Link.st
 share/smalltalk/kernel/LinkedList.st
@@ -286,6 +212,7 @@ share/smalltalk/kernel/OtherArrays.st
 share/smalltalk/kernel/PkgLoader.st
 share/smalltalk/kernel/Point.st
 share/smalltalk/kernel/PosStream.st
+share/smalltalk/kernel/ProcEnv.st
 share/smalltalk/kernel/ProcSched.st
 share/smalltalk/kernel/Process.st
 share/smalltalk/kernel/RWStream.st
@@ -311,7 +238,6 @@ share/smalltalk/kernel/SymLink.st
 share/smalltalk/kernel/Symbol.st
 share/smalltalk/kernel/SysDict.st
 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
@@ -319,154 +245,43 @@ share/smalltalk/kernel/UndefObject.st
 share/smalltalk/kernel/UniChar.st
 share/smalltalk/kernel/UniString.st
 share/smalltalk/kernel/VFS.st
+share/smalltalk/kernel/VFSZip.st
 share/smalltalk/kernel/ValueAdapt.st
 share/smalltalk/kernel/VarBinding.st
 share/smalltalk/kernel/WeakObjects.st
 share/smalltalk/kernel/WriteStream.st
-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/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/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/scripts/Getopt.st
+share/smalltalk/scripts/Browser.st
+share/smalltalk/scripts/Convert.st
+share/smalltalk/scripts/GenDoc.st
 share/smalltalk/scripts/Load.st
+share/smalltalk/scripts/Package.st
+share/smalltalk/scripts/Remote.st
 share/smalltalk/scripts/Test.st
-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/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/Tests.st
-share/smalltalk/tcp/cfuncs.st
-share/smalltalk/tcp/init.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/CParseType-test.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/Process.st
 share/smalltalk/unsupported/Profile.st
 share/smalltalk/unsupported/Sorting.st
-share/smalltalk/unsupported/a.st
-share/smalltalk/unsupported/ba.st
-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/echo.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/vfs
-@dirrm share/smalltalk/unsupported/cint
+var/lib/smalltalk/gst.im
+@dirrm var/lib/smalltalk
+@dirrm var/lib
+@dirrm var
 @dirrm share/smalltalk/unsupported
-@dirrm share/smalltalk/tcp
-@dirrm share/smalltalk/sunit
 @dirrm share/smalltalk/scripts
-@dirrm share/smalltalk/numerics
-@dirrm share/smalltalk/net/httpd
-@dirrm share/smalltalk/net
 @dirrm share/smalltalk/kernel
-@dirrm share/smalltalk/java
-@dirrm share/smalltalk/i18n
-@dirrm share/smalltalk/gtk
-@dirrm share/smalltalk/examples/modules
 @dirrm share/smalltalk/examples
-@dirrm share/smalltalk/db
-@dirrm share/smalltalk/compiler
-@dirrm share/smalltalk/browser
-@dirrm share/smalltalk/blox-tk
-@dirrm share/smalltalk/blox-gtk
 @dirrm share/smalltalk
+@dirrm libexec/smalltalk/vfs
+@dirrm libexec/smalltalk
 @dirrm lib/smalltalk
 @exec ${MKDIR} %D/include/snprintfv
 @dirrm include/snprintfv
diff --git a/lang/smalltalk/distinfo b/lang/smalltalk/distinfo
index 169ef7bb573..037203bb5ff 100644
--- a/lang/smalltalk/distinfo
+++ b/lang/smalltalk/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.16 2007/09/03 16:28:56 obache Exp $
+$NetBSD: distinfo,v 1.17 2009/04/10 17:36:43 asau Exp $
 
-SHA1 (smalltalk-2.3.5.tar.gz) = e67e953e2ee06f8343dccbd8ad23230c40b8272a
-RMD160 (smalltalk-2.3.5.tar.gz) = cc9df741304dce7350a4e0ffa99a7adfe29fa67e
-Size (smalltalk-2.3.5.tar.gz) = 4369835 bytes
-SHA1 (patch-ac) = 640808f34bdbc8ed6beab6d7d8e022d45e33ee90
-SHA1 (patch-ae) = 69585b82cab161cb40a6509e8eafb73c88f14d05
-SHA1 (patch-af) = 6d094368cd30fffe5678b1bdf8a7b6da766137e4
+SHA1 (smalltalk-3.1.tar.gz) = 9b1602bf29d1483d9200d83419dc3cd0fc0d397b
+RMD160 (smalltalk-3.1.tar.gz) = cc9a593c1773ba66f2f999b1369944eebd722ef9
+Size (smalltalk-3.1.tar.gz) = 5282705 bytes
+SHA1 (patch-ac) = e129e3ead2a1c8a0e5ce7e7d342ff131570a2f0b
+SHA1 (patch-ae) = ec673dd0fcd5a12096d23986d4f9c04df562a51a
+SHA1 (patch-af) = 76744e495b5bb180b5acdbcc450d7090ed708113
 SHA1 (patch-ag) = 5eec4c1f315e05dea00f33d8f31b6b17f32e557a
diff --git a/lang/smalltalk/patches/patch-ac b/lang/smalltalk/patches/patch-ac
index 6bf278245f7..44d39363e1e 100644
--- a/lang/smalltalk/patches/patch-ac
+++ b/lang/smalltalk/patches/patch-ac
@@ -1,26 +1,26 @@
-$NetBSD: patch-ac,v 1.2 2007/09/03 13:36:30 obache Exp $
+$NetBSD: patch-ac,v 1.3 2009/04/10 17:36:43 asau Exp $
 
---- sigsegv/configure.orig	2007-05-12 10:11:26.000000000 +0000
-+++ sigsegv/configure
-@@ -9581,7 +9581,7 @@ done
+--- sigsegv/configure.orig	2009-04-07 20:00:09.000000000 +0400
++++ sigsegv/configure	2009-04-07 20:19:57.000000000 +0400
+@@ -9598,7 +9598,7 @@
  
  
  case "$host_os" in
--  sunos4* | freebsd* | openbsd* | netbsd*)
-+  sunos4* | freebsd* | openbsd* | netbsd* | dragonfly*)
+-  sunos4* | freebsd* | openbsd* | netbsd* | kfreebsd* | knetbsd*)
++  sunos4* | freebsd* | openbsd* | netbsd* | dragonfly* | kfreebsd* | knetbsd*)
      CFG_SIGNALS=signals-bsd.h ;;
    hpux*)
      CFG_SIGNALS=signals-hpux.h ;;
-@@ -13464,7 +13464,7 @@ if test -z "$CFG_FAULT" && test "$sv_cv_
+@@ -13481,7 +13481,7 @@
  fi
  if test -z "$CFG_FAULT" && test "$sv_cv_fault_bsd" = yes; then
    case "$host_os" in
--    freebsd*)
-+    freebsd* | dragonfly*)
+-    freebsd* | kfreebsd*)
++    freebsd* | dragonfly* | kfreebsd*)
        case "$host_cpu" in
          i?86 | x86_64)
            CFG_FAULT=fault-freebsd-i386.h
-@@ -13942,7 +13942,7 @@ if test $sv_cv_procfsvma = yes; then
+@@ -13959,7 +13959,7 @@
  else
    case "$host_os" in
      linux*) CFG_STACKVMA=stackvma-linux.c ;;
diff --git a/lang/smalltalk/patches/patch-ae b/lang/smalltalk/patches/patch-ae
index f929690cba5..b05498a05b0 100644
--- a/lang/smalltalk/patches/patch-ae
+++ b/lang/smalltalk/patches/patch-ae
@@ -1,22 +1,12 @@
-$NetBSD: patch-ae,v 1.1 2007/09/03 13:36:30 obache Exp $
+$NetBSD: patch-ae,v 1.2 2009/04/10 17:36:43 asau Exp $
 
---- configure.orig	2007-06-02 15:45:21.000000000 +0000
-+++ configure
-@@ -16230,7 +16230,7 @@ fi
- 
+--- configure.orig	2009-04-07 20:00:09.000000000 +0400
++++ configure	2009-04-07 20:23:39.000000000 +0400
+@@ -20386,6 +20386,7 @@
  for ac_func in putenv strdup strerror strsignal mkstemp getpagesize \
  	getdtablesize strstr ftruncate floorl ceill sqrtl frexpl ldexpl asinl \
--	acosl atanl logl expl tanl sinl cosl truncl lrintl strsep strpbrk
-+	acosl atanl logl expl tanl sinl cosl trunc truncf truncl lrintl strsep strpbrk
+ 	acosl atanl logl expl tanl sinl cosl powl truncl lrintl strsep strpbrk \
++	acosl atanl logl expl tanl sinl cosl trunc truncf truncl lrintl strsep strpbrk \
+ 	symlink mkdtemp
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -21414,7 +21414,7 @@ EOF
-         gst_cv_readline_libs="-lreadline $lib"
-         test "x$with_readline" != x && test "$with_readline" != yes \
- 	  && test -d "$with_readline" \
--	  && gst_cv_readline_libs="-L$with_readline $gst_readline_libs"
-+	  && gst_cv_readline_libs="-L$with_readline $gst_cv_readline_libs"
-         break
-       fi
-     done
diff --git a/lang/smalltalk/patches/patch-af b/lang/smalltalk/patches/patch-af
index 43891394b09..28193619fa3 100644
--- a/lang/smalltalk/patches/patch-af
+++ b/lang/smalltalk/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2007/09/03 13:36:31 obache Exp $
+$NetBSD: patch-af,v 1.2 2009/04/10 17:36:43 asau Exp $
 
---- lib-src/mathl.h.orig	2006-02-05 18:41:28.000000000 +0000
-+++ lib-src/mathl.h
-@@ -66,5 +66,9 @@ extern long double logl(long double x);
+--- lib-src/mathl.h.orig	2009-04-07 20:26:25.000000000 +0400
++++ lib-src/mathl.h	2009-04-07 20:26:37.000000000 +0400
+@@ -66,5 +66,9 @@
  extern long double sinl (long double x);
  extern long double sqrtl(long double x);
  extern long double tanl (long double x);