- udpate to 0.4.1

12 files changed, 83 insertions, 78 deletions

diff --git a/devel/etoile-coreobject/Makefile b/devel/etoile-coreobject/Makefile
index dcea4d4da442..01ecf7fed1a8 100644
--- a/devel/etoile-coreobject/Makefile
+++ b/devel/etoile-coreobject/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	coreobject
-PORTVERSION=	0.4.0
+PORTVERSION=	0.4.1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	http://download.gna.org/etoile/
 PKGNAMEPREFIX=	etoile-
@@ -26,12 +26,8 @@ USE_GNUSTEP_LOCAL_LIBS+=	EtoileFoundation:${FOUNDATION_PORT}
 USE_GNUSTEP_LOCAL_LIBS+=	EtoileSerialize:${SERIALIZE_PORT}
 USE_PGSQL=	yes
 
-DEFAULT_LIBVERSION=	0.4
 WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Frameworks/CoreObject
-DEFAULT_LIBVERSION2=	0.1
-PLIST_SUB+=	LIBVERSION2=${DEFAULT_LIBVERSION2}
-PLIST_SUB+=	MAJORLIBVERSION2=${DEFAULT_LIBVERSION2:C/([0-9]).*/\1/1}
 
 FOUNDATION_PORT?=	devel/etoile-foundation
 SERIALIZE_PORT?=	devel/etoile-serialize
diff --git a/devel/etoile-coreobject/distinfo b/devel/etoile-coreobject/distinfo
index 2c1e8a612c54..48cc0a6ff5f0 100644
--- a/devel/etoile-coreobject/distinfo
+++ b/devel/etoile-coreobject/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/devel/etoile-coreobject/pkg-descr b/devel/etoile-coreobject/pkg-descr
index 9a89faab549c..0d770434ce3f 100644
--- a/devel/etoile-coreobject/pkg-descr
+++ b/devel/etoile-coreobject/pkg-descr
@@ -8,4 +8,6 @@ CoreObject uses the EtoileSerialize framework which, in many cases, allows
 objects and messages to be automatically serialized with no extra code being
 written.
 
+LICENSE: MIT
+
 WWW: http://www.etoile-project.org/
diff --git a/devel/etoile-coreobject/pkg-plist b/devel/etoile-coreobject/pkg-plist
index 9458fb19e4c1..f2b8b356b2c0 100644
--- a/devel/etoile-coreobject/pkg-plist
+++ b/devel/etoile-coreobject/pkg-plist
@@ -27,13 +27,13 @@ Local/Library/Frameworks/CoreObject.framework/Versions/%%MAJORVERSION%%/Headers/
 Local/Library/Frameworks/CoreObject.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
 Local/Library/Frameworks/CoreObject.framework/Versions/%%MAJORVERSION%%/libCoreObject.so
 Local/Library/Frameworks/CoreObject.framework/Versions/%%MAJORVERSION%%/libCoreObject.so.%%MAJORVERSION%%
-Local/Library/Frameworks/CoreObject.framework/Versions/%%MAJORVERSION%%/libCoreObject.so.%%LIBVERSION%%
+Local/Library/Frameworks/CoreObject.framework/Versions/%%MAJORVERSION%%/libCoreObject.so.%%VERSION%%
 Local/Library/Frameworks/CoreObject.framework/Versions/Current
 Local/Library/Frameworks/CoreObject.framework/libCoreObject.so
 Local/Library/Headers/CoreObject
 Local/Library/Libraries/libCoreObject.so
 Local/Library/Libraries/libCoreObject.so.%%MAJORVERSION%%
-Local/Library/Libraries/libCoreObject.so.%%LIBVERSION%%
+Local/Library/Libraries/libCoreObject.so.%%VERSION%%
 @dirrm Local/Library/Frameworks/CoreObject.framework/Versions/%%MAJORVERSION%%/Resources
 @dirrm Local/Library/Frameworks/CoreObject.framework/Versions/%%MAJORVERSION%%/Headers
 @dirrm Local/Library/Frameworks/CoreObject.framework/Versions/%%MAJORVERSION%%
diff --git a/devel/etoile-foundation/Makefile b/devel/etoile-foundation/Makefile
index 3be7ebaadc32..eb53fcdb3271 100644
--- a/devel/etoile-foundation/Makefile
+++ b/devel/etoile-foundation/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	foundation
-PORTVERSION=	0.4.0
+PORTVERSION=	0.4.1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	http://download.gna.org/etoile/
 PKGNAMEPREFIX=	etoile-
@@ -23,7 +23,7 @@ USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
-DEFAULT_LIBVERSION=	0.4
+DEFAULT_LIBVERSION=	0.2
 WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Frameworks/EtoileFoundation
 DEFAULT_LIBVERSION2=	0.1
diff --git a/devel/etoile-foundation/distinfo b/devel/etoile-foundation/distinfo
index 2c1e8a612c54..48cc0a6ff5f0 100644
--- a/devel/etoile-foundation/distinfo
+++ b/devel/etoile-foundation/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/devel/etoile-foundation/pkg-descr b/devel/etoile-foundation/pkg-descr
index ae75e0fefbd7..29dab0274326 100644
--- a/devel/etoile-foundation/pkg-descr
+++ b/devel/etoile-foundation/pkg-descr
@@ -16,4 +16,6 @@ Two sub-frameworks are bundled with it:
   For example, with XML streams used by the XMPP protocol, the XML is received
   in fragments.
 
+LICENSE: BSD
+
 WWW: http://www.etoile-project.org/
diff --git a/devel/etoile-foundation/pkg-plist b/devel/etoile-foundation/pkg-plist
index 64811276b652..4d910bb1f1a6 100644
--- a/devel/etoile-foundation/pkg-plist
+++ b/devel/etoile-foundation/pkg-plist
@@ -4,58 +4,62 @@ Local/Library/Frameworks/EtoileFoundation.framework/EtoileFoundation
 Local/Library/Frameworks/EtoileFoundation.framework/EtoileFoundation.framework
 Local/Library/Frameworks/EtoileFoundation.framework/Headers
 Local/Library/Frameworks/EtoileFoundation.framework/Resources
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/EtoileFoundation
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETCArray.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETCollection.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/EtoileCompatibility.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETFilter.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETGetOptionsDictionary.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETObjectChain.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETObjectRegistry.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETPropertyValueCoding.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETPrototype.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETRendering.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETTransform.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETUUID.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/EtoileFoundation.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/Macros.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSArray+map.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSFileManager+NameForTempFile.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSFileManager+TempFile.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSIndexPath+Etoile.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSIndexSet+Etoile.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSInvocation+Etoile.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSObject+Etoile.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSObject+Mixins.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSObject+Model.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSString+Etoile.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSURL+Etoile.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/OSBundleExtensionLoader.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/UKFileWatcher.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/UKMainThreadProxy.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/UKPluginsRegistry.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/UKPushbackMessenger.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/UKThreadMessenger.h
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/libEtoileFoundation.so
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/libEtoileFoundation.so.%%LIBVERSION%%
-Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/libEtoileFoundation.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/EtoileFoundation
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/ETCArray.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/ETCollection.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/EtoileCompatibility.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/ETFilter.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/ETGetOptionsDictionary.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/ETHistoryManager.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/ETObjectChain.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/ETObjectRegistry.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/ETPropertyValueCoding.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/ETRendering.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/ETTransform.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/ETTranscript.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/ETUTI.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/ETUUID.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/EtoileFoundation.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/Macros.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/NSArray+map.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/NSFileManager+NameForTempFile.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/NSFileManager+TempFile.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/NSIndexPath+Etoile.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/NSIndexSet+Etoile.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/NSInvocation+Etoile.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/NSObject+Etoile.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/NSObject+Mixins.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/NSObject+Model.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/NSString+Etoile.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/NSURL+Etoile.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/OSBundleExtensionLoader.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/UKFileWatcher.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/UKMainThreadProxy.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/UKPluginsRegistry.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/UKPushbackMessenger.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/UKThreadMessenger.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers/NSObject+Prototypes.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Resources/UTIDefinitions.plist
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/libEtoileFoundation.so
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/libEtoileFoundation.so.%%MAJORVERSION%%
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/libEtoileFoundation.so.%%VERSION%%
 Local/Library/Frameworks/EtoileFoundation.framework/Versions/Current
 Local/Library/Frameworks/EtoileFoundation.framework/libEtoileFoundation.so
 Local/Library/Frameworks/EtoileThread.framework/EtoileThread
 Local/Library/Frameworks/EtoileThread.framework/EtoileThread.framework
 Local/Library/Frameworks/EtoileThread.framework/Headers
 Local/Library/Frameworks/EtoileThread.framework/Resources
-Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION2%%/EtoileThread
-Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION2%%/Headers/ETThread.h
-Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION2%%/Headers/ETThreadProxyReturn.h
-Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION2%%/Headers/ETThreadedObject.h
-Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION2%%/Headers/NSObject+Futures.h
-Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION2%%/Headers/NSObject+Threaded.h
-Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Info-gnustep.plist
-Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION2%%/libEtoileThread.so
-Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION2%%/libEtoileThread.so.%%MAJORLIBVERSION2%%
-Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION2%%/libEtoileThread.so.%%LIBVERSION2%%
+Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION%%/EtoileThread
+Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETThread.h
+Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETThreadProxyReturn.h
+Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETThreadedObject.h
+Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSObject+Futures.h
+Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSObject+Threaded.h
+Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION%%/libEtoileThread.so
+Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION%%/libEtoileThread.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION%%/libEtoileThread.so.%%LIBVERSION%%
 Local/Library/Frameworks/EtoileThread.framework/Versions/Current
 Local/Library/Frameworks/EtoileThread.framework/libEtoileThread.so
 Local/Library/Frameworks/EtoileXML.framework/EtoileXML
@@ -81,11 +85,11 @@ Local/Library/Headers/EtoileFoundation
 Local/Library/Headers/EtoileThread
 Local/Library/Headers/EtoileXML
 Local/Library/Libraries/libEtoileFoundation.so
-Local/Library/Libraries/libEtoileFoundation.so.%%MAJORLIBVERSION%%
-Local/Library/Libraries/libEtoileFoundation.so.%%LIBVERSION%%
+Local/Library/Libraries/libEtoileFoundation.so.%%MAJORVERSION%%
+Local/Library/Libraries/libEtoileFoundation.so.%%VERSION%%
 Local/Library/Libraries/libEtoileThread.so
-Local/Library/Libraries/libEtoileThread.so.%%MAJORLIBVERSION2%%
-Local/Library/Libraries/libEtoileThread.so.%%LIBVERSION2%%
+Local/Library/Libraries/libEtoileThread.so.%%MAJORLIBVERSION%%
+Local/Library/Libraries/libEtoileThread.so.%%LIBVERSION%%
 Local/Library/Libraries/libEtoileXML.so
 Local/Library/Libraries/libEtoileXML.so.%%MAJORLIBVERSION2%%
 Local/Library/Libraries/libEtoileXML.so.%%LIBVERSION2%%
@@ -94,13 +98,13 @@ Local/Library/Libraries/libEtoileXML.so.%%LIBVERSION2%%
 @dirrm Local/Library/Frameworks/EtoileXML.framework/Versions/%%MAJORLIBVERSION2%%
 @dirrm Local/Library/Frameworks/EtoileXML.framework/Versions
 @dirrm Local/Library/Frameworks/EtoileXML.framework
-@dirrm Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION2%%/Resources
-@dirrm Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION2%%/Headers
-@dirrm Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION2%%
+@dirrm Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm Local/Library/Frameworks/EtoileThread.framework/Versions/%%MAJORLIBVERSION%%
 @dirrm Local/Library/Frameworks/EtoileThread.framework/Versions
 @dirrm Local/Library/Frameworks/EtoileThread.framework
-@dirrm Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Resources
-@dirrm Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers
-@dirrm Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%
+@dirrm Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Resources
+@dirrm Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%/Headers
+@dirrm Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORVERSION%%
 @dirrm Local/Library/Frameworks/EtoileFoundation.framework/Versions
 @dirrm Local/Library/Frameworks/EtoileFoundation.framework
diff --git a/devel/etoile-serialize/Makefile b/devel/etoile-serialize/Makefile
index 32e5386a920f..1afba29da689 100644
--- a/devel/etoile-serialize/Makefile
+++ b/devel/etoile-serialize/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	serialize
-PORTVERSION=	0.4.0
+PORTVERSION=	0.4.1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	http://download.gna.org/etoile/
 PKGNAMEPREFIX=	etoile-
@@ -24,7 +24,6 @@ USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 USE_GNUSTEP_LOCAL_LIBS+=	EtoileFoundation:${FOUNDATION_PORT}
 
-DEFAULT_LIBVERSION=	0.4
 WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Frameworks/EtoileSerialize
 
diff --git a/devel/etoile-serialize/distinfo b/devel/etoile-serialize/distinfo
index 2c1e8a612c54..48cc0a6ff5f0 100644
--- a/devel/etoile-serialize/distinfo
+++ b/devel/etoile-serialize/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/devel/etoile-serialize/pkg-descr b/devel/etoile-serialize/pkg-descr
index 009ed633c928..cc1b56b3a0b5 100644
--- a/devel/etoile-serialize/pkg-descr
+++ b/devel/etoile-serialize/pkg-descr
@@ -5,4 +5,6 @@ So far, serialization and deserialization work for all simple types, object,
 selectors and classes. Arrays and structures are believed to work, however
 arrays containing structures and vice versa have not been tested.
 
+LICENSE: BSD
+
 WWW: http://www.etoile-project.org/
diff --git a/devel/etoile-serialize/pkg-plist b/devel/etoile-serialize/pkg-plist
index f8697b6088ef..3cdb080269dd 100644
--- a/devel/etoile-serialize/pkg-plist
+++ b/devel/etoile-serialize/pkg-plist
@@ -19,13 +19,13 @@ Local/Library/Frameworks/EtoileSerialize.framework/Versions/%%MAJORVERSION%%/Hea
 Local/Library/Frameworks/EtoileSerialize.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
 Local/Library/Frameworks/EtoileSerialize.framework/Versions/%%MAJORVERSION%%/libEtoileSerialize.so
 Local/Library/Frameworks/EtoileSerialize.framework/Versions/%%MAJORVERSION%%/libEtoileSerialize.so.%%MAJORVERSION%%
-Local/Library/Frameworks/EtoileSerialize.framework/Versions/%%MAJORVERSION%%/libEtoileSerialize.so.%%LIBVERSION%%
+Local/Library/Frameworks/EtoileSerialize.framework/Versions/%%MAJORVERSION%%/libEtoileSerialize.so.%%VERSION%%
 Local/Library/Frameworks/EtoileSerialize.framework/Versions/Current
 Local/Library/Frameworks/EtoileSerialize.framework/libEtoileSerialize.so
 Local/Library/Headers/EtoileSerialize
 Local/Library/Libraries/libEtoileSerialize.so
 Local/Library/Libraries/libEtoileSerialize.so.%%MAJORVERSION%%
-Local/Library/Libraries/libEtoileSerialize.so.%%LIBVERSION%%
+Local/Library/Libraries/libEtoileSerialize.so.%%VERSION%%
 @dirrm Local/Library/Frameworks/EtoileSerialize.framework/Versions/%%MAJORVERSION%%/Resources
 @dirrm Local/Library/Frameworks/EtoileSerialize.framework/Versions/%%MAJORVERSION%%/Headers
 @dirrm Local/Library/Frameworks/EtoileSerialize.framework/Versions/%%MAJORVERSION%%