Update to 3.1

4 files changed, 238 insertions, 211 deletions

diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 1081e6632c55..ff95c33227a1 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	smalltalk
-PORTVERSION=	3.0.5
+PORTVERSION=	3.1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,16 +16,19 @@ COMMENT=	GNU Smalltalk
 
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm \
-		execinfo.1:${PORTSDIR}/devel/libexecinfo
+		execinfo.1:${PORTSDIR}/devel/libexecinfo \
+		cairo.2:${PORTSDIR}/graphics/cairo
 
 OPTIONS=	TCLTK "Enable Tcl/Tk binding" on \
-		PGSQL "PostgreSQL binding" on
+		PGSQL "PostgreSQL binding" on \
+		SDL "SDL binding" on
 
 USE_AUTOTOOLS=	libtool:22
-USE_GNOME=	gnomehack gnometarget pkgconfig
+USE_GNOME=	gnomehack gnometarget pkgconfig pango
 USE_ICONV=	yes
 USE_SQLITE=	yes
 USE_GMAKE=	yes
+USE_GL=		gl glut
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		ac_cv_prog_EMACS=no
@@ -68,6 +71,13 @@ USE_PGSQL=	yes
 PLIST_SUB+=	PGSQL=""
 .endif
 
+.if defined(WITHOUT_SDL)
+PLIST_SUB+=	SDL="@comment "
+.else
+USE_SDL=	image mixer sdl sound ttf
+PLIST_SUB+=	SDL=""
+.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 a8ddfbd4a2fc..79d1727a89b2 100644
--- a/lang/smalltalk/distinfo
+++ b/lang/smalltalk/distinfo
@@ -1,3 +1,3 @@
-MD5 (smalltalk-3.0.5.tar.gz) = 0917ed6929c75feef6c785c3516b74e1
-SHA256 (smalltalk-3.0.5.tar.gz) = 45ede476a8bd70f0f521af25a727c0fad93660cff925125a0582a36176bc86cf
-SIZE (smalltalk-3.0.5.tar.gz) = 4714975
+MD5 (smalltalk-3.1.tar.gz) = fb4630a86fc47c893cf9eb9adccd4851
+SHA256 (smalltalk-3.1.tar.gz) = af964929ba81d133c1fe4a9479fad8c8e21a9449bc2c0b2c48b1e51c8ee43eed
+SIZE (smalltalk-3.1.tar.gz) = 5282705
diff --git a/lang/smalltalk/files/patch-libgst_Makefile.in b/lang/smalltalk/files/patch-libgst_Makefile.in
index ed042af94d27..645aacc15e1b 100644
--- a/lang/smalltalk/files/patch-libgst_Makefile.in
+++ b/lang/smalltalk/files/patch-libgst_Makefile.in
@@ -1,11 +1,11 @@
 --- libgst/Makefile.in.orig	2008-05-16 12:56:06.000000000 +0200
 +++ libgst/Makefile.in	2008-05-16 12:56:15.000000000 +0200
-@@ -319,7 +319,7 @@
+@@ -333,7 +333,7 @@
  CLEANFILES = genprims$(EXEEXT) genbc$(EXEEXT) genvm$(EXEEXT)
  
  # definitions for libgst.la
 -libgst_la_LIBADD = $(top_builddir)/lib-src/library.la \
 +libgst_la_LIBADD = $(top_builddir)/lib-src/library.la -lexecinfo \
- 	$(LIBSIGSEGV) $(LIBFFI) $(LIBSNPRINTFV) $(LIBREADLINE) $(LIBGMP)
+ 	$(LIBSIGSEGV) $(LIBFFI) $(LIBSNPRINTFV) $(LIBREADLINE) $(LIBGMP) \
+	$(LIBTHREAD)
  
- libgst_la_DEPENDENCIES = $(top_builddir)/lib-src/library.la @LIBSNPRINTFV@
diff --git a/lang/smalltalk/pkg-plist b/lang/smalltalk/pkg-plist
index 1192f613c15a..9d978de979ba 100644
--- a/lang/smalltalk/pkg-plist
+++ b/lang/smalltalk/pkg-plist
@@ -6,6 +6,7 @@ bin/gst-doc
 bin/gst-load
 bin/gst-package
 bin/gst-reload
+bin/gst-remote
 bin/gst-sunit
 include/gst.h
 include/gstpub.h
@@ -29,6 +30,14 @@ lib/smalltalk/gdbm-%%VERSION%%.so
 lib/smalltalk/gdbm.a
 lib/smalltalk/gdbm.la
 lib/smalltalk/gdbm.so
+lib/smalltalk/gstglut-%%VERSION%%.so
+lib/smalltalk/gstglut.a
+lib/smalltalk/gstglut.la
+lib/smalltalk/gstglut.so
+lib/smalltalk/gstopengl-%%VERSION%%.so
+lib/smalltalk/gstopengl.a
+lib/smalltalk/gstopengl.la
+lib/smalltalk/gstopengl.so
 lib/smalltalk/i18n-%%VERSION%%.so
 lib/smalltalk/i18n.a
 lib/smalltalk/i18n.la
@@ -38,10 +47,14 @@ lib/smalltalk/iconv.a
 lib/smalltalk/iconv.la
 lib/smalltalk/iconv.so
 lib/smalltalk/libc.la
-lib/smalltalk/tcp-%%VERSION%%.so
-lib/smalltalk/tcp.a
-lib/smalltalk/tcp.la
-lib/smalltalk/tcp.so
+lib/smalltalk/sdl-%%VERSION%%.so
+lib/smalltalk/sdl.a
+lib/smalltalk/sdl.la
+lib/smalltalk/sdl.so
+lib/smalltalk/sockets-%%VERSION%%.so
+lib/smalltalk/sockets.a
+lib/smalltalk/sockets.la
+lib/smalltalk/sockets.so
 lib/smalltalk/zlib-%%VERSION%%.so
 lib/smalltalk/zlib.a
 lib/smalltalk/zlib.la
@@ -64,233 +77,237 @@ share/aclocal/gst-package.m4
 share/aclocal/snprintfv.m4
 share/emacs/site-lisp/gst-mode.el
 share/emacs/site-lisp/smalltalk-mode.el
-%%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%%/Blox.star
+%%DATADIR%%/BloxTK.star
+%%DATADIR%%/Browser.star
+%%DATADIR%%/CParser.star
+%%DATADIR%%/Cairo.star
+%%DATADIR%%/CairoSDL.star
+%%DATADIR%%/ClassPublisher.star
+%%DATADIR%%/Compiler.star
+%%DATADIR%%/Complex.star
+%%DATADIR%%/Continuations.star
+%%DATADIR%%/DBD-MySQL.star
+%%DATADIR%%/DBD-PostgreSQL.star
+%%DATADIR%%/DBD-SQLite.star
+%%DATADIR%%/DBI.star
+%%DATADIR%%/DebugTools.star
+%%DATADIR%%/DhbNumericalMethods.star
+%%DATADIR%%/Digest.star
+%%DATADIR%%/GDBM.star
+%%DATADIR%%/GLUT.star
+%%DATADIR%%/GNUPlot.star
+%%DATADIR%%/Glorp.star
+%%DATADIR%%/I18N.star
+%%DATADIR%%/Iconv.star
+%%DATADIR%%/Java.star
+%%DATADIR%%/LibSDL.star
+%%DATADIR%%/LibSDL_GL.star
+%%DATADIR%%/LibSDL_image.star
+%%DATADIR%%/LibSDL_mixer.star
+%%DATADIR%%/LibSDL_sound.star
+%%DATADIR%%/LibSDL_ttf.star
+%%DATADIR%%/Magritte-Seaside.star
+%%DATADIR%%/Magritte.star
+%%DATADIR%%/NCurses.star
+%%DATADIR%%/NetClients.star
+%%DATADIR%%/OpenGL.star
+%%DATADIR%%/Parser.star
+%%DATADIR%%/ROE.star
+%%DATADIR%%/SUnit.star
+%%DATADIR%%/Seaside-Core.star
+%%DATADIR%%/Seaside-Development.star
+%%DATADIR%%/Seaside-Examples.star
+%%DATADIR%%/Seaside.star
+%%DATADIR%%/Sockets.star
+%%DATADIR%%/Sport.star
+%%DATADIR%%/Swazoo.star
+%%DATADIR%%/VFSAddOns.star
+%%DATADIR%%/WebServer.star
+%%DATADIR%%/XML-DOM.star
+%%DATADIR%%/XML-SAXDriver.star
+%%DATADIR%%/XML-SAXParser.star
+%%DATADIR%%/XML-XMLNodeBuilder.star
+%%DATADIR%%/XML-XMLParser.star
+%%DATADIR%%/XPath.star
+%%DATADIR%%/XSL.star
+%%DATADIR%%/ZLib.star
+%%DATADIR%%/examples/Bench.st
+%%DATADIR%%/examples/CairoBlit.st
+%%DATADIR%%/examples/CairoDemo.st
+%%DATADIR%%/examples/Case.st
+%%DATADIR%%/examples/DeltaBlue.st
+%%DATADIR%%/examples/Dinner.st
+%%DATADIR%%/examples/EditStream.st
+%%DATADIR%%/examples/Gen2.st
+%%DATADIR%%/examples/Gen3.st
+%%DATADIR%%/examples/GenClasses.st
+%%DATADIR%%/examples/JSON.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/Queens.st
+%%DATADIR%%/examples/README
+%%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/TokenStream.st
+%%DATADIR%%/examples/Tokenizer.st
+%%DATADIR%%/examples/pepe.sed
+%%DATADIR%%/examples/shell
+%%DATADIR%%/examples/xml.sed
+%%DATADIR%%/gtk/.keep_me
+%%DATADIR%%/kernel/AbstNamespc.st
+%%DATADIR%%/kernel/AnsiDates.st
+%%DATADIR%%/kernel/AnsiExcept.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/Delay.st
-%%DATADIR%%/kernel/Metaclass.st
-%%DATADIR%%/kernel/SmallInt.st
+%%DATADIR%%/kernel/BindingDict.st
 %%DATADIR%%/kernel/BlkClosure.st
+%%DATADIR%%/kernel/BlkContext.st
+%%DATADIR%%/kernel/Boolean.st
+%%DATADIR%%/kernel/Builtins.st
+%%DATADIR%%/kernel/ByteArray.st
+%%DATADIR%%/kernel/CCallable.st
+%%DATADIR%%/kernel/CCallback.st
+%%DATADIR%%/kernel/CFuncs.st
+%%DATADIR%%/kernel/CObject.st
+%%DATADIR%%/kernel/CStruct.st
+%%DATADIR%%/kernel/CType.st
+%%DATADIR%%/kernel/CallinProcess.st
+%%DATADIR%%/kernel/CharArray.st
+%%DATADIR%%/kernel/Character.st
+%%DATADIR%%/kernel/Class.st
+%%DATADIR%%/kernel/ClassDesc.st
+%%DATADIR%%/kernel/Collection.st
+%%DATADIR%%/kernel/CompildCode.st
+%%DATADIR%%/kernel/CompildMeth.st
+%%DATADIR%%/kernel/CompiledBlk.st
+%%DATADIR%%/kernel/ContextPart.st
 %%DATADIR%%/kernel/Continuation.st
-%%DATADIR%%/kernel/Generator.st
+%%DATADIR%%/kernel/DLD.st
+%%DATADIR%%/kernel/Date.st
+%%DATADIR%%/kernel/DeferBinding.st
+%%DATADIR%%/kernel/Delay.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/FileDescr.st
+%%DATADIR%%/kernel/FilePath.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/FloatD.st
+%%DATADIR%%/kernel/FloatE.st
+%%DATADIR%%/kernel/FloatQ.st
 %%DATADIR%%/kernel/Fraction.st
-%%DATADIR%%/kernel/Point.st
-%%DATADIR%%/kernel/True.st
-%%DATADIR%%/kernel/CStruct.st
+%%DATADIR%%/kernel/Generator.st
+%%DATADIR%%/kernel/Getopt.st
+%%DATADIR%%/kernel/HashedColl.st
+%%DATADIR%%/kernel/HomedAssoc.st
 %%DATADIR%%/kernel/IdentDict.st
-%%DATADIR%%/kernel/PosStream.st
-%%DATADIR%%/kernel/UndefObject.st
-%%DATADIR%%/kernel/CType.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/Iterable.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/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/FloatD.st
-%%DATADIR%%/kernel/FloatE.st
-%%DATADIR%%/kernel/FloatQ.st
-%%DATADIR%%/kernel/URL.st
-%%DATADIR%%/kernel/VarBinding.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/ProcEnv.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/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%%/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%%/kernel/String.st
+%%DATADIR%%/kernel/SymLink.st
+%%DATADIR%%/kernel/Symbol.st
+%%DATADIR%%/kernel/SysDict.st
+%%DATADIR%%/kernel/Time.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/VFSZip.st
+%%DATADIR%%/kernel/ValueAdapt.st
+%%DATADIR%%/kernel/VarBinding.st
+%%DATADIR%%/kernel/WeakObjects.st
+%%DATADIR%%/kernel/WriteStream.st
 %%DATADIR%%/packages.xml
-%%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
+%%DATADIR%%/scripts/Browser.st
+%%DATADIR%%/scripts/Convert.st
+%%DATADIR%%/scripts/GenDoc.st
+%%DATADIR%%/scripts/Load.st
+%%DATADIR%%/scripts/Package.st
+%%DATADIR%%/scripts/Remote.st
+%%DATADIR%%/scripts/Test.st
+%%DATADIR%%/unsupported/CPP-test.st
+%%DATADIR%%/unsupported/CParseType-test.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
 @dirrm %%DATADIR%%/unsupported
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/kernel