15 files changed, 111 insertions, 90 deletions

diff --git a/deskutils/etoile-dictionaryreader/Makefile b/deskutils/etoile-dictionaryreader/Makefile
index 7af578f9e49f..5f4299741a1e 100644
--- a/deskutils/etoile-dictionaryreader/Makefile
+++ b/deskutils/etoile-dictionaryreader/Makefile
@@ -6,26 +6,22 @@
 #
 
 PORTNAME=	dictionaryreader
-PORTVERSION=	0.1.${SNAPSHOT}
-PORTREVISION=	1
+PORTVERSION=	0.2
 CATEGORIES=	deskutils gnustep
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dinoex
+MASTER_SITES=	http://download.gna.org/etoile/
 PKGNAMEPREFIX=	etoile-
-DISTNAME=	Etoile-${SNAPSHOT}
+DISTNAME=	etoile-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Dict client for GNUstep
 
-USE_BZIP2=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 
-SNAPSHOT=	20061221
-WRKSRC=	${WRKDIR}/Etoile/
+WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Services/User/DictionaryReader
 
 .include <bsd.port.mk>
diff --git a/deskutils/etoile-dictionaryreader/distinfo b/deskutils/etoile-dictionaryreader/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/deskutils/etoile-dictionaryreader/distinfo
+++ b/deskutils/etoile-dictionaryreader/distinfo
@@ -1,3 +1,3 @@
-MD5 (Etoile-20061221.tar.bz2) = 120ffa8cf06c58ff775f8a218ad91448
-SHA256 (Etoile-20061221.tar.bz2) = 7dc8acbf2cb46d9d119c9817204bbbbe72884065f3287877550c400e68f4c992
-SIZE (Etoile-20061221.tar.bz2) = 9867481
+MD5 (etoile-0.2.tar.gz) = cc1b54ba2e4ba371c5eda45c756bece9
+SHA256 (etoile-0.2.tar.gz) = 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
+SIZE (etoile-0.2.tar.gz) = 21373391
diff --git a/deskutils/etoile-dictionaryreader/pkg-plist b/deskutils/etoile-dictionaryreader/pkg-plist
index a1a5aebe72ec..e42efb9c0288 100644
--- a/deskutils/etoile-dictionaryreader/pkg-plist
+++ b/deskutils/etoile-dictionaryreader/pkg-plist
@@ -1,5 +1,6 @@
 Local/Applications/DictionaryReader.app/DictionaryReader
 Local/Applications/DictionaryReader.app/Resources/DictionaryReader.desktop
+Local/Applications/DictionaryReader.app/Resources/DictionaryReader.tif
 Local/Applications/DictionaryReader.app/Resources/English.lproj/DictionaryReader.gorm/Magnify.tiff
 Local/Applications/DictionaryReader.app/Resources/English.lproj/DictionaryReader.gorm/Magnify_32.tiff
 Local/Applications/DictionaryReader.app/Resources/English.lproj/DictionaryReader.gorm/data.classes
@@ -12,19 +13,15 @@ Local/Applications/DictionaryReader.app/Resources/English.lproj/DictionaryReader
 Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.gorm/data.classes
 Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.gorm/data.info
 Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.gorm/objects.gorm
-Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.nib/Preferences.nib/classes.nib
-Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.nib/Preferences.nib/info.nib
-Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.nib/Preferences.nib/keyedobjects.nib
 Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.nib/classes.nib
 Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.nib/info.nib
 Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.nib/keyedobjects.nib
 Local/Applications/DictionaryReader.app/Resources/Info-gnustep.plist
 Local/Applications/DictionaryReader.app/Resources/dict.png
-Local/Applications/DictionaryReader.app/Resources/jargon.dict
-Local/Applications/DictionaryReader.app/Resources/jargon.index
+Local/Applications/DictionaryReader.app/Resources/etoile_back.tiff
+Local/Applications/DictionaryReader.app/Resources/etoile_forward.tiff
 Local/Applications/DictionaryReader.app/stamp.make
 Local/Tools/DictionaryReader
-@dirrm Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.nib/Preferences.nib
 @dirrm Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.nib
 @dirrm Local/Applications/DictionaryReader.app/Resources/English.lproj/Preferences.gorm
 @dirrm Local/Applications/DictionaryReader.app/Resources/English.lproj/DictionaryReader.nib
diff --git a/deskutils/etoile-menuserver/Makefile b/deskutils/etoile-menuserver/Makefile
index 86d2520dd853..359260ee1192 100644
--- a/deskutils/etoile-menuserver/Makefile
+++ b/deskutils/etoile-menuserver/Makefile
@@ -6,18 +6,15 @@
 #
 
 PORTNAME=	menuserver
-PORTVERSION=	0.1.${SNAPSHOT}
-PORTREVISION=	1
+PORTVERSION=	0.2
 CATEGORIES=	deskutils gnustep
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dinoex
+MASTER_SITES=	http://download.gna.org/etoile/
 PKGNAMEPREFIX=	etoile-
-DISTNAME=	Etoile-${SNAPSHOT}
+DISTNAME=	etoile-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Etoile Project MenuServer application
 
-USE_BZIP2=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
@@ -26,8 +23,7 @@ USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_SYSTEM_LIBS+=	XWindowServerKit:${XWINDOWSERVERKIT_PORT}
 USE_GNUSTEP_SYSTEM_LIBS+=	WorkspaceCommKit:${ETOILE_SYSTEM_PORT}
 
-SNAPSHOT=	20061221
-WRKSRC=	${WRKDIR}/Etoile/
+WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Services/Private/MenuServer
 ADDITIONAL_OBJCFLAGS+=	-I${LOCALBASE}/include
 ADDITIONAL_LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/deskutils/etoile-menuserver/distinfo b/deskutils/etoile-menuserver/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/deskutils/etoile-menuserver/distinfo
+++ b/deskutils/etoile-menuserver/distinfo
@@ -1,3 +1,3 @@
-MD5 (Etoile-20061221.tar.bz2) = 120ffa8cf06c58ff775f8a218ad91448
-SHA256 (Etoile-20061221.tar.bz2) = 7dc8acbf2cb46d9d119c9817204bbbbe72884065f3287877550c400e68f4c992
-SIZE (Etoile-20061221.tar.bz2) = 9867481
+MD5 (etoile-0.2.tar.gz) = cc1b54ba2e4ba371c5eda45c756bece9
+SHA256 (etoile-0.2.tar.gz) = 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
+SIZE (etoile-0.2.tar.gz) = 21373391
diff --git a/deskutils/etoile-menuserver/pkg-plist b/deskutils/etoile-menuserver/pkg-plist
index 023e3c403ec6..9b934f5ccbd6 100644
--- a/deskutils/etoile-menuserver/pkg-plist
+++ b/deskutils/etoile-menuserver/pkg-plist
@@ -20,13 +20,7 @@ Local/Applications/EtoileMenuServer.app/Resources/Etoile.tiff
 Local/Applications/EtoileMenuServer.app/Resources/EtoileLogo.tiff
 Local/Applications/EtoileMenuServer.app/Resources/EtoileLogoH.tiff
 Local/Applications/EtoileMenuServer.app/Resources/EtoileMenuServer.desktop
-Local/Applications/EtoileMenuServer.app/Resources/HardwareEntry.sysbarentry/HardwareEntry
-Local/Applications/EtoileMenuServer.app/Resources/HardwareEntry.sysbarentry/Resources/Info-gnustep.plist
-Local/Applications/EtoileMenuServer.app/Resources/HardwareEntry.sysbarentry/stamp.make
 Local/Applications/EtoileMenuServer.app/Resources/Info-gnustep.plist
-Local/Applications/EtoileMenuServer.app/Resources/LookAndBehaviorEntry.sysbarentry/LookAndBehaviorEntry
-Local/Applications/EtoileMenuServer.app/Resources/LookAndBehaviorEntry.sysbarentry/Resources/Info-gnustep.plist
-Local/Applications/EtoileMenuServer.app/Resources/LookAndBehaviorEntry.sysbarentry/stamp.make
 Local/Applications/EtoileMenuServer.app/Resources/MenuBarFiller.tiff
 Local/Applications/EtoileMenuServer.app/Resources/MenuBarLeftEdge.tiff
 Local/Applications/EtoileMenuServer.app/Resources/MenuBarRightEdge.tiff
diff --git a/deskutils/etoile-panekit/Makefile b/deskutils/etoile-panekit/Makefile
index 7f7e004e5361..128878f96ddb 100644
--- a/deskutils/etoile-panekit/Makefile
+++ b/deskutils/etoile-panekit/Makefile
@@ -6,28 +6,23 @@
 #
 
 PORTNAME=	panekit
-PORTVERSION=	0.1.${SNAPSHOT}
-PORTREVISION=	1
+PORTVERSION=	0.2
 CATEGORIES=	deskutils gnustep
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dinoex
+MASTER_SITES=	http://download.gna.org/etoile/
 PKGNAMEPREFIX=	etoile-
-DISTNAME=	Etoile-${SNAPSHOT}
+DISTNAME=	etoile-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Framework which provides flexible pane window in GNUstep
 
-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}
 
-SNAPSHOT=	20061221
-WRKSRC=	${WRKDIR}/Etoile/
+WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Frameworks/PaneKit
 
 .include <bsd.port.mk>
diff --git a/deskutils/etoile-panekit/distinfo b/deskutils/etoile-panekit/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/deskutils/etoile-panekit/distinfo
+++ b/deskutils/etoile-panekit/distinfo
@@ -1,3 +1,3 @@
-MD5 (Etoile-20061221.tar.bz2) = 120ffa8cf06c58ff775f8a218ad91448
-SHA256 (Etoile-20061221.tar.bz2) = 7dc8acbf2cb46d9d119c9817204bbbbe72884065f3287877550c400e68f4c992
-SIZE (Etoile-20061221.tar.bz2) = 9867481
+MD5 (etoile-0.2.tar.gz) = cc1b54ba2e4ba371c5eda45c756bece9
+SHA256 (etoile-0.2.tar.gz) = 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
+SIZE (etoile-0.2.tar.gz) = 21373391
diff --git a/deskutils/etoile-panekit/pkg-plist b/deskutils/etoile-panekit/pkg-plist
index 4662361c2d8f..3c502ae04279 100644
--- a/deskutils/etoile-panekit/pkg-plist
+++ b/deskutils/etoile-panekit/pkg-plist
@@ -1,14 +1,35 @@
-Local/Library/Headers/PaneKit/CocoaCompatibility.h
-Local/Library/Headers/PaneKit/NSPreferencePane.h
-Local/Library/Headers/PaneKit/PKPane.h
-Local/Library/Headers/PaneKit/PKPaneRegistry.h
-Local/Library/Headers/PaneKit/PKPanesController.h
-Local/Library/Headers/PaneKit/PKPreferencePane.h
-Local/Library/Headers/PaneKit/PKPreferencePaneRegistry.h
-Local/Library/Headers/PaneKit/PKPreferencesController.h
-Local/Library/Headers/PaneKit/PKPresentationBuilder.h
-Local/Library/Headers/PaneKit/PaneKit.h
+Local/Library/Frameworks/PaneKit.framework/Headers
+Local/Library/Frameworks/PaneKit.framework/PaneKit
+Local/Library/Frameworks/PaneKit.framework/Resources
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/CocoaCompatibility.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSPreferencePane.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKMatrixViewPresentation.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKPane.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKPaneRegistry.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKPanesController.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKPlainPresentation.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKPopUpButtonPresentation.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKPreferencePane.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKPreferencePaneRegistry.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKPreferencesController.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKPresentationBuilder.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKTableViewPresentation.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PKToolbarPresentation.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/PaneKit.h
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/PaneKit
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/libPaneKit.so
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/libPaneKit.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/libPaneKit.so.%%LIBVERSION%%
+Local/Library/Frameworks/PaneKit.framework/Versions/Current
+Local/Library/Frameworks/PaneKit.framework/libPaneKit.so
+Local/Library/Headers/PaneKit
 Local/Library/Libraries/libPaneKit.so
 Local/Library/Libraries/libPaneKit.so.%%MAJORLIBVERSION%%
 Local/Library/Libraries/libPaneKit.so.%%LIBVERSION%%
-@dirrm Local/Library/Headers/PaneKit
+@dirrm Local/Library/Libraries
+@dirrm Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm Local/Library/Frameworks/PaneKit.framework/Versions/%%MAJORLIBVERSION%%
+@dirrm Local/Library/Frameworks/PaneKit.framework/Versions
+@dirrm Local/Library/Frameworks/PaneKit.framework
diff --git a/deskutils/etoile-systemconfig/Makefile b/deskutils/etoile-systemconfig/Makefile
index fc5ecefdc366..75a99eaaf7b8 100644
--- a/deskutils/etoile-systemconfig/Makefile
+++ b/deskutils/etoile-systemconfig/Makefile
@@ -6,28 +6,23 @@
 #
 
 PORTNAME=	systemconfig
-PORTVERSION=	0.1.${SNAPSHOT}
-PORTREVISION=	1
+PORTVERSION=	0.2
 CATEGORIES=	deskutils gnustep
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dinoex
+MASTER_SITES=	http://download.gna.org/etoile/
 PKGNAMEPREFIX=	etoile-
-DISTNAME=	Etoile-${SNAPSHOT}
+DISTNAME=	etoile-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Framework which provides a way to set system preferences
 
-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}
 
-SNAPSHOT=	20061221
-WRKSRC=	${WRKDIR}/Etoile/
+WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Frameworks/SystemConfig
 
 .include <bsd.port.mk>
diff --git a/deskutils/etoile-systemconfig/distinfo b/deskutils/etoile-systemconfig/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/deskutils/etoile-systemconfig/distinfo
+++ b/deskutils/etoile-systemconfig/distinfo
@@ -1,3 +1,3 @@
-MD5 (Etoile-20061221.tar.bz2) = 120ffa8cf06c58ff775f8a218ad91448
-SHA256 (Etoile-20061221.tar.bz2) = 7dc8acbf2cb46d9d119c9817204bbbbe72884065f3287877550c400e68f4c992
-SIZE (Etoile-20061221.tar.bz2) = 9867481
+MD5 (etoile-0.2.tar.gz) = cc1b54ba2e4ba371c5eda45c756bece9
+SHA256 (etoile-0.2.tar.gz) = 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
+SIZE (etoile-0.2.tar.gz) = 21373391
diff --git a/deskutils/etoile-systemconfig/pkg-plist b/deskutils/etoile-systemconfig/pkg-plist
index 1b170dcb82db..94a316e972ef 100644
--- a/deskutils/etoile-systemconfig/pkg-plist
+++ b/deskutils/etoile-systemconfig/pkg-plist
@@ -1,8 +1,24 @@
-Local/Library/Headers/libSystemConfig/SCKeyboard.h
-Local/Library/Headers/libSystemConfig/SCMonitor.h
-Local/Library/Headers/libSystemConfig/SCMouse.h
-Local/Library/Headers/libSystemConfig/SCSound.h
+Local/Library/Frameworks/SystemConfig.framework/Headers
+Local/Library/Frameworks/SystemConfig.framework/Resources
+Local/Library/Frameworks/SystemConfig.framework/SystemConfig
+Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%/Headers/SCConfig.h
+Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%/Headers/SCKeyboard.h
+Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%/Headers/SCMonitor.h
+Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%/Headers/SCMouse.h
+Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%/Headers/SCSound.h
+Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%/SystemConfig
+Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%/libSystemConfig.so
+Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%/libSystemConfig.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%/libSystemConfig.so.%%LIBVERSION%%
+Local/Library/Frameworks/SystemConfig.framework/Versions/Current
+Local/Library/Frameworks/SystemConfig.framework/libSystemConfig.so
+Local/Library/Headers/SystemConfig
 Local/Library/Libraries/libSystemConfig.so
 Local/Library/Libraries/libSystemConfig.so.%%MAJORLIBVERSION%%
 Local/Library/Libraries/libSystemConfig.so.%%LIBVERSION%%
-@dirrm Local/Library/Headers/libSystemConfig
+@dirrm Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm Local/Library/Frameworks/SystemConfig.framework/Versions/%%MAJORLIBVERSION%%
+@dirrm Local/Library/Frameworks/SystemConfig.framework/Versions
+@dirrm Local/Library/Frameworks/SystemConfig.framework
diff --git a/deskutils/etoile-ui/Makefile b/deskutils/etoile-ui/Makefile
index e9a1eaf37595..1279c8445bd8 100644
--- a/deskutils/etoile-ui/Makefile
+++ b/deskutils/etoile-ui/Makefile
@@ -6,18 +6,15 @@
 #
 
 PORTNAME=	ui
-PORTVERSION=	0.1.${SNAPSHOT}
-PORTREVISION=	1
+PORTVERSION=	0.2
 CATEGORIES=	deskutils gnustep
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dinoex
+MASTER_SITES=	http://download.gna.org/etoile/
 PKGNAMEPREFIX=	etoile-
-DISTNAME=	Etoile-${SNAPSHOT}
+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
@@ -26,8 +23,7 @@ USE_GNUSTEP_INSTALL=	yes
 DEFAULT_LIBVERSION=	0.1
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
-SNAPSHOT=	20061221
-WRKSRC=	${WRKDIR}/Etoile/
+WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Frameworks/EtoileUI
 
 .include <bsd.port.mk>
diff --git a/deskutils/etoile-ui/distinfo b/deskutils/etoile-ui/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/deskutils/etoile-ui/distinfo
+++ b/deskutils/etoile-ui/distinfo
@@ -1,3 +1,3 @@
-MD5 (Etoile-20061221.tar.bz2) = 120ffa8cf06c58ff775f8a218ad91448
-SHA256 (Etoile-20061221.tar.bz2) = 7dc8acbf2cb46d9d119c9817204bbbbe72884065f3287877550c400e68f4c992
-SIZE (Etoile-20061221.tar.bz2) = 9867481
+MD5 (etoile-0.2.tar.gz) = cc1b54ba2e4ba371c5eda45c756bece9
+SHA256 (etoile-0.2.tar.gz) = 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
+SIZE (etoile-0.2.tar.gz) = 21373391
diff --git a/deskutils/etoile-ui/pkg-plist b/deskutils/etoile-ui/pkg-plist
index 371e7b83a860..706df16f869b 100644
--- a/deskutils/etoile-ui/pkg-plist
+++ b/deskutils/etoile-ui/pkg-plist
@@ -1,8 +1,23 @@
-Local/Library/Headers/EtoileUI/Cocoa.h
-Local/Library/Headers/EtoileUI/EtoileCompatibility.h
-Local/Library/Headers/EtoileUI/NSBezierPathCappedBoxes.h
-Local/Library/Headers/EtoileUI/NSImage+NiceScaling.h
+Local/Library/Frameworks/EtoileUI.framework/EtoileUI
+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/EtoileCompatibility.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSBezierPathCappedBoxes.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSImage+NiceScaling.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Headers/UKNibOwner.h
+Local/Library/Frameworks/EtoileUI.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+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%%
+Local/Library/Frameworks/EtoileUI.framework/Versions/Current
+Local/Library/Frameworks/EtoileUI.framework/libEtoileUI.so
+Local/Library/Headers/EtoileUI
 Local/Library/Libraries/libEtoileUI.so
 Local/Library/Libraries/libEtoileUI.so.%%MAJORLIBVERSION%%
 Local/Library/Libraries/libEtoileUI.so.%%LIBVERSION%%
-@dirrm Local/Library/Headers/EtoileUI
+@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%%
+@dirrm Local/Library/Frameworks/EtoileUI.framework/Versions
+@dirrm Local/Library/Frameworks/EtoileUI.framework