- Update to 3.0.2 - See smalltalk.gnu.org for what's new in 3.0

- Optional postgresql bindings
- Update website link and remove references to old maintainers

4 files changed, 249 insertions, 407 deletions

diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 8a9dc46f1ea6..96d1e219b089 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	smalltalk
-PORTVERSION=	2.3.6
+PORTVERSION=	3.0.2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,15 +14,18 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	johans@stack.nl
 COMMENT=	GNU Smalltalk
 
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm \
 		execinfo.1:${PORTSDIR}/devel/libexecinfo
 
-OPTIONS=	TCLTK "Enable Tcl/Tk binding" on
+OPTIONS=	TCLTK "Enable Tcl/Tk binding" on \
+		PGSQL "PostgreSQL binding" on
 
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_GCC=	3.4+
 USE_ICONV=	yes
+USE_SQLITE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
@@ -34,7 +37,9 @@ CONFIGURE_ARGS=	--enable-generational-gc=no \
 USE_LDCONFIG=	yes
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
-MAN1=		gst.1
+MAN1=		gst.1 gst-load.1 gst-package.1 gst-sunit.1 gst-config.1 \
+		gst-convert.1 gst-doc.1
+MLINKS=		gst-load.1 gst-reload.1
 INFO=		gst gst-base gst-libs
 
 CPPFLAGS=	-I${LOCALBASE}/include
@@ -56,6 +61,14 @@ CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib/tcl8.4 \
 PLIST_SUB+=	TCLTK=""
 .endif
 
+.if defined(WITHOUT_PGSQL)
+PLIST_SUB+=	PGSQL="@comment "
+.else
+USE_PGSQL=	yes
+.include "${PORTSDIR}/Mk/bsd.database.mk"
+PLIST_SUB+=	PGSQL=""
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
 		-e 's/ia64-\*-\* /&|amd64-*-* /' \
diff --git a/lang/smalltalk/distinfo b/lang/smalltalk/distinfo
index 652268c5b0b5..84c385e6f77b 100644
--- a/lang/smalltalk/distinfo
+++ b/lang/smalltalk/distinfo
@@ -1,3 +1,3 @@
-MD5 (smalltalk-2.3.6.tar.gz) = c2fd207d55a873531ad89750f7f6478e
-SHA256 (smalltalk-2.3.6.tar.gz) = 03268e0dd8a3edca1dfbc7796aba97df1cbe19de989c7fec67d75db19b43b6ff
-SIZE (smalltalk-2.3.6.tar.gz) = 4384839
+MD5 (smalltalk-3.0.2.tar.gz) = 2c471da97c8a174d9b0f6586555ebb0c
+SHA256 (smalltalk-3.0.2.tar.gz) = 1d2d9d255a0d2a9df9630872b96b0ebc162c37cdb2cfadb4a011e16f351f5e9a
+SIZE (smalltalk-3.0.2.tar.gz) = 4610835
diff --git a/lang/smalltalk/pkg-descr b/lang/smalltalk/pkg-descr
index aab776725910..b394dea3277e 100644
--- a/lang/smalltalk/pkg-descr
+++ b/lang/smalltalk/pkg-descr
@@ -3,7 +3,4 @@ language.
 GNU Smalltalk is an implementation that closely follows the                  
 Smalltalk-80 language (tm ParcPlace Systems).
 
-WWW: http://www.smalltalk.org/versions/GNUSmalltalk.html
-
-- Gary Palmer <gpalmer@FreeBSD.org>
-- Alexander Langer <alex@big.endian.de>
+WWW: http://smalltalk.gnu.org/
diff --git a/lang/smalltalk/pkg-plist b/lang/smalltalk/pkg-plist
index 12613499474a..f6ca223d4e66 100644
--- a/lang/smalltalk/pkg-plist
+++ b/lang/smalltalk/pkg-plist
@@ -1,5 +1,8 @@
 bin/gst
+bin/gst-blox
 bin/gst-config
+bin/gst-convert
+bin/gst-doc
 bin/gst-load
 bin/gst-package
 bin/gst-reload
@@ -9,11 +12,19 @@ include/gstpub.h
 lib/libgst.a
 lib/libgst.la
 lib/libgst.so
-lib/libgst.so.6
+lib/libgst.so.7
 %%TCLTK%%lib/smalltalk/blox-tk-%%VERSION%%.so
 %%TCLTK%%lib/smalltalk/blox-tk.a
 %%TCLTK%%lib/smalltalk/blox-tk.la
 %%TCLTK%%lib/smalltalk/blox-tk.so
+lib/smalltalk/dbd-sqlite3-%%VERSION%%.so
+lib/smalltalk/dbd-sqlite3.a
+lib/smalltalk/dbd-sqlite3.la
+lib/smalltalk/dbd-sqlite3.so
+lib/smalltalk/digest-%%VERSION%%.so
+lib/smalltalk/digest.a
+lib/smalltalk/digest.la
+lib/smalltalk/digest.so
 lib/smalltalk/gdbm-%%VERSION%%.so
 lib/smalltalk/gdbm.a
 lib/smalltalk/gdbm.la
@@ -22,11 +33,11 @@ lib/smalltalk/i18n-%%VERSION%%.so
 lib/smalltalk/i18n.a
 lib/smalltalk/i18n.la
 lib/smalltalk/i18n.so
+lib/smalltalk/iconv-%%VERSION%%.so
+lib/smalltalk/iconv.a
+lib/smalltalk/iconv.la
+lib/smalltalk/iconv.so
 lib/smalltalk/libc.la
-lib/smalltalk/md5-%%VERSION%%.so
-lib/smalltalk/md5.a
-lib/smalltalk/md5.la
-lib/smalltalk/md5.so
 lib/smalltalk/tcp-%%VERSION%%.so
 lib/smalltalk/tcp.a
 lib/smalltalk/tcp.la
@@ -36,439 +47,260 @@ lib/smalltalk/zlib.a
 lib/smalltalk/zlib.la
 lib/smalltalk/zlib.so
 libdata/pkgconfig/gnu-smalltalk.pc
+libexec/smalltalk/deb
+libexec/smalltalk/lslR
+libexec/smalltalk/mailfs
+libexec/smalltalk/patchfs
+libexec/smalltalk/uar
+libexec/smalltalk/urar
+libexec/smalltalk/uzoo
+libexec/smalltalk/ulha
+libexec/smalltalk/ucpio
+libexec/smalltalk/utar
+libexec/smalltalk/uzip
+var/lib/smalltalk/gst.im
 share/aclocal/gst.m4
+share/aclocal/gst-package.m4
 share/aclocal/snprintfv.m4
 share/emacs/site-lisp/gst-mode.el
 share/emacs/site-lisp/smalltalk-mode.el
-%%DATADIR%%/blox-gtk/Blox.st
-%%DATADIR%%/blox-gtk/BloxBasic.st
-%%DATADIR%%/blox-gtk/BloxExtend.st
-%%DATADIR%%/blox-gtk/BloxText.st
-%%DATADIR%%/blox-gtk/BloxWidgets.st
-%%DATADIR%%/blox-tk/Blox.st
-%%DATADIR%%/blox-tk/BloxBasic.st
-%%DATADIR%%/blox-tk/BloxCanvas.st
-%%DATADIR%%/blox-tk/BloxExtend.st
-%%DATADIR%%/blox-tk/BloxText.st
-%%DATADIR%%/blox-tk/BloxWidgets.st
-%%DATADIR%%/blox-tk/colors.txt
-%%DATADIR%%/browser/BrowShell.st
-%%DATADIR%%/browser/BrowserMain.st
-%%DATADIR%%/browser/ButtonForm.st
-%%DATADIR%%/browser/ChangeLog
-%%DATADIR%%/browser/ClassBrow.st
-%%DATADIR%%/browser/ClassHierBrow.st
-%%DATADIR%%/browser/DebugSupport.st
-%%DATADIR%%/browser/Debugger.st
-%%DATADIR%%/browser/DictInspect.st
-%%DATADIR%%/browser/GuiData.st
-%%DATADIR%%/browser/Inspector.st
-%%DATADIR%%/browser/Load.st
-%%DATADIR%%/browser/Manager.st
-%%DATADIR%%/browser/Menu.st
-%%DATADIR%%/browser/MethInspect.st
-%%DATADIR%%/browser/MethSetBrow.st
-%%DATADIR%%/browser/ModalDialog.st
-%%DATADIR%%/browser/NamespBrow.st
-%%DATADIR%%/browser/Notifier.st
-%%DATADIR%%/browser/PCode.st
-%%DATADIR%%/browser/PList.st
-%%DATADIR%%/browser/PText.st
-%%DATADIR%%/browser/RadioForm.st
-%%DATADIR%%/browser/Run.st
-%%DATADIR%%/browser/StrcInspect.st
-%%DATADIR%%/browser/View.st
-%%DATADIR%%/browser/bear.gif
-%%DATADIR%%/browser/test.st
-%%DATADIR%%/compiler/ChangeLog
-%%DATADIR%%/compiler/OrderedSet.st
-%%DATADIR%%/compiler/ParseTreeSearcher.st
-%%DATADIR%%/compiler/RBFormatter.st
-%%DATADIR%%/compiler/RBParseNodes.st
-%%DATADIR%%/compiler/RBParser.st
-%%DATADIR%%/compiler/RBToken.st
-%%DATADIR%%/compiler/RewriteTests.st
-%%DATADIR%%/compiler/STCompLit.st
-%%DATADIR%%/compiler/STCompiler.st
-%%DATADIR%%/compiler/STDecompiler.st
-%%DATADIR%%/compiler/STLoader.st
-%%DATADIR%%/compiler/STLoaderObjs.st
-%%DATADIR%%/compiler/STSymTable.st
-%%DATADIR%%/compiler/StartCompiler.st
-%%DATADIR%%/compiler/test.st
-%%DATADIR%%/db/ChangeLog
-%%DATADIR%%/db/DB.st
-%%DATADIR%%/db/Glorp.st
-%%DATADIR%%/db/GlorpMySQL.st
-%%DATADIR%%/db/GlorpPort.st
-%%DATADIR%%/db/GlorpTest.st
-%%DATADIR%%/db/MySQL.st
-%%DATADIR%%/db/MySQLTests.st
-%%DATADIR%%/db/README
-%%DATADIR%%/db/mysql-test.st
-%%DATADIR%%/examples/Application.st
-%%DATADIR%%/examples/Bench.st
-%%DATADIR%%/examples/Case.st
-%%DATADIR%%/examples/Continuations.st
-%%DATADIR%%/examples/Debugger.st
-%%DATADIR%%/examples/DeltaBlue.st
-%%DATADIR%%/examples/Dinner.st
-%%DATADIR%%/examples/EditStream.st
-%%DATADIR%%/examples/Gen2.st
-%%DATADIR%%/examples/GenClasses.st
-%%DATADIR%%/examples/Generator.st
-%%DATADIR%%/examples/LazyCollection.st
-%%DATADIR%%/examples/Lisp.st
-%%DATADIR%%/examples/Man.st
-%%DATADIR%%/examples/MemUsage.st
-%%DATADIR%%/examples/Methods.st
-%%DATADIR%%/examples/MiniDebugger.st
-%%DATADIR%%/examples/PipeStream.st
-%%DATADIR%%/examples/Prolog.st
-%%DATADIR%%/examples/PrtHier.st
-%%DATADIR%%/examples/Publish.st
-%%DATADIR%%/examples/PushBack.st
-%%DATADIR%%/examples/Queens.st
-%%DATADIR%%/examples/README
-%%DATADIR%%/examples/RandomInt.st
-%%DATADIR%%/examples/RegExp.st
-%%DATADIR%%/examples/Richards.st
-%%DATADIR%%/examples/SortCriter.st
-%%DATADIR%%/examples/Sync.st
-%%DATADIR%%/examples/Tetris.st
-%%DATADIR%%/examples/Timer.st
-%%DATADIR%%/examples/Tokenizer.st
-%%DATADIR%%/examples/gdbm-c.st
-%%DATADIR%%/examples/gdbm.st
-%%DATADIR%%/examples/gdbmtests.st
-%%DATADIR%%/examples/md5.st
-%%DATADIR%%/examples/md5tests.st
-%%DATADIR%%/examples/modules/gdbm-c.st
-%%DATADIR%%/examples/modules/gdbm.st
-%%DATADIR%%/examples/modules/md5.st
-%%DATADIR%%/examples/modules/zlib.st
-%%DATADIR%%/examples/modules/zlibtests.st
-%%DATADIR%%/examples/ncurses.st
-%%DATADIR%%/examples/pepe.sed
-%%DATADIR%%/examples/shell
-%%DATADIR%%/examples/xml.sed
-%%DATADIR%%/examples/zlib.st
-%%DATADIR%%/examples/zlibtests.st
-%%DATADIR%%/gst.im
-%%DATADIR%%/gtk/.keep_me
-%%DATADIR%%/i18n/ChangeLog
-%%DATADIR%%/i18n/Collation.st
-%%DATADIR%%/i18n/Expression.st
-%%DATADIR%%/i18n/GetText.st
-%%DATADIR%%/i18n/Locale.st
-%%DATADIR%%/i18n/Numbers.st
-%%DATADIR%%/i18n/Sets.st
-%%DATADIR%%/i18n/Times.st
-%%DATADIR%%/i18n/iconvtests.st
-%%DATADIR%%/java/Java.st
-%%DATADIR%%/java/JavaClassFiles.st
-%%DATADIR%%/java/JavaExtensions.st
-%%DATADIR%%/java/JavaMetaobjects.st
-%%DATADIR%%/java/JavaRuntime.st
-%%DATADIR%%/java/JavaTranslation.st
-%%DATADIR%%/java/extract-native.awk
-%%DATADIR%%/java/gnu_gcj_convert_IOConverter.st
-%%DATADIR%%/java/gnu_gcj_runtime_StackTrace.st
-%%DATADIR%%/java/gnu_gcj_runtime_StringBuffer.st
-%%DATADIR%%/java/gnu_java_net_PlainDatagramSocketImpl.st
-%%DATADIR%%/java/gnu_java_net_PlainSocketImpl.st
-%%DATADIR%%/java/gnu_java_nio_FileLockImpl.st
-%%DATADIR%%/java/gnu_java_nio_SelectorImpl.st
-%%DATADIR%%/java/java_io_File.st
-%%DATADIR%%/java/java_io_FileDescriptor.st
-%%DATADIR%%/java/java_io_ObjectInputStream.st
-%%DATADIR%%/java/java_io_VMObjectStreamClass.st
-%%DATADIR%%/java/java_lang_Character.st
-%%DATADIR%%/java/java_lang_Class.st
-%%DATADIR%%/java/java_lang_ConcreteProcess.st
-%%DATADIR%%/java/java_lang_Double.st
-%%DATADIR%%/java/java_lang_Float.st
-%%DATADIR%%/java/java_lang_Math.st
-%%DATADIR%%/java/java_lang_Object.st
-%%DATADIR%%/java/java_lang_Runtime.st
-%%DATADIR%%/java/java_lang_String.st
-%%DATADIR%%/java/java_lang_StringBuffer.st
-%%DATADIR%%/java/java_lang_System.st
-%%DATADIR%%/java/java_lang_Thread.st
-%%DATADIR%%/java/java_lang_VMClassLoader.st
-%%DATADIR%%/java/java_lang_ref_Reference.st
-%%DATADIR%%/java/java_lang_reflect_Array.st
-%%DATADIR%%/java/java_lang_reflect_Constructor.st
-%%DATADIR%%/java/java_lang_reflect_Field.st
-%%DATADIR%%/java/java_lang_reflect_Method.st
-%%DATADIR%%/java/java_lang_reflect_Proxy.st
-%%DATADIR%%/java/java_net_InetAddress.st
-%%DATADIR%%/java/java_net_NetworkInterface.st
-%%DATADIR%%/java/java_nio_DirectByteBufferImpl.st
-%%DATADIR%%/java/java_nio_channels_FileChannelImpl.st
-%%DATADIR%%/java/java_text_Collator.st
-%%DATADIR%%/java/java_util_ResourceBundle.st
-%%DATADIR%%/java/java_util_TimeZone.st
-%%DATADIR%%/java/java_util_zip_Deflater.st
-%%DATADIR%%/java/java_util_zip_Inflater.st
-%%DATADIR%%/kernel/AbstNamespc.st
-%%DATADIR%%/kernel/AnsiDates.st
-%%DATADIR%%/kernel/AnsiExcept.st
+%%DATADIR%%/unsupported/CPP-test.st
+%%DATADIR%%/unsupported/CParseT1.st
+%%DATADIR%%/unsupported/CParseT2.st
+%%DATADIR%%/unsupported/CParseT3.st
+%%DATADIR%%/unsupported/CString.st
+%%DATADIR%%/unsupported/DLD.st
+%%DATADIR%%/unsupported/Interr.st
+%%DATADIR%%/unsupported/Process.st
+%%DATADIR%%/unsupported/Profile.st
+%%DATADIR%%/unsupported/Sorting.st
+%%DATADIR%%/unsupported/echo.st
+%%DATADIR%%/unsupported/market.st
+%%DATADIR%%/unsupported/resolve.st
+%%DATADIR%%/unsupported/t.st
+%%DATADIR%%/unsupported/torture.st
+%%DATADIR%%/unsupported/cint/CDeclNode.st
+%%DATADIR%%/unsupported/cint/CSymbol.st
+%%DATADIR%%/unsupported/cint/ExpansionStream.st
+%%DATADIR%%/unsupported/cint/CExpressionNode.st
+%%DATADIR%%/unsupported/cint/CSymbolTable.st
+%%DATADIR%%/unsupported/cint/ExpansionStreamStack.st
+%%DATADIR%%/unsupported/cint/CPP.st
+%%DATADIR%%/unsupported/cint/CTok.st
+%%DATADIR%%/unsupported/cint/LineStream.st
+%%DATADIR%%/unsupported/cint/CPStrConc.st
+%%DATADIR%%/unsupported/cint/CToken.st
+%%DATADIR%%/unsupported/cint/LineTokenStream.st
+%%DATADIR%%/unsupported/cint/CPStrUnq.st
+%%DATADIR%%/unsupported/cint/CTreeBuilder.st
+%%DATADIR%%/unsupported/cint/README
+%%DATADIR%%/unsupported/cint/CParseType.st
+%%DATADIR%%/unsupported/cint/CollapsedStream.st
+%%DATADIR%%/unsupported/cint/StreamStack.st
+%%DATADIR%%/scripts/Test.st
+%%DATADIR%%/scripts/Load.st
+%%DATADIR%%/scripts/Package.st
+%%DATADIR%%/scripts/Browser.st
+%%DATADIR%%/scripts/GenDoc.st
+%%DATADIR%%/scripts/Convert.st
 %%DATADIR%%/kernel/Array.st
+%%DATADIR%%/kernel/CompildMeth.st
+%%DATADIR%%/kernel/LookupTable.st
+%%DATADIR%%/kernel/RunArray.st
 %%DATADIR%%/kernel/ArrayColl.st
+%%DATADIR%%/kernel/CompiledBlk.st
+%%DATADIR%%/kernel/Magnitude.st
+%%DATADIR%%/kernel/Semaphore.st
+%%DATADIR%%/kernel/DeferBinding.st
 %%DATADIR%%/kernel/Association.st
+%%DATADIR%%/kernel/HomedAssoc.st
+%%DATADIR%%/kernel/ContextPart.st
+%%DATADIR%%/kernel/MappedColl.st
+%%DATADIR%%/kernel/SeqCollect.st
 %%DATADIR%%/kernel/Autoload.st
+%%DATADIR%%/kernel/DLD.st
+%%DATADIR%%/kernel/Memory.st
+%%DATADIR%%/kernel/Set.st
 %%DATADIR%%/kernel/Bag.st
+%%DATADIR%%/kernel/Date.st
+%%DATADIR%%/kernel/Message.st
+%%DATADIR%%/kernel/SharedQueue.st
 %%DATADIR%%/kernel/Behavior.st
-%%DATADIR%%/kernel/BindingDict.st
+%%DATADIR%%/kernel/Delay.st
+%%DATADIR%%/kernel/Metaclass.st
+%%DATADIR%%/kernel/SmallInt.st
 %%DATADIR%%/kernel/BlkClosure.st
+%%DATADIR%%/kernel/Continuation.st
+%%DATADIR%%/kernel/Generator.st
+%%DATADIR%%/kernel/Dictionary.st
+%%DATADIR%%/kernel/MethodDict.st
+%%DATADIR%%/kernel/SortCollect.st
 %%DATADIR%%/kernel/BlkContext.st
+%%DATADIR%%/kernel/DirMessage.st
+%%DATADIR%%/kernel/MethodInfo.st
+%%DATADIR%%/kernel/Stream.st
 %%DATADIR%%/kernel/Boolean.st
+%%DATADIR%%/kernel/Directory.st
+%%DATADIR%%/kernel/MthContext.st
+%%DATADIR%%/kernel/String.st
+%%DATADIR%%/kernel/UniString.st
+%%DATADIR%%/kernel/ExcHandling.st
+%%DATADIR%%/kernel/Namespace.st
+%%DATADIR%%/kernel/SymLink.st
+%%DATADIR%%/kernel/VFS.st
+%%DATADIR%%/kernel/VFSZip.st
 %%DATADIR%%/kernel/Builtins.st
+%%DATADIR%%/kernel/False.st
+%%DATADIR%%/kernel/Number.st
+%%DATADIR%%/kernel/Symbol.st
 %%DATADIR%%/kernel/ByteArray.st
+%%DATADIR%%/kernel/File.st
+%%DATADIR%%/kernel/ObjDumper.st
+%%DATADIR%%/kernel/SysDict.st
+%%DATADIR%%/kernel/ScaledDec.st
+%%DATADIR%%/kernel/FileSegment.st
+%%DATADIR%%/kernel/Object.st
+%%DATADIR%%/kernel/Time.st
 %%DATADIR%%/kernel/ByteStream.st
+%%DATADIR%%/kernel/FileStream.st
+%%DATADIR%%/kernel/Security.st
+%%DATADIR%%/kernel/OrderColl.st
 %%DATADIR%%/kernel/CFuncs.st
+%%DATADIR%%/kernel/Float.st
+%%DATADIR%%/kernel/PkgLoader.st
+%%DATADIR%%/kernel/Transcript.st
 %%DATADIR%%/kernel/CObject.st
+%%DATADIR%%/kernel/Fraction.st
+%%DATADIR%%/kernel/Point.st
+%%DATADIR%%/kernel/True.st
 %%DATADIR%%/kernel/CStruct.st
+%%DATADIR%%/kernel/IdentDict.st
+%%DATADIR%%/kernel/PosStream.st
+%%DATADIR%%/kernel/UndefObject.st
 %%DATADIR%%/kernel/CType.st
-%%DATADIR%%/kernel/CallinProcess.st
+%%DATADIR%%/kernel/IdentitySet.st
+%%DATADIR%%/kernel/ProcSched.st
+%%DATADIR%%/kernel/ValueAdapt.st
 %%DATADIR%%/kernel/CharArray.st
+%%DATADIR%%/kernel/Integer.st
+%%DATADIR%%/kernel/Process.st
+%%DATADIR%%/kernel/CallinProcess.st
+%%DATADIR%%/kernel/WeakObjects.st
 %%DATADIR%%/kernel/Character.st
+%%DATADIR%%/kernel/UniChar.st
+%%DATADIR%%/kernel/Interval.st
+%%DATADIR%%/kernel/RWStream.st
+%%DATADIR%%/kernel/OtherArrays.st
 %%DATADIR%%/kernel/Class.st
+%%DATADIR%%/kernel/LargeInt.st
+%%DATADIR%%/kernel/Random.st
+%%DATADIR%%/kernel/WriteStream.st
 %%DATADIR%%/kernel/ClassDesc.st
+%%DATADIR%%/kernel/Link.st
+%%DATADIR%%/kernel/ReadStream.st
+%%DATADIR%%/kernel/ObjMemory.st
 %%DATADIR%%/kernel/Collection.st
+%%DATADIR%%/kernel/LinkedList.st
+%%DATADIR%%/kernel/Rectangle.st
+%%DATADIR%%/kernel/AnsiDates.st
 %%DATADIR%%/kernel/CompildCode.st
-%%DATADIR%%/kernel/CompildMeth.st
-%%DATADIR%%/kernel/CompiledBlk.st
-%%DATADIR%%/kernel/ContextPart.st
-%%DATADIR%%/kernel/DLD.st
-%%DATADIR%%/kernel/Date.st
-%%DATADIR%%/kernel/Delay.st
-%%DATADIR%%/kernel/Dictionary.st
-%%DATADIR%%/kernel/DirMessage.st
-%%DATADIR%%/kernel/Directory.st
-%%DATADIR%%/kernel/ExcHandling.st
-%%DATADIR%%/kernel/False.st
-%%DATADIR%%/kernel/File.st
+%%DATADIR%%/kernel/LookupKey.st
+%%DATADIR%%/kernel/BindingDict.st
+%%DATADIR%%/kernel/AbstNamespc.st
+%%DATADIR%%/kernel/RootNamespc.st
+%%DATADIR%%/kernel/AnsiExcept.st
+%%DATADIR%%/kernel/HashedColl.st
 %%DATADIR%%/kernel/FileDescr.st
-%%DATADIR%%/kernel/FileSegment.st
-%%DATADIR%%/kernel/FileStream.st
-%%DATADIR%%/kernel/Float.st
 %%DATADIR%%/kernel/FloatD.st
 %%DATADIR%%/kernel/FloatE.st
 %%DATADIR%%/kernel/FloatQ.st
-%%DATADIR%%/kernel/Fraction.st
-%%DATADIR%%/kernel/Getopt.st
-%%DATADIR%%/kernel/HashedColl.st
-%%DATADIR%%/kernel/HomedAssoc.st
-%%DATADIR%%/kernel/IdentDict.st
-%%DATADIR%%/kernel/IdentitySet.st
-%%DATADIR%%/kernel/Integer.st
-%%DATADIR%%/kernel/Interval.st
-%%DATADIR%%/kernel/LargeInt.st
-%%DATADIR%%/kernel/Link.st
-%%DATADIR%%/kernel/LinkedList.st
-%%DATADIR%%/kernel/LookupKey.st
-%%DATADIR%%/kernel/LookupTable.st
-%%DATADIR%%/kernel/Magnitude.st
-%%DATADIR%%/kernel/MappedColl.st
-%%DATADIR%%/kernel/Memory.st
-%%DATADIR%%/kernel/Message.st
-%%DATADIR%%/kernel/Metaclass.st
-%%DATADIR%%/kernel/MethodDict.st
-%%DATADIR%%/kernel/MethodInfo.st
-%%DATADIR%%/kernel/MthContext.st
-%%DATADIR%%/kernel/Namespace.st
-%%DATADIR%%/kernel/Number.st
-%%DATADIR%%/kernel/ObjDumper.st
-%%DATADIR%%/kernel/ObjMemory.st
-%%DATADIR%%/kernel/Object.st
-%%DATADIR%%/kernel/OrderColl.st
-%%DATADIR%%/kernel/OtherArrays.st
-%%DATADIR%%/kernel/PkgLoader.st
-%%DATADIR%%/kernel/Point.st
-%%DATADIR%%/kernel/PosStream.st
-%%DATADIR%%/kernel/ProcSched.st
-%%DATADIR%%/kernel/Process.st
-%%DATADIR%%/kernel/RWStream.st
-%%DATADIR%%/kernel/Random.st
-%%DATADIR%%/kernel/ReadStream.st
-%%DATADIR%%/kernel/Rectangle.st
+%%DATADIR%%/kernel/URL.st
+%%DATADIR%%/kernel/VarBinding.st
 %%DATADIR%%/kernel/RecursionLock.st
+%%DATADIR%%/kernel/Getopt.st
 %%DATADIR%%/kernel/Regex.st
-%%DATADIR%%/kernel/RootNamespc.st
-%%DATADIR%%/kernel/RunArray.st
-%%DATADIR%%/kernel/ScaledDec.st
-%%DATADIR%%/kernel/Security.st
-%%DATADIR%%/kernel/Semaphore.st
-%%DATADIR%%/kernel/SeqCollect.st
-%%DATADIR%%/kernel/Set.st
-%%DATADIR%%/kernel/SharedQueue.st
-%%DATADIR%%/kernel/SmallInt.st
-%%DATADIR%%/kernel/SortCollect.st
-%%DATADIR%%/kernel/Stream.st
 %%DATADIR%%/kernel/StreamOps.st
-%%DATADIR%%/kernel/String.st
-%%DATADIR%%/kernel/SymLink.st
-%%DATADIR%%/kernel/Symbol.st
-%%DATADIR%%/kernel/SysDict.st
-%%DATADIR%%/kernel/Time.st
-%%DATADIR%%/kernel/TokenStream.st
-%%DATADIR%%/kernel/Transcript.st
-%%DATADIR%%/kernel/True.st
-%%DATADIR%%/kernel/URL.st
-%%DATADIR%%/kernel/UndefObject.st
-%%DATADIR%%/kernel/UniChar.st
-%%DATADIR%%/kernel/UniString.st
-%%DATADIR%%/kernel/VFS.st
-%%DATADIR%%/kernel/ValueAdapt.st
-%%DATADIR%%/kernel/VarBinding.st
-%%DATADIR%%/kernel/WeakObjects.st
-%%DATADIR%%/kernel/WriteStream.st
-%%DATADIR%%/net/Base.st
-%%DATADIR%%/net/ChangeLog
-%%DATADIR%%/net/ContentHandler.st
-%%DATADIR%%/net/FTP.st
-%%DATADIR%%/net/HTTP.st
-%%DATADIR%%/net/IMAP.st
-%%DATADIR%%/net/Load.st
-%%DATADIR%%/net/MIME.st
-%%DATADIR%%/net/NNTP.st
-%%DATADIR%%/net/NetServer.st
-%%DATADIR%%/net/POP.st
-%%DATADIR%%/net/SMTP.st
-%%DATADIR%%/net/URIResolver.st
-%%DATADIR%%/net/httpd/FileServer.st
-%%DATADIR%%/net/httpd/Haiku.st
-%%DATADIR%%/net/httpd/STT.st
-%%DATADIR%%/net/httpd/WebServer.st
-%%DATADIR%%/net/httpd/WikiServer.st
-%%DATADIR%%/net/httpd/edit.jpg
-%%DATADIR%%/net/httpd/example1.stt
-%%DATADIR%%/net/httpd/example2.stt
-%%DATADIR%%/net/httpd/find.jpg
-%%DATADIR%%/net/httpd/head.jpg
-%%DATADIR%%/net/httpd/help.jpg
-%%DATADIR%%/net/httpd/history.jpg
-%%DATADIR%%/net/httpd/next.jpg
-%%DATADIR%%/net/httpd/prev.jpg
-%%DATADIR%%/net/httpd/recent.jpg
-%%DATADIR%%/net/httpd/rename.jpg
-%%DATADIR%%/net/httpd/test.st
-%%DATADIR%%/net/httpd/top.jpg
-%%DATADIR%%/numerics/Approximation.st
-%%DATADIR%%/numerics/Basic.st
-%%DATADIR%%/numerics/Distributions.st
-%%DATADIR%%/numerics/Functions.st
-%%DATADIR%%/numerics/Integration.st
-%%DATADIR%%/numerics/Matrixes.st
-%%DATADIR%%/numerics/NumericsAdds.st
-%%DATADIR%%/numerics/NumericsTests.st
-%%DATADIR%%/numerics/Optimization.st
-%%DATADIR%%/numerics/RNG.st
-%%DATADIR%%/numerics/Statistics.st
+%%DATADIR%%/examples/TokenStream.st
+%%DATADIR%%/examples/LazyCollection.st
+%%DATADIR%%/examples/Man.st
+%%DATADIR%%/examples/Tetris.st
+%%DATADIR%%/examples/Gen2.st
+%%DATADIR%%/examples/Gen3.st
+%%DATADIR%%/examples/Lisp.st
+%%DATADIR%%/examples/Queens.st
+%%DATADIR%%/examples/DeltaBlue.st
+%%DATADIR%%/examples/JSON.st
+%%DATADIR%%/examples/Richards.st
+%%DATADIR%%/examples/Bench.st
+%%DATADIR%%/examples/MiniDebugger.st
+%%DATADIR%%/examples/MemUsage.st
+%%DATADIR%%/examples/Methods.st
+%%DATADIR%%/examples/README
+%%DATADIR%%/examples/GenClasses.st
+%%DATADIR%%/examples/Dinner.st
+%%DATADIR%%/examples/Prolog.st
+%%DATADIR%%/examples/EditStream.st
+%%DATADIR%%/examples/PipeStream.st
+%%DATADIR%%/examples/PrtHier.st
+%%DATADIR%%/examples/Case.st
+%%DATADIR%%/examples/RegExp.st
+%%DATADIR%%/examples/PushBack.st
+%%DATADIR%%/examples/SortCriter.st
+%%DATADIR%%/examples/shell
+%%DATADIR%%/examples/pepe.sed
+%%DATADIR%%/examples/xml.sed
+%%DATADIR%%/examples/Tokenizer.st
+%%DATADIR%%/examples/Timer.st
+%%DATADIR%%/examples/Sync.st
 %%DATADIR%%/packages.xml
-%%DATADIR%%/scripts/Getopt.st
-%%DATADIR%%/scripts/Load.st
-%%DATADIR%%/scripts/Test.st
-%%DATADIR%%/sunit/SUnit.st
-%%DATADIR%%/sunit/SUnitPreload.st
-%%DATADIR%%/sunit/SUnitScript.st
-%%DATADIR%%/sunit/SUnitTests.st
-%%DATADIR%%/tcp/AbstractSocketImpl.st
-%%DATADIR%%/tcp/Buffers.st
-%%DATADIR%%/tcp/ChangeLog
-%%DATADIR%%/tcp/Datagram.st
-%%DATADIR%%/tcp/IPSocketImpl.st
-%%DATADIR%%/tcp/SocketAddress.st
-%%DATADIR%%/tcp/Sockets.st
-%%DATADIR%%/tcp/Tests.st
-%%DATADIR%%/tcp/cfuncs.st
-%%DATADIR%%/tcp/init.st
-%%DATADIR%%/unsupported/BigExpr.st
-%%DATADIR%%/unsupported/CInt.st
-%%DATADIR%%/unsupported/CPP-test.st
-%%DATADIR%%/unsupported/CParseT1.st
-%%DATADIR%%/unsupported/CParseT2.st
-%%DATADIR%%/unsupported/CParseT3.st
-%%DATADIR%%/unsupported/CString.st
-%%DATADIR%%/unsupported/DLD.st
-%%DATADIR%%/unsupported/Extensn.st
-%%DATADIR%%/unsupported/IfError.st
-%%DATADIR%%/unsupported/Interr.st
-%%DATADIR%%/unsupported/ParseErr.st
-%%DATADIR%%/unsupported/Process1.st
-%%DATADIR%%/unsupported/Process2.st
-%%DATADIR%%/unsupported/Profile.st
-%%DATADIR%%/unsupported/Sorting.st
-%%DATADIR%%/unsupported/a.st
-%%DATADIR%%/unsupported/ba.st
-%%DATADIR%%/unsupported/bug.st
-%%DATADIR%%/unsupported/bug2.st
-%%DATADIR%%/unsupported/bug4.st
-%%DATADIR%%/unsupported/cint/CDeclNode.st
-%%DATADIR%%/unsupported/cint/CExpressionNode.st
-%%DATADIR%%/unsupported/cint/CPP.st
-%%DATADIR%%/unsupported/cint/CPStrConc.st
-%%DATADIR%%/unsupported/cint/CPStrUnq.st
-%%DATADIR%%/unsupported/cint/CParseType.st
-%%DATADIR%%/unsupported/cint/CSymbol.st
-%%DATADIR%%/unsupported/cint/CSymbolTable.st
-%%DATADIR%%/unsupported/cint/CTok.st
-%%DATADIR%%/unsupported/cint/CToken.st
-%%DATADIR%%/unsupported/cint/CTreeBuilder.st
-%%DATADIR%%/unsupported/cint/CollapsedStream.st
-%%DATADIR%%/unsupported/cint/ExpansionStream.st
-%%DATADIR%%/unsupported/cint/ExpansionStreamStack.st
-%%DATADIR%%/unsupported/cint/LineStream.st
-%%DATADIR%%/unsupported/cint/LineTokenStream.st
-%%DATADIR%%/unsupported/cint/README
-%%DATADIR%%/unsupported/cint/StreamStack.st
-%%DATADIR%%/unsupported/echo.st
-%%DATADIR%%/unsupported/er2.st
-%%DATADIR%%/unsupported/market.st
-%%DATADIR%%/unsupported/resolve.st
-%%DATADIR%%/unsupported/self.st
-%%DATADIR%%/unsupported/t.st
-%%DATADIR%%/unsupported/torture.st
-%%DATADIR%%/vfs/README
-%%DATADIR%%/vfs/deb
-%%DATADIR%%/vfs/lslR
-%%DATADIR%%/vfs/mailfs
-%%DATADIR%%/vfs/patchfs
-%%DATADIR%%/vfs/uar
-%%DATADIR%%/vfs/ucpio
-%%DATADIR%%/vfs/ulha
-%%DATADIR%%/vfs/urar
-%%DATADIR%%/vfs/utar
-%%DATADIR%%/vfs/uzip
-%%DATADIR%%/vfs/uzoo
-%%DATADIR%%/xml/ChangeLog
-%%DATADIR%%/xml/XML.st
-%%DATADIR%%/xml/XPath.st
-%%DATADIR%%/xml/XSL.st
-@dirrm %%DATADIR%%/xml
-@dirrm %%DATADIR%%/vfs
+%%DATADIR%%/BloxTK.star
+%%DATADIR%%/Browser.star
+%%DATADIR%%/Complex.star
+%%DATADIR%%/Continuations.star
+%%DATADIR%%/DebugTools.star
+%%DATADIR%%/DBD-MySQL.star
+%%PGSQL%%%%DATADIR%%/DBD-PostgreSQL.star
+%%DATADIR%%/DBD-SQLite.star
+%%DATADIR%%/DBI.star
+%%DATADIR%%/GDBM.star
+%%DATADIR%%/Glorp.star
+%%DATADIR%%/Blox.star
+%%DATADIR%%/WebServer.star
+%%DATADIR%%/I18N.star
+%%DATADIR%%/Iconv.star
+%%DATADIR%%/Java.star
+%%DATADIR%%/Digest.star
+%%DATADIR%%/gtk/.keep_me
+%%DATADIR%%/GNUPlot.star
+%%DATADIR%%/NCurses.star
+%%DATADIR%%/NetClients.star
+%%DATADIR%%/DhbNumericalMethods.star
+%%DATADIR%%/Compiler.star
+%%DATADIR%%/Parser.star
+%%DATADIR%%/ClassPublisher.star
+%%DATADIR%%/Sport.star
+%%DATADIR%%/SUnit.star
+%%DATADIR%%/TCP.star
+%%DATADIR%%/VFSAddOns.star
+%%DATADIR%%/XML-XMLNodeBuilder.star
+%%DATADIR%%/XML-DOM.star
+%%DATADIR%%/XML-XMLParser.star
+%%DATADIR%%/XML-SAXDriver.star
+%%DATADIR%%/XML-SAXParser.star
+%%DATADIR%%/XPath.star
+%%DATADIR%%/XSL.star
+%%DATADIR%%/ZLib.star
 @dirrm %%DATADIR%%/unsupported/cint
 @dirrm %%DATADIR%%/unsupported
-@dirrm %%DATADIR%%/tcp
-@dirrm %%DATADIR%%/sunit
 @dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/numerics
-@dirrm %%DATADIR%%/net/httpd
-@dirrm %%DATADIR%%/net
 @dirrm %%DATADIR%%/kernel
-@dirrm %%DATADIR%%/java
-@dirrm %%DATADIR%%/i18n
 @dirrm %%DATADIR%%/gtk
-@dirrm %%DATADIR%%/examples/modules
 @dirrm %%DATADIR%%/examples
-@dirrm %%DATADIR%%/db
-@dirrm %%DATADIR%%/compiler
-@dirrm %%DATADIR%%/browser
-@dirrm %%DATADIR%%/blox-tk
-@dirrm %%DATADIR%%/blox-gtk
 @dirrm %%DATADIR%%
 @dirrm lib/smalltalk
+@dirrm libexec/smalltalk
+@dirrm var/lib/smalltalk
+@dirrm var/lib
+@dirrm var
 @exec mkdir -p %D/include/snprintfv
 @dirrmtry include/snprintfv