4 files changed, 105 insertions, 8 deletions

diff --git a/devel/etoile-foundation/Makefile b/devel/etoile-foundation/Makefile
index 5fca0e7d27c9..3be7ebaadc32 100644
--- a/devel/etoile-foundation/Makefile
+++ b/devel/etoile-foundation/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	foundation
-PORTVERSION=	0.2
-PORTREVISION=	1
+PORTVERSION=	0.4.0
 CATEGORIES=	devel gnustep
 MASTER_SITES=	http://download.gna.org/etoile/
 PKGNAMEPREFIX=	etoile-
@@ -16,15 +15,19 @@ DISTNAME=	etoile-${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Etoile Project EtoileFoundation framework
 
+USE_BZIP2=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-DEFAULT_LIBVERSION=	0.1
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
+DEFAULT_LIBVERSION=	0.4
 WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Frameworks/EtoileFoundation
+DEFAULT_LIBVERSION2=	0.1
+PLIST_SUB+=	LIBVERSION2=${DEFAULT_LIBVERSION2}
+PLIST_SUB+=	MAJORLIBVERSION2=${DEFAULT_LIBVERSION2:C/([0-9]).*/\1/1}
 
 .include <bsd.port.mk>
diff --git a/devel/etoile-foundation/distinfo b/devel/etoile-foundation/distinfo
index 2ac1ee4891af..264ec7a32e64 100644
--- a/devel/etoile-foundation/distinfo
+++ b/devel/etoile-foundation/distinfo
@@ -1,3 +1,3 @@
-MD5 (etoile-0.2.tar.gz) = cc1b54ba2e4ba371c5eda45c756bece9
-SHA256 (etoile-0.2.tar.gz) = 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-SIZE (etoile-0.2.tar.gz) = 21373391
+MD5 (etoile-0.4.0.tar.bz2) = b01d64d41d8902abf751ea4f002b7647
+SHA256 (etoile-0.4.0.tar.bz2) = 81b0f00a2fba772958bfdd7a206a7a68ae1ce778ff4c189d2f97f9399533fa56
+SIZE (etoile-0.4.0.tar.bz2) = 8201585
diff --git a/devel/etoile-foundation/pkg-descr b/devel/etoile-foundation/pkg-descr
index 68405705b012..ae75e0fefbd7 100644
--- a/devel/etoile-foundation/pkg-descr
+++ b/devel/etoile-foundation/pkg-descr
@@ -1,3 +1,19 @@
-EtoileFoundation framework
+EtoileFoundation is the core framework for all Etoile projects, providing
+numerous convenience methods on top of the OpenStep foundation and
+significantly better support for reflection. Here is a summary of some the interesting features:
+- mixins and traits
+- restartable exceptions
+- collection class protocol and additions
+- UUID
+- convenient macros such as FOREACH
+- dynamic C array
+
+Two sub-frameworks are bundled with it:
+- *EtoileThread* which allows objects to transparently be run
+  in a separate thread.
+- *EtoileXML* which is a light-weight and tolerant XML parsing framework
+  whose main ability is to handle truncated and not well-formed XML documents.
+  For example, with XML streams used by the XMPP protocol, the XML is received
+  in fragments.
 
 WWW: http://www.etoile-project.org/
diff --git a/devel/etoile-foundation/pkg-plist b/devel/etoile-foundation/pkg-plist
index a4ae84fdc34f..64811276b652 100644
--- a/devel/etoile-foundation/pkg-plist
+++ b/devel/etoile-foundation/pkg-plist
@@ -1,12 +1,37 @@
+Local/Library/Documentation/EtoileThread
+Local/Library/Documentation/EtoileXML
 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/UKKQueue.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
@@ -17,10 +42,63 @@ Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%
 Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/libEtoileFoundation.so.%%MAJORLIBVERSION%%
 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/Current
+Local/Library/Frameworks/EtoileThread.framework/libEtoileThread.so
+Local/Library/Frameworks/EtoileXML.framework/EtoileXML
+Local/Library/Frameworks/EtoileXML.framework/EtoileXML.framework
+Local/Library/Frameworks/EtoileXML.framework/Headers
+Local/Library/Frameworks/EtoileXML.framework/Resources
+Local/Library/Frameworks/EtoileXML.framework/Versions/%%MAJORLIBVERSION2%%/EtoileXML
+Local/Library/Frameworks/EtoileXML.framework/Versions/%%MAJORLIBVERSION2%%/Headers/ETXMLDeclaration.h
+Local/Library/Frameworks/EtoileXML.framework/Versions/%%MAJORLIBVERSION2%%/Headers/ETXMLNode.h
+Local/Library/Frameworks/EtoileXML.framework/Versions/%%MAJORLIBVERSION2%%/Headers/ETXMLNullHandler.h
+Local/Library/Frameworks/EtoileXML.framework/Versions/%%MAJORLIBVERSION2%%/Headers/ETXMLParser.h
+Local/Library/Frameworks/EtoileXML.framework/Versions/%%MAJORLIBVERSION2%%/Headers/ETXMLParserDelegate.h
+Local/Library/Frameworks/EtoileXML.framework/Versions/%%MAJORLIBVERSION2%%/Headers/ETXMLString.h
+Local/Library/Frameworks/EtoileXML.framework/Versions/%%MAJORLIBVERSION2%%/Headers/ETXMLXHTML-IMParser.h
+Local/Library/Frameworks/EtoileXML.framework/Versions/%%MAJORLIBVERSION2%%/Headers/NSAttributedString+HTML.h
+Local/Library/Frameworks/EtoileXML.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/EtoileXML.framework/Versions/%%MAJORLIBVERSION2%%/libEtoileXML.so
+Local/Library/Frameworks/EtoileXML.framework/Versions/%%MAJORLIBVERSION2%%/libEtoileXML.so.%%MAJORLIBVERSION2%%
+Local/Library/Frameworks/EtoileXML.framework/Versions/%%MAJORLIBVERSION2%%/libEtoileXML.so.%%LIBVERSION2%%
+Local/Library/Frameworks/EtoileXML.framework/Versions/Current
+Local/Library/Frameworks/EtoileXML.framework/libEtoileXML.so
 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/libEtoileThread.so
+Local/Library/Libraries/libEtoileThread.so.%%MAJORLIBVERSION2%%
+Local/Library/Libraries/libEtoileThread.so.%%LIBVERSION2%%
+Local/Library/Libraries/libEtoileXML.so
+Local/Library/Libraries/libEtoileXML.so.%%MAJORLIBVERSION2%%
+Local/Library/Libraries/libEtoileXML.so.%%LIBVERSION2%%
+@dirrm Local/Library/Frameworks/EtoileXML.framework/Versions/%%MAJORLIBVERSION2%%/Resources
+@dirrm Local/Library/Frameworks/EtoileXML.framework/Versions/%%MAJORLIBVERSION2%%/Headers
+@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
+@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%%