14 files changed, 117 insertions, 62 deletions

diff --git a/lang/etoile-compiler/Makefile b/lang/etoile-compiler/Makefile
index ee8adad7e620..aed586215ea9 100644
--- a/lang/etoile-compiler/Makefile
+++ b/lang/etoile-compiler/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	compiler
-PORTVERSION=	0.4.0
+PORTVERSION=	0.4.1
 CATEGORIES=	lang gnustep
 MASTER_SITES=	http://download.gna.org/etoile/
 PKGNAMEPREFIX=	etoile-
@@ -24,7 +24,7 @@ USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 USE_GNUSTEP_LOCAL_LIBS+=	EtoileFoundation:${FOUNDATION_PORT}
 USE_GNUSTEP_LOCAL_LIBS+=	LanguageKit:${LANGUAGEKIT_PORT}
-USE_GNUSTEP_LOCAL_LIBS+=	SmalltalkKit:${SMALLTALKKIT_PORT}
+USE_GNUSTEP_LOCAL_LIBS+=	SmalltalkSupport:${SMALLTALKKIT_PORT}
 
 DEFAULT_LIBVERSION=	0.1
 WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
diff --git a/lang/etoile-compiler/distinfo b/lang/etoile-compiler/distinfo
index 2c1e8a612c54..48cc0a6ff5f0 100644
--- a/lang/etoile-compiler/distinfo
+++ b/lang/etoile-compiler/distinfo
@@ -1,3 +1,3 @@
-MD5 (etoile-0.4.0.tar.bz2) = 7c33baf8ec3a708d0d419b1e137452de
-SHA256 (etoile-0.4.0.tar.bz2) = 05b5f01932aaad2ae6251ae01a1ad5376d29c984ee83d9fb62688c8d4a20237a
-SIZE (etoile-0.4.0.tar.bz2) = 8225128
+MD5 (etoile-0.4.1.tar.bz2) = 14d587f439ae6d2ba127ceb4e07a44d7
+SHA256 (etoile-0.4.1.tar.bz2) = 2c9f189a0eae9dbc85589660a55faac498d05a056bf8148fa91f25455728cf25
+SIZE (etoile-0.4.1.tar.bz2) = 8281449
diff --git a/lang/etoile-compiler/pkg-descr b/lang/etoile-compiler/pkg-descr
index 58553edd7e22..fc32f59fea0d 100644
--- a/lang/etoile-compiler/pkg-descr
+++ b/lang/etoile-compiler/pkg-descr
@@ -3,4 +3,6 @@ Pragmatic Smalltalk Compiler
 This is an implementation of Smalltalk designed to run
 on top of an Objective-C runtime.
 
+LICENSE: BSD
+
 WWW: http://www.etoile-project.org/
diff --git a/lang/etoile-languagekit/Makefile b/lang/etoile-languagekit/Makefile
index d701eaa6e7e6..2f9b8599a3e3 100644
--- a/lang/etoile-languagekit/Makefile
+++ b/lang/etoile-languagekit/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	languagekit
-PORTVERSION=	0.4.0
-PORTREVISION=	2
+PORTVERSION=	0.4.1
 CATEGORIES=	lang gnustep
 MASTER_SITES=	http://download.gna.org/etoile/
 PKGNAMEPREFIX=	etoile-
@@ -33,6 +32,9 @@ USE_PERL5_BUILD=	yes
 DEFAULT_LIBVERSION=	0.6
 WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Languages/LanguageKit
+DEFAULT_LIBVERSION2=	0.0.1
+PLIST_SUB+=	LIBVERSION2=${DEFAULT_LIBVERSION2}
+PLIST_SUB+=	MAJORLIBVERSION2=${DEFAULT_LIBVERSION2:C/([0-9]).*/\1/1}
 
 FOUNDATION_PORT?=	devel/etoile-foundation
 
diff --git a/lang/etoile-languagekit/distinfo b/lang/etoile-languagekit/distinfo
index 2c1e8a612c54..48cc0a6ff5f0 100644
--- a/lang/etoile-languagekit/distinfo
+++ b/lang/etoile-languagekit/distinfo
@@ -1,3 +1,3 @@
-MD5 (etoile-0.4.0.tar.bz2) = 7c33baf8ec3a708d0d419b1e137452de
-SHA256 (etoile-0.4.0.tar.bz2) = 05b5f01932aaad2ae6251ae01a1ad5376d29c984ee83d9fb62688c8d4a20237a
-SIZE (etoile-0.4.0.tar.bz2) = 8225128
+MD5 (etoile-0.4.1.tar.bz2) = 14d587f439ae6d2ba127ceb4e07a44d7
+SHA256 (etoile-0.4.1.tar.bz2) = 2c9f189a0eae9dbc85589660a55faac498d05a056bf8148fa91f25455728cf25
+SIZE (etoile-0.4.1.tar.bz2) = 8281449
diff --git a/lang/etoile-languagekit/pkg-descr b/lang/etoile-languagekit/pkg-descr
index 64484cde9ca6..fcebfca9f416 100644
--- a/lang/etoile-languagekit/pkg-descr
+++ b/lang/etoile-languagekit/pkg-descr
@@ -5,4 +5,6 @@ a Smalltalk JIT compiler which generates code binary-compatible with
 Objective-C, allowing classes to be written in a mixture of Smalltalk
 and Objective-C.
 
+LICENSE: BSD
+
 WWW: http://www.etoile-project.org/
diff --git a/lang/etoile-languagekit/pkg-plist b/lang/etoile-languagekit/pkg-plist
index 471463c122da..ef3f4e0804f0 100644
--- a/lang/etoile-languagekit/pkg-plist
+++ b/lang/etoile-languagekit/pkg-plist
@@ -2,40 +2,85 @@ Local/Library/Frameworks/LanguageKit.framework/Headers
 Local/Library/Frameworks/LanguageKit.framework/LanguageKit
 Local/Library/Frameworks/LanguageKit.framework/LanguageKit.framework
 Local/Library/Frameworks/LanguageKit.framework/Resources
-Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/AST.h
-Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/ArrayExpr.h
-Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/AssignExpr.h
-Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BlockExpr.h
-Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/Category.h
-Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/CodeGen.h
-Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/CodeGenBlock.h
-Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/CodeGenModule.h
-Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/Comment.h
-Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/Comparison.h
-Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/DeclRef.h
+Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/LKAST.h
+Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/LKASTVisitor.h
+Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/LKArrayExpr.h
+Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/LKAssignExpr.h
+Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/LKBlockExpr.h
+Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/LKCategory.h
+Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/LKCodeGen.h
+Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/LKComment.h
+Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/LKComparison.h
 Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/LKCompiler.h
+Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/LKDeclRef.h
+Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/LKIfStatement.h
+Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/LKLiteral.h
+Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/LKMessageSend.h
+Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/LKMethod.h
+Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/LKModule.h
+Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/LKReturn.h
+Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/LKSubclass.h
+Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/LKSymbolRef.h
+Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/LKSymbolTable.h
+Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/LKToken.h
+Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/LKVariableDecl.h
 Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/LanguageKit.h
-Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/Literal.h
-Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/MessageSend.h
-Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/Method.h
-Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/Module.h
-Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/Return.h
-Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/Subclass.h
-Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/SymbolRef.h
-Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/SymbolTable.h
 Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/LanguageKit
 Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
-Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/MsgSendSmallInt.bc
 Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/ObjCConstants.plist
 Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/libLanguageKit.so
 Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/libLanguageKit.so.%%MAJORLIBVERSION%%
 Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/libLanguageKit.so.%%LIBVERSION%%
 Local/Library/Frameworks/LanguageKit.framework/Versions/Current
 Local/Library/Frameworks/LanguageKit.framework/libLanguageKit.so
+Local/Library/Frameworks/LanguageKitCodeGen.framework/Headers
+Local/Library/Frameworks/LanguageKitCodeGen.framework/LanguageKitCodeGen
+Local/Library/Frameworks/LanguageKitCodeGen.framework/Resources
+Local/Library/Frameworks/LanguageKitCodeGen.framework/Versions/%%MAJORLIBVERSION%%/Headers/CodeGenBlock.h
+Local/Library/Frameworks/LanguageKitCodeGen.framework/Versions/%%MAJORLIBVERSION%%/Headers/CodeGenModule.h
+Local/Library/Frameworks/LanguageKitCodeGen.framework/Versions/%%MAJORLIBVERSION%%/LanguageKitCodeGen
+Local/Library/Frameworks/LanguageKitCodeGen.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/LanguageKitCodeGen.framework/Versions/%%MAJORLIBVERSION%%/Resources/MsgSendSmallInt.bc
+Local/Library/Frameworks/LanguageKitCodeGen.framework/Versions/%%MAJORLIBVERSION%%/libLanguageKitCodeGen.so
+Local/Library/Frameworks/LanguageKitCodeGen.framework/Versions/%%MAJORLIBVERSION%%/libLanguageKitCodeGen.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/LanguageKitCodeGen.framework/Versions/%%MAJORLIBVERSION%%/libLanguageKitCodeGen.so.%%LIBVERSION%%
+Local/Library/Frameworks/LanguageKitCodeGen.framework/Versions/Current
+Local/Library/Frameworks/LanguageKitCodeGen.framework/libLanguageKitCodeGen.so
+Local/Library/Frameworks/LanguageKitRuntime.framework/Headers
+Local/Library/Frameworks/LanguageKitRuntime.framework/LanguageKitRuntime
+Local/Library/Frameworks/LanguageKitRuntime.framework/LanguageKitRuntime.framework
+Local/Library/Frameworks/LanguageKitRuntime.framework/Resources
+Local/Library/Frameworks/LanguageKitRuntime.framework/Versions/%%MAJORLIBVERSION2%%/Headers/BigInt.h
+Local/Library/Frameworks/LanguageKitRuntime.framework/Versions/%%MAJORLIBVERSION2%%/Headers/BlockClosure.h
+Local/Library/Frameworks/LanguageKitRuntime.framework/Versions/%%MAJORLIBVERSION2%%/LanguageKitRuntime
+Local/Library/Frameworks/LanguageKitRuntime.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/LanguageKitRuntime.framework/Versions/%%MAJORLIBVERSION2%%/libLanguageKitRuntime.so
+Local/Library/Frameworks/LanguageKitRuntime.framework/Versions/%%MAJORLIBVERSION2%%/libLanguageKitRuntime.so.%%MAJORLIBVERSION2%%
+Local/Library/Frameworks/LanguageKitRuntime.framework/Versions/%%MAJORVERSION%%/libLanguageKitRuntime.so.%%LIBVERSION2%%
+Local/Library/Frameworks/LanguageKitRuntime.framework/Versions/Current
+Local/Library/Frameworks/LanguageKitRuntime.framework/libLanguageKitRuntime.so
 Local/Library/Headers/LanguageKit
+Local/Library/Headers/LanguageKitCodeGen
+Local/Library/Headers/LanguageKitRuntime
 Local/Library/Libraries/libLanguageKit.so
 Local/Library/Libraries/libLanguageKit.so.%%MAJORLIBVERSION%%
 Local/Library/Libraries/libLanguageKit.so.%%LIBVERSION%%
+Local/Library/Libraries/libLanguageKitCodeGen.so
+Local/Library/Libraries/libLanguageKitCodeGen.so.%%MAJORLIBVERSION%%
+Local/Library/Libraries/libLanguageKitCodeGen.so.%%LIBVERSION%%
+Local/Library/Libraries/libLanguageKitRuntime.so
+Local/Library/Libraries/libLanguageKitRuntime.so.%%MAJORLIBVERSION2%%
+Local/Library/Libraries/libLanguageKitRuntime.so.%%LIBVERSION2%%
+@dirrm Local/Library/Frameworks/LanguageKitRuntime.framework/Versions/%%MAJORLIBVERSION2%%/Resources
+@dirrm Local/Library/Frameworks/LanguageKitRuntime.framework/Versions/%%MAJORLIBVERSION2%%/Headers
+@dirrm Local/Library/Frameworks/LanguageKitRuntime.framework/Versions/%%MAJORLIBVERSION2%%
+@dirrm Local/Library/Frameworks/LanguageKitRuntime.framework/Versions
+@dirrm Local/Library/Frameworks/LanguageKitRuntime.framework
+@dirrm Local/Library/Frameworks/LanguageKitCodeGen.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm Local/Library/Frameworks/LanguageKitCodeGen.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm Local/Library/Frameworks/LanguageKitCodeGen.framework/Versions/%%MAJORLIBVERSION%%
+@dirrm Local/Library/Frameworks/LanguageKitCodeGen.framework/Versions
+@dirrm Local/Library/Frameworks/LanguageKitCodeGen.framework
 @dirrm Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
 @dirrm Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
 @dirrm Local/Library/Frameworks/LanguageKit.framework/Versions/%%MAJORLIBVERSION%%
diff --git a/lang/etoile-scriptkit/Makefile b/lang/etoile-scriptkit/Makefile
index 1f38329f0bb2..734063252f09 100644
--- a/lang/etoile-scriptkit/Makefile
+++ b/lang/etoile-scriptkit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scriptkit
-PORTVERSION=	0.4.0
+PORTVERSION=	0.4.1
 CATEGORIES=	lang gnustep
 MASTER_SITES=	http://download.gna.org/etoile/
 PKGNAMEPREFIX=	etoile-
diff --git a/lang/etoile-scriptkit/distinfo b/lang/etoile-scriptkit/distinfo
index 2c1e8a612c54..48cc0a6ff5f0 100644
--- a/lang/etoile-scriptkit/distinfo
+++ b/lang/etoile-scriptkit/distinfo
@@ -1,3 +1,3 @@
-MD5 (etoile-0.4.0.tar.bz2) = 7c33baf8ec3a708d0d419b1e137452de
-SHA256 (etoile-0.4.0.tar.bz2) = 05b5f01932aaad2ae6251ae01a1ad5376d29c984ee83d9fb62688c8d4a20237a
-SIZE (etoile-0.4.0.tar.bz2) = 8225128
+MD5 (etoile-0.4.1.tar.bz2) = 14d587f439ae6d2ba127ceb4e07a44d7
+SHA256 (etoile-0.4.1.tar.bz2) = 2c9f189a0eae9dbc85589660a55faac498d05a056bf8148fa91f25455728cf25
+SIZE (etoile-0.4.1.tar.bz2) = 8281449
diff --git a/lang/etoile-scriptkit/pkg-descr b/lang/etoile-scriptkit/pkg-descr
index ccdd5842d52d..e6cee24e2132 100644
--- a/lang/etoile-scriptkit/pkg-descr
+++ b/lang/etoile-scriptkit/pkg-descr
@@ -8,4 +8,6 @@ arbitrary commands in response to corner activations or mouse gestures, and by
 ScriptServices which allows arbitrary shell or Smalltalk scripts to be invoked
 on the current selection from any GNUstep or Etoile application.
 
+LICENSE: BSD
+
 WWW: http://www.etoile-project.org/
diff --git a/lang/etoile-smalltalkkit/Makefile b/lang/etoile-smalltalkkit/Makefile
index 46ed3b5dbd49..7e14381fbec6 100644
--- a/lang/etoile-smalltalkkit/Makefile
+++ b/lang/etoile-smalltalkkit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	smalltalkkit
-PORTVERSION=	0.4.0
+PORTVERSION=	0.4.1
 CATEGORIES=	lang gnustep
 MASTER_SITES=	http://download.gna.org/etoile/
 PKGNAMEPREFIX=	etoile-
@@ -29,7 +29,7 @@ USE_GNUSTEP_LOCAL_LIBS+=	LanguageKit:${LANGUAGEKIT_PORT}
 
 DEFAULT_LIBVERSION=	0.6
 WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
-USE_GNUSTEP_MAKE_DIRS+=	Languages/SmalltalkKit
+USE_GNUSTEP_MAKE_DIRS+=	Languages/Smalltalk
 DEFAULT_LIBVERSION2=	0.0.1
 PLIST_SUB+=	LIBVERSION2=${DEFAULT_LIBVERSION2}
 PLIST_SUB+=	MAJORLIBVERSION2=${DEFAULT_LIBVERSION2:C/([0-9]).*/\1/1}
diff --git a/lang/etoile-smalltalkkit/distinfo b/lang/etoile-smalltalkkit/distinfo
index 2c1e8a612c54..48cc0a6ff5f0 100644
--- a/lang/etoile-smalltalkkit/distinfo
+++ b/lang/etoile-smalltalkkit/distinfo
@@ -1,3 +1,3 @@
-MD5 (etoile-0.4.0.tar.bz2) = 7c33baf8ec3a708d0d419b1e137452de
-SHA256 (etoile-0.4.0.tar.bz2) = 05b5f01932aaad2ae6251ae01a1ad5376d29c984ee83d9fb62688c8d4a20237a
-SIZE (etoile-0.4.0.tar.bz2) = 8225128
+MD5 (etoile-0.4.1.tar.bz2) = 14d587f439ae6d2ba127ceb4e07a44d7
+SHA256 (etoile-0.4.1.tar.bz2) = 2c9f189a0eae9dbc85589660a55faac498d05a056bf8148fa91f25455728cf25
+SIZE (etoile-0.4.1.tar.bz2) = 8281449
diff --git a/lang/etoile-smalltalkkit/pkg-descr b/lang/etoile-smalltalkkit/pkg-descr
index 454727192ea7..194086085c62 100644
--- a/lang/etoile-smalltalkkit/pkg-descr
+++ b/lang/etoile-smalltalkkit/pkg-descr
@@ -2,4 +2,6 @@ Etoile's Pragmatic Smalltalk, a Smalltalk JIT compiler which generates code
 binary-compatible with Objective-C, allowing classes to be written in a
 mixture of Smalltalk and Objective-C.
 
+LICENSE: BSD
+
 WWW: http://www.etoile-project.org/
diff --git a/lang/etoile-smalltalkkit/pkg-plist b/lang/etoile-smalltalkkit/pkg-plist
index a0d4b0911193..1db2d2fd9f88 100644
--- a/lang/etoile-smalltalkkit/pkg-plist
+++ b/lang/etoile-smalltalkkit/pkg-plist
@@ -1,26 +1,26 @@
-Local/Library/Frameworks/SmalltalkKit.framework/Headers
-Local/Library/Frameworks/SmalltalkKit.framework/Resources
-Local/Library/Frameworks/SmalltalkKit.framework/SmalltalkKit
-Local/Library/Frameworks/SmalltalkKit.framework/SmalltalkKit.framework
-Local/Library/Frameworks/SmalltalkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/SmalltalkCompiler.h
-Local/Library/Frameworks/SmalltalkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/SmalltalkKit.h
-Local/Library/Frameworks/SmalltalkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/SmalltalkParser.h
-Local/Library/Frameworks/SmalltalkKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
-Local/Library/Frameworks/SmalltalkKit.framework/Versions/%%MAJORLIBVERSION%%/SmalltalkKit
-Local/Library/Frameworks/SmalltalkKit.framework/Versions/%%MAJORLIBVERSION%%/libSmalltalkKit.so
-Local/Library/Frameworks/SmalltalkKit.framework/Versions/%%MAJORLIBVERSION%%/libSmalltalkKit.so.%%MAJORLIBVERSION%%
-Local/Library/Frameworks/SmalltalkKit.framework/Versions/%%MAJORLIBVERSION%%/libSmalltalkKit.so.%%LIBVERSION%%
-Local/Library/Frameworks/SmalltalkKit.framework/Versions/Current
-Local/Library/Frameworks/SmalltalkKit.framework/libSmalltalkKit.so
-Local/Library/Headers/SmalltalkKit
-Local/Library/Libraries/libSmalltalkKit.so
-Local/Library/Libraries/libSmalltalkKit.so.%%MAJORLIBVERSION%%
-Local/Library/Libraries/libSmalltalkKit.so.%%LIBVERSION%%
+Local/Library/Bundles/LanguageKit/Smalltalk.language/Resources/Info-gnustep.plist
+Local/Library/Bundles/LanguageKit/Smalltalk.language/Smalltalk
+Local/Library/Bundles/LanguageKit/Smalltalk.language/stamp.make
+Local/Library/Frameworks/SmalltalkSupport.framework/Headers
+Local/Library/Frameworks/SmalltalkSupport.framework/Resources
+Local/Library/Frameworks/SmalltalkSupport.framework/SmalltalkSupport
+Local/Library/Frameworks/SmalltalkSupport.framework/SmalltalkSupport.framework
+Local/Library/Frameworks/SmalltalkSupport.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/SmalltalkSupport.framework/Versions/%%MAJORLIBVERSION%%/SmalltalkSupport
+Local/Library/Frameworks/SmalltalkSupport.framework/Versions/%%MAJORLIBVERSION%%/libSmalltalkSupport.so
+Local/Library/Frameworks/SmalltalkSupport.framework/Versions/%%MAJORLIBVERSION%%/libSmalltalkSupport.so.%%MAJORLIBVERSION2%%
+Local/Library/Frameworks/SmalltalkSupport.framework/Versions/%%MAJORLIBVERSION%%/libSmalltalkSupport.so.%%LIBVERSION2%%
+Local/Library/Frameworks/SmalltalkSupport.framework/Versions/Current
+Local/Library/Frameworks/SmalltalkSupport.framework/libSmalltalkSupport.so
+Local/Library/Headers/SmalltalkSupport
 Local/Library/Libraries/libSmalltalkSupport.so
 Local/Library/Libraries/libSmalltalkSupport.so.%%MAJORLIBVERSION2%%
 Local/Library/Libraries/libSmalltalkSupport.so.%%LIBVERSION2%%
-@dirrm Local/Library/Frameworks/SmalltalkKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
-@dirrm Local/Library/Frameworks/SmalltalkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
-@dirrm Local/Library/Frameworks/SmalltalkKit.framework/Versions/%%MAJORLIBVERSION%%
-@dirrm Local/Library/Frameworks/SmalltalkKit.framework/Versions
-@dirrm Local/Library/Frameworks/SmalltalkKit.framework
+@dirrm Local/Library/Frameworks/SmalltalkSupport.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm Local/Library/Frameworks/SmalltalkSupport.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm Local/Library/Frameworks/SmalltalkSupport.framework/Versions/%%MAJORLIBVERSION%%
+@dirrm Local/Library/Frameworks/SmalltalkSupport.framework/Versions
+@dirrm Local/Library/Frameworks/SmalltalkSupport.framework
+@dirrm Local/Library/Bundles/LanguageKit/Smalltalk.language/Resources
+@dirrm Local/Library/Bundles/LanguageKit/Smalltalk.language
+@dirrm Local/Library/Bundles/LanguageKit