4 files changed, 91 insertions, 7 deletions

diff --git a/deskutils/etoile-ui/Makefile b/deskutils/etoile-ui/Makefile
index 97744926df52..8ff34afd2dda 100644
--- a/deskutils/etoile-ui/Makefile
+++ b/deskutils/etoile-ui/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ui
-PORTVERSION=	0.2
-PORTREVISION=	1
+PORTVERSION=	0.4.0
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://download.gna.org/etoile/
 PKGNAMEPREFIX=	etoile-
@@ -16,15 +15,21 @@ DISTNAME=	etoile-${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Etoile Project EtoileUI 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}
+USE_GNUSTEP_LOCAL_LIBS+=	EtoileFoundation:${FOUNDATION_PORT}
+USE_GNUSTEP_LOCAL_LIBS+=	CoreObject:${COREOBJECT_PORT}
 
+DEFAULT_LIBVERSION=	0.4
 WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Frameworks/EtoileUI
 
+FOUNDATION_PORT?=	devel/etoile-foundation
+COREOBJECT_PORT?=	devel/etoile-coreobject
+
 .include <bsd.port.mk>
diff --git a/deskutils/etoile-ui/distinfo b/deskutils/etoile-ui/distinfo
index 2ac1ee4891af..2c1e8a612c54 100644
--- a/deskutils/etoile-ui/distinfo
+++ b/deskutils/etoile-ui/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) = 7c33baf8ec3a708d0d419b1e137452de
+SHA256 (etoile-0.4.0.tar.bz2) = 05b5f01932aaad2ae6251ae01a1ad5376d29c984ee83d9fb62688c8d4a20237a
+SIZE (etoile-0.4.0.tar.bz2) = 8225128
diff --git a/deskutils/etoile-ui/pkg-descr b/deskutils/etoile-ui/pkg-descr
index 4c82da32eaad..1de8ad8147ad 100644
--- a/deskutils/etoile-ui/pkg-descr
+++ b/deskutils/etoile-ui/pkg-descr
@@ -1,3 +1,10 @@
-EtoileUI framework
+EtoileUI is a high-level OOUI toolkit that provides a uniform tree
+representation for graphical objects on top of the AppKit. All User Interface
+concerns such as layouts, event handlers, styles, model objects etc. intends
+to be implemented as pluggable aspects. It also shares the same interfaces as
+other CoreObject systems. The combination of these three key features makes
+possible to inspect and reshape both User Interface and model objects at
+runtime through direct manipulation. It comes with a library of layouts
+where each one encapsulate a custom and pluggable UI presentation.
 
 WWW: http://www.etoile-project.org/
diff --git a/deskutils/etoile-ui/pkg-plist b/deskutils/etoile-ui/pkg-plist
index 706df16f869b..443568d2e601 100644
--- a/deskutils/etoile-ui/pkg-plist
+++ b/deskutils/etoile-ui/pkg-plist
@@ -1,12 +1,78 @@
 Local/Library/Frameworks/EtoileUI.framework/EtoileUI
+Local/Library/Frameworks/EtoileUI.framework/EtoileUI.framework
 Local/Library/Frameworks/EtoileUI.framework/Headers
 Local/Library/Frameworks/EtoileUI.framework/Resources
 Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/EtoileUI
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/Controls+Etoile.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETApplication.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETBrowserLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETCompatibility.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETComputedLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETContainer+Controller.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETContainer.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETContainers.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETEvent.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETFlowLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETFreeLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETInspecting.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETInspector.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETLayer.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETLayoutItem+Events.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETLayoutItem+Factory.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETLayoutItem+Reflection.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETLayoutItem.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETLayoutItemBuilder.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETLayoutItemGroup+Mutation.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETLayoutItemGroup.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETLayoutLine.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETLineLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETObjectBrowserLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETObjectRegistry+EtoileUI.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETOutlineLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETPaneLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETPaneSwitcherLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETPersistencyController.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETPickboard.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETStackLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETStyle.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETStyleRenderer.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETTableLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETTextEditorLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETView.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETViewModelLayout.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/ETWindowItem.h
 Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/EtoileCompatibility.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/EtoileUI.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/FSBrowserCell.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/GNUstep.h
 Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSBezierPathCappedBoxes.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSImage+Etoile.h
 Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSImage+NiceScaling.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSObject+EtoileUI.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSView+Etoile.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSWindow+Etoile.h
 Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/UKNibOwner.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/UKPluginsRegistry+Icons.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/BrowserPrototype.gorm/data.classes
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/BrowserPrototype.gorm/data.info
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/BrowserPrototype.gorm/objects.gorm
 Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/Inspector.gorm/data.classes
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/Inspector.gorm/data.info
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/Inspector.gorm/objects.gorm
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/OutlinePrototype.gorm/data.classes
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/OutlinePrototype.gorm/data.info
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/OutlinePrototype.gorm/objects.gorm
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/RevertToPanel.gorm/data.classes
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/RevertToPanel.gorm/data.info
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/RevertToPanel.gorm/objects.gorm
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/TablePrototype.gorm/data.classes
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/TablePrototype.gorm/data.info
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/TablePrototype.gorm/objects.gorm
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/ViewModelPrototype.gorm/data.classes
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/ViewModelPrototype.gorm/data.info
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/ViewModelPrototype.gorm/objects.gorm
 Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/libEtoileUI.so
 Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/libEtoileUI.so.%%LIBVERSION%%
 Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/libEtoileUI.so.%%MAJORLIBVERSION%%
@@ -16,6 +82,12 @@ Local/Library/Headers/EtoileUI
 Local/Library/Libraries/libEtoileUI.so
 Local/Library/Libraries/libEtoileUI.so.%%MAJORLIBVERSION%%
 Local/Library/Libraries/libEtoileUI.so.%%LIBVERSION%%
+@dirrm Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/ViewModelPrototype.gorm
+@dirrm Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/TablePrototype.gorm
+@dirrm Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/RevertToPanel.gorm
+@dirrm Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/OutlinePrototype.gorm
+@dirrm Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/Inspector.gorm
+@dirrm Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/BrowserPrototype.gorm
 @dirrm Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources
 @dirrm Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers
 @dirrm Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%