4 files changed, 30 insertions, 28 deletions

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