summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--deskutils/etoile-dictionaryreader/Makefile12
-rw-r--r--deskutils/etoile-dictionaryreader/distinfo6
-rw-r--r--deskutils/etoile-dictionaryreader/pkg-plist9
-rw-r--r--deskutils/etoile-menuserver/Makefile12
-rw-r--r--deskutils/etoile-menuserver/distinfo6
-rw-r--r--deskutils/etoile-menuserver/pkg-plist6
-rw-r--r--deskutils/etoile-panekit/Makefile13
-rw-r--r--deskutils/etoile-panekit/distinfo6
-rw-r--r--deskutils/etoile-panekit/pkg-plist43
-rw-r--r--deskutils/etoile-systemconfig/Makefile13
-rw-r--r--deskutils/etoile-systemconfig/distinfo6
-rw-r--r--deskutils/etoile-systemconfig/pkg-plist26
-rw-r--r--deskutils/etoile-ui/Makefile12
-rw-r--r--deskutils/etoile-ui/distinfo6
-rw-r--r--deskutils/etoile-ui/pkg-plist25
-rw-r--r--devel/etoile-collectionkit/Makefile13
-rw-r--r--devel/etoile-collectionkit/distinfo6
-rw-r--r--devel/etoile-collectionkit/pkg-plist40
-rw-r--r--devel/etoile-foundation/Makefile12
-rw-r--r--devel/etoile-foundation/distinfo6
-rw-r--r--devel/etoile-foundation/pkg-plist36
-rw-r--r--devel/etoile-unitkit/Makefile12
-rw-r--r--devel/etoile-unitkit/distinfo6
-rw-r--r--devel/etoile-unitkit/pkg-plist30
-rw-r--r--editors/etoile-typewriter/Makefile12
-rw-r--r--editors/etoile-typewriter/distinfo6
-rw-r--r--editors/etoile-typewriter/pkg-plist3
-rw-r--r--lang/etoile-io/Makefile15
-rw-r--r--lang/etoile-io/distinfo6
-rw-r--r--sysutils/etoile-behavior/Makefile12
-rw-r--r--sysutils/etoile-behavior/distinfo6
-rw-r--r--sysutils/etoile-system/Makefile16
-rw-r--r--sysutils/etoile-system/distinfo6
-rw-r--r--textproc/etoile-ogrekit/Makefile13
-rw-r--r--textproc/etoile-ogrekit/distinfo6
-rw-r--r--textproc/etoile-ogrekit/pkg-plist113
-rw-r--r--www/etoile-bookmarkkit/Makefile13
-rw-r--r--www/etoile-bookmarkkit/distinfo6
-rw-r--r--www/etoile-bookmarkkit/pkg-plist33
-rw-r--r--www/etoile-rsskit/Makefile12
-rw-r--r--www/etoile-rsskit/distinfo6
-rw-r--r--www/etoile-rsskit/pkg-plist58
-rw-r--r--x11-themes/etoile-azbackground/Makefile13
-rw-r--r--x11-themes/etoile-azbackground/distinfo6
-rw-r--r--x11-themes/etoile-azbackground/pkg-plist3
-rw-r--r--x11-themes/etoile-etoilemenus/Makefile12
-rw-r--r--x11-themes/etoile-etoilemenus/distinfo6
-rw-r--r--x11-themes/etoile-etoilemenus/files/patch-GSHorizontalMenuItemCell.m10
-rw-r--r--x11-themes/etoile-etoilemenus/files/patch-GSHorizontalMenuView.m10
-rw-r--r--x11-themes/etoile-iconkit/Makefile14
-rw-r--r--x11-themes/etoile-iconkit/distinfo6
-rw-r--r--x11-themes/etoile-iconkit/pkg-plist166
-rw-r--r--x11-wm/etoile-azalea/Makefile12
-rw-r--r--x11-wm/etoile-azalea/distinfo6
-rw-r--r--x11-wm/etoile-azalea/pkg-plist44
-rw-r--r--x11-wm/etoile-azdock/Makefile15
-rw-r--r--x11-wm/etoile-azdock/distinfo6
-rw-r--r--x11-wm/etoile-azdock/pkg-plist1
-rw-r--r--x11/etoile-xwindowserverkit/Makefile12
-rw-r--r--x11/etoile-xwindowserverkit/distinfo6
-rw-r--r--x11/etoile-xwindowserverkit/pkg-plist26
-rw-r--r--x11/etoile/Makefile8
-rw-r--r--x11/gnustep-app/Makefile10
63 files changed, 665 insertions, 431 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
diff --git a/devel/etoile-collectionkit/Makefile b/devel/etoile-collectionkit/Makefile
index 0fcfdd0ac987..955922edf7fe 100644
--- a/devel/etoile-collectionkit/Makefile
+++ b/devel/etoile-collectionkit/Makefile
@@ -6,28 +6,23 @@
#
PORTNAME= collectionkit
-PORTVERSION= 0.1.${SNAPSHOT}
-PORTREVISION= 1
+PORTVERSION= 0.2
CATEGORIES= devel 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= Provides a common storage facility for records with properties
-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/CollectionKit
.include <bsd.port.mk>
diff --git a/devel/etoile-collectionkit/distinfo b/devel/etoile-collectionkit/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/devel/etoile-collectionkit/distinfo
+++ b/devel/etoile-collectionkit/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/devel/etoile-collectionkit/pkg-plist b/devel/etoile-collectionkit/pkg-plist
index fbee8b935778..e3ef4f66192c 100644
--- a/devel/etoile-collectionkit/pkg-plist
+++ b/devel/etoile-collectionkit/pkg-plist
@@ -1,14 +1,30 @@
-Local/Library/Headers/CollectionKit/CKCollection.h
-Local/Library/Headers/CollectionKit/CKCollectionView.h
-Local/Library/Headers/CollectionKit/CKGlobals.h
-Local/Library/Headers/CollectionKit/CKGroup.h
-Local/Library/Headers/CollectionKit/CKItem.h
-Local/Library/Headers/CollectionKit/CKMultiValue.h
-Local/Library/Headers/CollectionKit/CKRecord.h
-Local/Library/Headers/CollectionKit/CKSearchElement.h
-Local/Library/Headers/CollectionKit/CKTypedefs.h
-Local/Library/Headers/CollectionKit/CollectionKit.h
+Local/Library/Frameworks/CollectionKit.framework/CollectionKit
+Local/Library/Frameworks/CollectionKit.framework/Headers
+Local/Library/Frameworks/CollectionKit.framework/Resources
+Local/Library/Frameworks/CollectionKit.framework/Versions/%%MAJORLIBVERSION%%/CollectionKit
+Local/Library/Frameworks/CollectionKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/CollectionKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/CKCollection.h
+Local/Library/Frameworks/CollectionKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/CKCollectionView.h
+Local/Library/Frameworks/CollectionKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/CKGlobals.h
+Local/Library/Frameworks/CollectionKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/CKGroup.h
+Local/Library/Frameworks/CollectionKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/CKItem.h
+Local/Library/Frameworks/CollectionKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/CKMultiValue.h
+Local/Library/Frameworks/CollectionKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/CKRecord.h
+Local/Library/Frameworks/CollectionKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/CKSearchElement.h
+Local/Library/Frameworks/CollectionKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/CKTypedefs.h
+Local/Library/Frameworks/CollectionKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/CollectionKit.h
+Local/Library/Frameworks/CollectionKit.framework/Versions/%%MAJORLIBVERSION%%/libCollectionKit.so
+Local/Library/Frameworks/CollectionKit.framework/Versions/%%MAJORLIBVERSION%%/libCollectionKit.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/CollectionKit.framework/Versions/%%MAJORLIBVERSION%%/libCollectionKit.so.%%LIBVERSION%%
+Local/Library/Frameworks/CollectionKit.framework/Versions/Current
+Local/Library/Frameworks/CollectionKit.framework/libCollectionKit.so
+Local/Library/Headers/CollectionKit
Local/Library/Libraries/libCollectionKit.so
-Local/Library/Libraries/libCollectionKit.so.%%MAJORLIBVERSION%%
Local/Library/Libraries/libCollectionKit.so.%%LIBVERSION%%
-@dirrm Local/Library/Headers/CollectionKit
+Local/Library/Libraries/libCollectionKit.so.%%MAJORLIBVERSION%%
+@dirrm Local/Library/Libraries
+@dirrm Local/Library/Frameworks/CollectionKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm Local/Library/Frameworks/CollectionKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm Local/Library/Frameworks/CollectionKit.framework/Versions/%%MAJORLIBVERSION%%
+@dirrm Local/Library/Frameworks/CollectionKit.framework/Versions
+@dirrm Local/Library/Frameworks/CollectionKit.framework
diff --git a/devel/etoile-foundation/Makefile b/devel/etoile-foundation/Makefile
index 1c9f157099e5..d4d2dea86e3b 100644
--- a/devel/etoile-foundation/Makefile
+++ b/devel/etoile-foundation/Makefile
@@ -6,18 +6,15 @@
#
PORTNAME= foundation
-PORTVERSION= 0.1.${SNAPSHOT}
-PORTREVISION= 1
+PORTVERSION= 0.2
CATEGORIES= devel 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 EtoileFoundation 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/EtoileFoundation
.include <bsd.port.mk>
diff --git a/devel/etoile-foundation/distinfo b/devel/etoile-foundation/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/devel/etoile-foundation/distinfo
+++ b/devel/etoile-foundation/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/devel/etoile-foundation/pkg-plist b/devel/etoile-foundation/pkg-plist
index 31e4d2af40be..a4ae84fdc34f 100644
--- a/devel/etoile-foundation/pkg-plist
+++ b/devel/etoile-foundation/pkg-plist
@@ -1,14 +1,28 @@
-Local/Library/Headers/EtoileFoundation/Cocoa.h
-Local/Library/Headers/EtoileFoundation/EtoileCompatibility.h
-Local/Library/Headers/EtoileFoundation/NSFileManager+NameForTempFile.h
-Local/Library/Headers/EtoileFoundation/UKFileWatcher.h
-Local/Library/Headers/EtoileFoundation/UKKQueue.h
-Local/Library/Headers/EtoileFoundation/UKMainThreadProxy.h
-Local/Library/Headers/EtoileFoundation/UKNibOwner.h
-Local/Library/Headers/EtoileFoundation/UKPluginsRegistry.h
-Local/Library/Headers/EtoileFoundation/UKPushbackMessenger.h
-Local/Library/Headers/EtoileFoundation/UKThreadMessenger.h
+Local/Library/Frameworks/EtoileFoundation.framework/EtoileFoundation
+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/EtoileCompatibility.h
+Local/Library/Frameworks/EtoileFoundation.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSFileManager+NameForTempFile.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
+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/Current
+Local/Library/Frameworks/EtoileFoundation.framework/libEtoileFoundation.so
+Local/Library/Headers/EtoileFoundation
Local/Library/Libraries/libEtoileFoundation.so
Local/Library/Libraries/libEtoileFoundation.so.%%MAJORLIBVERSION%%
Local/Library/Libraries/libEtoileFoundation.so.%%LIBVERSION%%
-@dirrm Local/Library/Headers/EtoileFoundation
+@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
+@dirrm Local/Library/Frameworks/EtoileFoundation.framework
diff --git a/devel/etoile-unitkit/Makefile b/devel/etoile-unitkit/Makefile
index 7eb496fa4a50..f87da6b10de4 100644
--- a/devel/etoile-unitkit/Makefile
+++ b/devel/etoile-unitkit/Makefile
@@ -6,18 +6,15 @@
#
PORTNAME= unitkit
-PORTVERSION= 1.1
-PORTREVISION= 1
+PORTVERSION= 0.2
CATEGORIES= devel 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 UnitKit test framework on GNUstep
-USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
@@ -25,8 +22,7 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
-SNAPSHOT= 20061221
-WRKSRC= ${WRKDIR}/Etoile/
+WRKSRC= ${WRKDIR}/Etoile-${PORTVERSION}
USE_GNUSTEP_MAKE_DIRS+= Frameworks/UnitKit
.include <bsd.port.mk>
diff --git a/devel/etoile-unitkit/distinfo b/devel/etoile-unitkit/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/devel/etoile-unitkit/distinfo
+++ b/devel/etoile-unitkit/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/devel/etoile-unitkit/pkg-plist b/devel/etoile-unitkit/pkg-plist
index 1af27da76c7e..b2de9b184500 100644
--- a/devel/etoile-unitkit/pkg-plist
+++ b/devel/etoile-unitkit/pkg-plist
@@ -1,10 +1,28 @@
-Local/Library/Headers/UnitKit/UKRunner.h
-Local/Library/Headers/UnitKit/UKTask.h
-Local/Library/Headers/UnitKit/UKTest.h
-Local/Library/Headers/UnitKit/UKTestHandler.h
-Local/Library/Headers/UnitKit/UnitKit.h
+Local/Library/Frameworks/UnitKit.framework/Headers
+Local/Library/Frameworks/UnitKit.framework/Resources
+Local/Library/Frameworks/UnitKit.framework/UnitKit
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/UKRunner.h
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/UKTask.h
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/UKTest.h
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/UKTestHandler.h
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/UnitKit.h
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/English.lproj/UKRunner.strings
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/English.lproj/UKTestHandler.strings
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/UnitKit
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/libUnitKit.so
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/libUnitKit.so.%%LIBVERSION%%
+Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/libUnitKit.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/UnitKit.framework/Versions/Current
+Local/Library/Frameworks/UnitKit.framework/libUnitKit.so
+Local/Library/Headers/UnitKit
Local/Library/Libraries/libUnitKit.so
Local/Library/Libraries/libUnitKit.so.%%MAJORLIBVERSION%%
Local/Library/Libraries/libUnitKit.so.%%LIBVERSION%%
Local/Tools/ukrun
-@dirrm Local/Library/Headers/UnitKit
+@dirrm Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/English.lproj
+@dirrm Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm Local/Library/Frameworks/UnitKit.framework/Versions/%%MAJORLIBVERSION%%
+@dirrm Local/Library/Frameworks/UnitKit.framework/Versions
+@dirrm Local/Library/Frameworks/UnitKit.framework
diff --git a/editors/etoile-typewriter/Makefile b/editors/etoile-typewriter/Makefile
index 3cf0aa6361a8..03fcaa1aa2a6 100644
--- a/editors/etoile-typewriter/Makefile
+++ b/editors/etoile-typewriter/Makefile
@@ -6,18 +6,15 @@
#
PORTNAME= typewriter
-PORTVERSION= 0.1.${SNAPSHOT}
-PORTREVISION= 1
+PORTVERSION= 0.2
CATEGORIES= editors 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= General text editor for plain and rich format text
-USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
@@ -26,8 +23,7 @@ USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LOCAL_LIBS+= OgreKit:${OGREKIT_PORT}
USE_GNUSTEP_MAKE_DIRS+= Services/User/Typewriter
-SNAPSHOT= 20061221
-WRKSRC= ${WRKDIR}/Etoile/
+WRKSRC= ${WRKDIR}/Etoile-${PORTVERSION}
OGREKIT_PORT?= textproc/etoile-ogrekit
.include <bsd.port.mk>
diff --git a/editors/etoile-typewriter/distinfo b/editors/etoile-typewriter/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/editors/etoile-typewriter/distinfo
+++ b/editors/etoile-typewriter/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/editors/etoile-typewriter/pkg-plist b/editors/etoile-typewriter/pkg-plist
index e10db24f0022..e18a121e5087 100644
--- a/editors/etoile-typewriter/pkg-plist
+++ b/editors/etoile-typewriter/pkg-plist
@@ -1,3 +1,5 @@
+Local/Applications/Typewriter.app/Resources/Document-RichText.tiff
+Local/Applications/Typewriter.app/Resources/Document-Text.tiff
Local/Applications/Typewriter.app/Resources/English.lproj/CharacterPanel.gorm/data.classes
Local/Applications/Typewriter.app/Resources/English.lproj/CharacterPanel.gorm/data.info
Local/Applications/Typewriter.app/Resources/English.lproj/CharacterPanel.gorm/objects.gorm
@@ -9,6 +11,7 @@ Local/Applications/Typewriter.app/Resources/English.lproj/MainMenu.gorm/data.inf
Local/Applications/Typewriter.app/Resources/English.lproj/MainMenu.gorm/objects.gorm
Local/Applications/Typewriter.app/Resources/Info-gnustep.plist
Local/Applications/Typewriter.app/Resources/Typewriter.desktop
+Local/Applications/Typewriter.app/Resources/Typewriter.tiff
Local/Applications/Typewriter.app/Typewriter
Local/Applications/Typewriter.app/stamp.make
Local/Tools/Typewriter
diff --git a/lang/etoile-io/Makefile b/lang/etoile-io/Makefile
index 6d0b16f95952..4e73fb63eaa1 100644
--- a/lang/etoile-io/Makefile
+++ b/lang/etoile-io/Makefile
@@ -6,28 +6,27 @@
#
PORTNAME= io
-PORTVERSION= 0.1.${SNAPSHOT}
-PORTREVISION= 1
+PORTVERSION= 0.2
CATEGORIES= lang 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 Io Language
-USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
+USE_GNUSTEP_LOCAL_LIBS+= DistributedView:${DISTRIBUTEDVIEW_PORT}
-SNAPSHOT= 20061221
-WRKSRC= ${WRKDIR}/Etoile/
+WRKSRC= ${WRKDIR}/Etoile-${PORTVERSION}
USE_GNUSTEP_MAKE_DIRS+= Languages/Io
HEADER_DIR= Local/Library/Headers/Io
PLIST_FILES= Local/Tools/ioobjc
+DISTRIBUTEDVIEW_PORT?= deskutils/etoile-distributedview
+
.include <bsd.port.mk>
diff --git a/lang/etoile-io/distinfo b/lang/etoile-io/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/lang/etoile-io/distinfo
+++ b/lang/etoile-io/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/sysutils/etoile-behavior/Makefile b/sysutils/etoile-behavior/Makefile
index f69239414184..e6c4b90a4f26 100644
--- a/sysutils/etoile-behavior/Makefile
+++ b/sysutils/etoile-behavior/Makefile
@@ -6,26 +6,22 @@
#
PORTNAME= behavior
-PORTVERSION= 0.1.${SNAPSHOT}
-PORTREVISION= 1
+PORTVERSION= 0.2
CATEGORIES= sysutils 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 AppKit bundle for session
-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+= Bundles/EtoileBehavior
MAKE_ENV+= GNUSTEP_INSTALLATION_DIR="${GNUSTEP_SYSTEM_ROOT}"
diff --git a/sysutils/etoile-behavior/distinfo b/sysutils/etoile-behavior/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/sysutils/etoile-behavior/distinfo
+++ b/sysutils/etoile-behavior/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/sysutils/etoile-system/Makefile b/sysutils/etoile-system/Makefile
index f160ba206014..f866c5376cc4 100644
--- a/sysutils/etoile-system/Makefile
+++ b/sysutils/etoile-system/Makefile
@@ -6,18 +6,18 @@
#
PORTNAME= system
-PORTVERSION= 0.1.${SNAPSHOT}
-PORTREVISION= 1
+PORTVERSION= 0.2
CATEGORIES= sysutils 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 System Tool
-USE_BZIP2= yes
+BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config
+LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus
+
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
@@ -25,10 +25,8 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
-SNAPSHOT= 20061221
-WRKSRC= ${WRKDIR}/Etoile/
+WRKSRC= ${WRKDIR}/Etoile-${PORTVERSION}
USE_GNUSTEP_MAKE_DIRS+= Services/Private/System
-MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
post-install:
${MKDIR} ${GNUSTEP_PREFIX}/System/Library/Etoile
diff --git a/sysutils/etoile-system/distinfo b/sysutils/etoile-system/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/sysutils/etoile-system/distinfo
+++ b/sysutils/etoile-system/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/textproc/etoile-ogrekit/Makefile b/textproc/etoile-ogrekit/Makefile
index 6d656dd01e97..0c42eac46095 100644
--- a/textproc/etoile-ogrekit/Makefile
+++ b/textproc/etoile-ogrekit/Makefile
@@ -6,20 +6,17 @@
#
PORTNAME= ogrekit
-PORTVERSION= 0.1.${SNAPSHOT}
-PORTREVISION= 1
+PORTVERSION= 0.2
CATEGORIES= textproc 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 OgreKit framework
LIB_DEPENDS= onig:${PORTSDIR}/${ONIGURUMA4_PORT}
-USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
@@ -27,9 +24,9 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
-SNAPSHOT= 20061221
-WRKSRC= ${WRKDIR}/Etoile/
+WRKSRC= ${WRKDIR}/Etoile-${PORTVERSION}
USE_GNUSTEP_MAKE_DIRS+= Frameworks/OgreKit
+ADDITIONAL_OBJCFLAGS+= -DONIGURUMA_4
UNITKIT_PORT?= devel/etoile-unitkit
ONIGURUMA4_PORT?= devel/oniguruma4
diff --git a/textproc/etoile-ogrekit/distinfo b/textproc/etoile-ogrekit/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/textproc/etoile-ogrekit/distinfo
+++ b/textproc/etoile-ogrekit/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/textproc/etoile-ogrekit/pkg-plist b/textproc/etoile-ogrekit/pkg-plist
index ca2c67e8a771..d4b9e2d4e945 100644
--- a/textproc/etoile-ogrekit/pkg-plist
+++ b/textproc/etoile-ogrekit/pkg-plist
@@ -1,52 +1,67 @@
-Local/Library/Headers/OgreKit/NSString_OgreKitAdditions.h
-Local/Library/Headers/OgreKit/OGAttributedString.h
-Local/Library/Headers/OgreKit/OGMutableAttributedString.h
-Local/Library/Headers/OgreKit/OGMutablePlainString.h
-Local/Library/Headers/OgreKit/OGMutableString.h
-Local/Library/Headers/OgreKit/OGPlainString.h
-Local/Library/Headers/OgreKit/OGRegularExpression.h
-Local/Library/Headers/OgreKit/OGRegularExpressionCapture.h
-Local/Library/Headers/OgreKit/OGRegularExpressionEnumerator.h
-Local/Library/Headers/OgreKit/OGRegularExpressionFormatter.h
-Local/Library/Headers/OgreKit/OGRegularExpressionMatch.h
-Local/Library/Headers/OgreKit/OGReplaceExpression.h
-Local/Library/Headers/OgreKit/OGString.h
-Local/Library/Headers/OgreKit/OgreFindAllThread.h
-Local/Library/Headers/OgreKit/OgreFindPanelController.h
-Local/Library/Headers/OgreKit/OgreFindResultBranch.h
-Local/Library/Headers/OgreKit/OgreFindResultLeaf.h
-Local/Library/Headers/OgreKit/OgreFindResultRoot.h
-Local/Library/Headers/OgreKit/OgreFindResultWindowController.h
-Local/Library/Headers/OgreKit/OgreFindThread.h
-Local/Library/Headers/OgreKit/OgreHighlightThread.h
-Local/Library/Headers/OgreKit/OgreKit.h
-Local/Library/Headers/OgreKit/OgreOutlineColumn.h
-Local/Library/Headers/OgreKit/OgreOutlineView.h
-Local/Library/Headers/OgreKit/OgreReplaceAllThread.h
-Local/Library/Headers/OgreKit/OgreReplaceAndFindThread.h
-Local/Library/Headers/OgreKit/OgreTableColumn.h
-Local/Library/Headers/OgreKit/OgreTableView.h
-Local/Library/Headers/OgreKit/OgreTextFindBranch.h
-Local/Library/Headers/OgreKit/OgreTextFindComponent.h
-Local/Library/Headers/OgreKit/OgreTextFindComponentEnumerator.h
-Local/Library/Headers/OgreKit/OgreTextFindLeaf.h
-Local/Library/Headers/OgreKit/OgreTextFindProgressSheet.h
-Local/Library/Headers/OgreKit/OgreTextFindResult.h
-Local/Library/Headers/OgreKit/OgreTextFindReverseComponentEnumerator.h
-Local/Library/Headers/OgreKit/OgreTextFindRoot.h
-Local/Library/Headers/OgreKit/OgreTextFindThread.h
-Local/Library/Headers/OgreKit/OgreTextFinder.h
-Local/Library/Headers/OgreKit/OgreTextView.h
-Local/Library/Headers/OgreKit/OgreTextViewAdapter.h
-Local/Library/Headers/OgreKit/OgreTextViewFindResult.h
-Local/Library/Headers/OgreKit/OgreTextViewGraphicAllowedAdapter.h
-Local/Library/Headers/OgreKit/OgreTextViewMatchFindResult.h
-Local/Library/Headers/OgreKit/OgreTextViewPlainAdapter.h
-Local/Library/Headers/OgreKit/OgreTextViewRichAdapter.h
-Local/Library/Headers/OgreKit/OgreTextViewUndoer.h
-Local/Library/Headers/OgreKit/OgreUnhighlightThread.h
-Local/Library/Headers/OgreKit/OgreView.h
+Local/Library/Frameworks/OgreKit.framework/Headers
+Local/Library/Frameworks/OgreKit.framework/OgreKit
+Local/Library/Frameworks/OgreKit.framework/Resources
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/NSString_OgreKitAdditions.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGAttributedString.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGMutableAttributedString.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGMutablePlainString.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGMutableString.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGPlainString.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGRegularExpression.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGRegularExpressionCapture.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGRegularExpressionEnumerator.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGRegularExpressionFormatter.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGRegularExpressionMatch.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGReplaceExpression.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OGString.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindAllThread.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindPanelController.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindResultBranch.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindResultLeaf.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindResultRoot.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindResultWindowController.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreFindThread.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreHighlightThread.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreKit.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreOutlineColumn.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreOutlineView.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreReplaceAllThread.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreReplaceAndFindThread.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTableColumn.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTableView.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindBranch.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindComponent.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindComponentEnumerator.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindLeaf.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindProgressSheet.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindResult.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindReverseComponentEnumerator.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindRoot.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFindThread.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextFinder.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextView.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextViewAdapter.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextViewFindResult.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextViewGraphicAllowedAdapter.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextViewMatchFindResult.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextViewPlainAdapter.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextViewRichAdapter.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreTextViewUndoer.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreUnhighlightThread.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/OgreView.h
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/OgreKit
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/libOgreKit.so
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/libOgreKit.so.%%LIBVERSION%%
+Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/libOgreKit.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/OgreKit.framework/Versions/Current
+Local/Library/Frameworks/OgreKit.framework/libOgreKit.so
+Local/Library/Headers/OgreKit
Local/Library/Libraries/libOgreKit.so
Local/Library/Libraries/libOgreKit.so.%%MAJORLIBVERSION%%
Local/Library/Libraries/libOgreKit.so.%%LIBVERSION%%
-@dirrm Local/Library/Headers/OgreKit
+@dirrm Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm Local/Library/Frameworks/OgreKit.framework/Versions/%%MAJORLIBVERSION%%
+@dirrm Local/Library/Frameworks/OgreKit.framework/Versions
+@dirrm Local/Library/Frameworks/OgreKit.framework
diff --git a/www/etoile-bookmarkkit/Makefile b/www/etoile-bookmarkkit/Makefile
index aeb7ad7b992c..09a821a49ab0 100644
--- a/www/etoile-bookmarkkit/Makefile
+++ b/www/etoile-bookmarkkit/Makefile
@@ -6,29 +6,24 @@
#
PORTNAME= bookmarkkit
-PORTVERSION= 0.1.${SNAPSHOT}
-PORTREVISION= 1
+PORTVERSION= 0.2
CATEGORIES= www 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 BookmarkKit framework
-USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LOCAL_LIBS+= CollectionKit:${COLLECTIONKIT_PORT}
-DEFAULT_LIBVERSION= 0.1
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
-SNAPSHOT= 20061221
-WRKSRC= ${WRKDIR}/Etoile/
+WRKSRC= ${WRKDIR}/Etoile-${PORTVERSION}
USE_GNUSTEP_MAKE_DIRS+= Frameworks/BookmarkKit
COLLECTIONKIT_PORT?= devel/etoile-collectionkit
diff --git a/www/etoile-bookmarkkit/distinfo b/www/etoile-bookmarkkit/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/www/etoile-bookmarkkit/distinfo
+++ b/www/etoile-bookmarkkit/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/www/etoile-bookmarkkit/pkg-plist b/www/etoile-bookmarkkit/pkg-plist
index 425aa532397e..45260ae9ec29 100644
--- a/www/etoile-bookmarkkit/pkg-plist
+++ b/www/etoile-bookmarkkit/pkg-plist
@@ -1,12 +1,27 @@
-Local/Library/Headers/BookmarkKit/BKBookmark.h
-Local/Library/Headers/BookmarkKit/BKBookmarkQuery.h
-Local/Library/Headers/BookmarkKit/BKBookmarkSearchResult.h
-Local/Library/Headers/BookmarkKit/BKBookmarkStore.h
-Local/Library/Headers/BookmarkKit/BKBookmarkView.h
-Local/Library/Headers/BookmarkKit/BKGlobals.h
-Local/Library/Headers/BookmarkKit/BKGroup.h
-Local/Library/Headers/BookmarkKit/BookmarkKit.h
+Local/Library/Frameworks/BookmarkKit.framework/BookmarkKit
+Local/Library/Frameworks/BookmarkKit.framework/Headers
+Local/Library/Frameworks/BookmarkKit.framework/Resources
+Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/BookmarkKit
+Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BKBookmark.h
+Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BKBookmarkQuery.h
+Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BKBookmarkSearchResult.h
+Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BKBookmarkStore.h
+Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BKBookmarkView.h
+Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BKGlobals.h
+Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BKGroup.h
+Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/BookmarkKit.h
+Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/libBookmarkKit.so
+Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/libBookmarkKit.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/libBookmarkKit.so.%%LIBVERSION%%
+Local/Library/Frameworks/BookmarkKit.framework/Versions/Current
+Local/Library/Frameworks/BookmarkKit.framework/libBookmarkKit.so
+Local/Library/Headers/BookmarkKit
Local/Library/Libraries/libBookmarkKit.so
Local/Library/Libraries/libBookmarkKit.so.%%MAJORLIBVERSION%%
Local/Library/Libraries/libBookmarkKit.so.%%LIBVERSION%%
-@dirrm Local/Library/Headers/BookmarkKit
+@dirrm Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm Local/Library/Frameworks/BookmarkKit.framework/Versions/%%MAJORLIBVERSION%%
+@dirrm Local/Library/Frameworks/BookmarkKit.framework/Versions
+@dirrm Local/Library/Frameworks/BookmarkKit.framework
diff --git a/www/etoile-rsskit/Makefile b/www/etoile-rsskit/Makefile
index a26c14f4db19..e6270b911466 100644
--- a/www/etoile-rsskit/Makefile
+++ b/www/etoile-rsskit/Makefile
@@ -6,18 +6,15 @@
#
PORTNAME= rsskit
-PORTVERSION= 0.1.${SNAPSHOT}
-PORTREVISION= 1
+PORTVERSION= 0.2
CATEGORIES= www 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 RSSKit framwork
-USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
@@ -25,8 +22,7 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
-SNAPSHOT= 20061221
-WRKSRC= ${WRKDIR}/Etoile/
+WRKSRC= ${WRKDIR}/Etoile-${PORTVERSION}
USE_GNUSTEP_MAKE_DIRS+= Frameworks/RSSKit
.include <bsd.port.mk>
diff --git a/www/etoile-rsskit/distinfo b/www/etoile-rsskit/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/www/etoile-rsskit/distinfo
+++ b/www/etoile-rsskit/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/www/etoile-rsskit/pkg-plist b/www/etoile-rsskit/pkg-plist
index 3c6c6cfbb8cc..015ada902ca5 100644
--- a/www/etoile-rsskit/pkg-plist
+++ b/www/etoile-rsskit/pkg-plist
@@ -1,24 +1,40 @@
-Local/Library/Headers/RSSKit/Atom%%MAJORVERSION%%3Parser.h
-Local/Library/Headers/RSSKit/Atom1%%MAJORVERSION%%Parser.h
-Local/Library/Headers/RSSKit/AtomParser.h
-Local/Library/Headers/RSSKit/DOMParser.h
-Local/Library/Headers/RSSKit/DublinCore.h
-Local/Library/Headers/RSSKit/FeedParser.h
-Local/Library/Headers/RSSKit/NewRSSArticleListener.h
-Local/Library/Headers/RSSKit/RSS1%%MAJORVERSION%%Parser.h
-Local/Library/Headers/RSSKit/RSS2%%MAJORVERSION%%Parser.h
-Local/Library/Headers/RSSKit/RSSArticle+Storage.h
-Local/Library/Headers/RSSKit/RSSArticle.h
-Local/Library/Headers/RSSKit/RSSArticleCreationListener.h
-Local/Library/Headers/RSSKit/RSSArticleProtocol.h
-Local/Library/Headers/RSSKit/RSSFactory.h
-Local/Library/Headers/RSSKit/RSSFeed+Fetching.h
-Local/Library/Headers/RSSKit/RSSFeed+Storage.h
-Local/Library/Headers/RSSKit/RSSFeed.h
-Local/Library/Headers/RSSKit/RSSFeedProtocol.h
-Local/Library/Headers/RSSKit/RSSKit.h
-Local/Library/Headers/RSSKit/RSSLinks.h
+Local/Library/Frameworks/RSSKit.framework/Headers
+Local/Library/Frameworks/RSSKit.framework/RSSKit
+Local/Library/Frameworks/RSSKit.framework/Resources
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/Atom03Parser.h
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/Atom10Parser.h
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/AtomParser.h
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/DOMParser.h
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/DublinCore.h
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/FeedParser.h
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/NewRSSArticleListener.h
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSS10Parser.h
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSS20Parser.h
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSArticle+Storage.h
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSArticle.h
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSArticleCreationListener.h
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSArticleProtocol.h
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSFactory.h
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSFeed+Fetching.h
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSFeed+Storage.h
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSFeed.h
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSFeedProtocol.h
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSKit.h
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/RSSLinks.h
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/RSSKit
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/libRSSKit.so
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/libRSSKit.so.%%LIBVERSION%%
+Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/libRSSKit.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/RSSKit.framework/Versions/Current
+Local/Library/Frameworks/RSSKit.framework/libRSSKit.so
+Local/Library/Headers/RSSKit
Local/Library/Libraries/libRSSKit.so
Local/Library/Libraries/libRSSKit.so.%%MAJORLIBVERSION%%
Local/Library/Libraries/libRSSKit.so.%%LIBVERSION%%
-@dirrm Local/Library/Headers/RSSKit
+@dirrm Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm Local/Library/Frameworks/RSSKit.framework/Versions/%%MAJORLIBVERSION%%
+@dirrm Local/Library/Frameworks/RSSKit.framework/Versions
+@dirrm Local/Library/Frameworks/RSSKit.framework
+@dirrm Local/Library/Frameworks
diff --git a/x11-themes/etoile-azbackground/Makefile b/x11-themes/etoile-azbackground/Makefile
index aef6b231ba34..164908188d37 100644
--- a/x11-themes/etoile-azbackground/Makefile
+++ b/x11-themes/etoile-azbackground/Makefile
@@ -6,18 +6,15 @@
#
PORTNAME= azbackground
-PORTVERSION= 0.1.${SNAPSHOT}
-PORTREVISION= 1
+PORTVERSION= 0.2
CATEGORIES= x11-themes 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= Small GNUstep application to set xwindow background
-USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
@@ -25,12 +22,10 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_SYSTEM_LIBS+= XWindowServerKit:${XWINDOWSERVERKIT_PORT}
-SNAPSHOT= 20061221
-WRKSRC= ${WRKDIR}/Etoile/
+WRKSRC= ${WRKDIR}/Etoile-${PORTVERSION}
USE_GNUSTEP_MAKE_DIRS+= Services/Private/AZBackground
ADDITIONAL_INCLUDE_DIRS+= -I${LOCALBASE}/include
ADDITIONAL_LIB_DIRS+= -L${LOCALBASE}/lib
-MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
XWINDOWSERVERKIT_PORT?= x11/etoile-xwindowserverkit
diff --git a/x11-themes/etoile-azbackground/distinfo b/x11-themes/etoile-azbackground/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/x11-themes/etoile-azbackground/distinfo
+++ b/x11-themes/etoile-azbackground/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/x11-themes/etoile-azbackground/pkg-plist b/x11-themes/etoile-azbackground/pkg-plist
index d01919b0dbc5..9e5c51c9f64b 100644
--- a/x11-themes/etoile-azbackground/pkg-plist
+++ b/x11-themes/etoile-azbackground/pkg-plist
@@ -1,4 +1,7 @@
System/Applications/AZBackground.app/AZBackground
+System/Applications/AZBackground.app/Resources/2560x1440.jpg
+System/Applications/AZBackground.app/Resources/2560x1600.jpg
+System/Applications/AZBackground.app/Resources/2560x1920.jpg
System/Applications/AZBackground.app/Resources/AZBackground.desktop
System/Applications/AZBackground.app/Resources/Info-gnustep.plist
System/Applications/AZBackground.app/stamp.make
diff --git a/x11-themes/etoile-etoilemenus/Makefile b/x11-themes/etoile-etoilemenus/Makefile
index 3cef39bdc25f..631061f0388e 100644
--- a/x11-themes/etoile-etoilemenus/Makefile
+++ b/x11-themes/etoile-etoilemenus/Makefile
@@ -6,26 +6,22 @@
#
PORTNAME= etoilemenus
-PORTVERSION= 0.1.${SNAPSHOT}
-PORTREVISION= 1
+PORTVERSION= 0.2
CATEGORIES= x11-themes 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 EtoileMenus bundle
-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+= Bundles/EtoileWildMenus
MAKE_ENV+= GNUSTEP_INSTALLATION_DIR="${GNUSTEP_SYSTEM_ROOT}"
diff --git a/x11-themes/etoile-etoilemenus/distinfo b/x11-themes/etoile-etoilemenus/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/x11-themes/etoile-etoilemenus/distinfo
+++ b/x11-themes/etoile-etoilemenus/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/x11-themes/etoile-etoilemenus/files/patch-GSHorizontalMenuItemCell.m b/x11-themes/etoile-etoilemenus/files/patch-GSHorizontalMenuItemCell.m
new file mode 100644
index 000000000000..821091a7f9a1
--- /dev/null
+++ b/x11-themes/etoile-etoilemenus/files/patch-GSHorizontalMenuItemCell.m
@@ -0,0 +1,10 @@
+--- Bundles/EtoileWildMenus/GSHorizontalMenuItemCell.m.orig 2006-05-06 21:13:03.000000000 +0200
++++ Bundles/EtoileWildMenus/GSHorizontalMenuItemCell.m 2008-05-03 09:22:21.000000000 +0200
+@@ -22,6 +22,7 @@
+
+ #import "GSHorizontalMenuItemCell.h"
+
++#import <AppKit/NSAttributedString.h>
+ #import <AppKit/NSGraphics.h>
+ #import <AppKit/NSImage.h>
+ #import <AppKit/NSParagraphStyle.h>
diff --git a/x11-themes/etoile-etoilemenus/files/patch-GSHorizontalMenuView.m b/x11-themes/etoile-etoilemenus/files/patch-GSHorizontalMenuView.m
new file mode 100644
index 000000000000..b8d6225b99ad
--- /dev/null
+++ b/x11-themes/etoile-etoilemenus/files/patch-GSHorizontalMenuView.m
@@ -0,0 +1,10 @@
+--- Bundles/EtoileWildMenus/GSHorizontalMenuView.m.orig 2006-12-04 23:08:17.000000000 +0100
++++ Bundles/EtoileWildMenus/GSHorizontalMenuView.m 2008-05-03 09:23:03.000000000 +0200
+@@ -23,6 +23,7 @@
+ #include "GSHorizontalMenuView.h"
+ #include <Foundation/Foundation.h>
+
++#import <AppKit/NSAttributedString.h>
+ #import <AppKit/NSParagraphStyle.h>
+ #import <AppKit/NSImage.h>
+ #import <AppKit/NSColor.h>
diff --git a/x11-themes/etoile-iconkit/Makefile b/x11-themes/etoile-iconkit/Makefile
index 56ef8ae111f4..f0f755fef379 100644
--- a/x11-themes/etoile-iconkit/Makefile
+++ b/x11-themes/etoile-iconkit/Makefile
@@ -6,31 +6,25 @@
#
PORTNAME= iconkit
-PORTVERSION= 0.1.${SNAPSHOT}
-PORTREVISION= 1
+PORTVERSION= 0.2
CATEGORIES= x11-themes 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 IconKit framework
-USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LOCAL_LIBS+= UnitKit:${UNITKIT_PORT}
-DEFAULT_LIBVERSION= 0.1
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
-SNAPSHOT= 20061221
-WRKSRC= ${WRKDIR}/Etoile/
+WRKSRC= ${WRKDIR}/Etoile-${PORTVERSION}
USE_GNUSTEP_MAKE_DIRS+= Frameworks/IconKit
-MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
UNITKIT_PORT?= devel/etoile-unitkit
diff --git a/x11-themes/etoile-iconkit/distinfo b/x11-themes/etoile-iconkit/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/x11-themes/etoile-iconkit/distinfo
+++ b/x11-themes/etoile-iconkit/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/x11-themes/etoile-iconkit/pkg-plist b/x11-themes/etoile-iconkit/pkg-plist
index 972c4d825c76..b0ccf59e4a90 100644
--- a/x11-themes/etoile-iconkit/pkg-plist
+++ b/x11-themes/etoile-iconkit/pkg-plist
@@ -1,14 +1,152 @@
-System/Library/Headers/IconKit/IKApplicationIconProvider.h
-System/Library/Headers/IconKit/IKCompositor.h
-System/Library/Headers/IconKit/IKCompositorOperation.h
-System/Library/Headers/IconKit/IKIcon.h
-System/Library/Headers/IconKit/IKIconIdentifier.h
-System/Library/Headers/IconKit/IKIconPositions.h
-System/Library/Headers/IconKit/IKIconProvider.h
-System/Library/Headers/IconKit/IKThumbnailProvider.h
-System/Library/Headers/IconKit/IKWorkspaceAdditions.h
-System/Library/Headers/IconKit/IconKit.h
-System/Library/Libraries/libIconKit.so
-System/Library/Libraries/libIconKit.so.%%MAJORLIBVERSION%%
-System/Library/Libraries/libIconKit.so.%%LIBVERSION%%
-@dirrm System/Library/Headers/IconKit
+Local/Library/Frameworks/IconKit.framework/Headers
+Local/Library/Frameworks/IconKit.framework/IconKit
+Local/Library/Frameworks/IconKit.framework/Resources
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/IKIconTheme.h
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/IconKit
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/ExtensionMapping.plist
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/COPYING/GPL.txt
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/COPYING/LGPL.txt
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/COPYING/MIT.txt
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/COPYING/README.txt
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Application-Application.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Application-Application.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Application-Calculator.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Application-Calculator.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Application-Mail.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Application-Mail.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Application-Terminal.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Application-Terminal.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Bundle-Plugin.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Bundle-Plugin.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Document-Audio.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Document-Audio.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Document-CommandLineTool.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Document-CommandLineTool.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Document-Feed.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Document-Feed.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Document-Font.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Document-Font.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Document-Image.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Document-Image.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Document-Text.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Document-Text.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Document-URL.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Document-URL.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Document-Unknown.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Document-Unknown.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Document-Video.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Document-Video.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Document-Zipped.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Document-Zipped.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Folder-Folder.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Folder-Folder.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Folder-Home.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Folder-Home.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/IdentifierMapping.plist
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Add.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Add.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Addresses.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Addresses.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-AlignCenter.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-AlignCenter.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-AlignJustified.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-AlignJustified.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-AlignLeft.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-AlignLeft.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-AlignRight.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-AlignRight.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Back.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Back.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Bold.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Bold.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Cancel.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Cancel.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Colors.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Colors.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-DateTime.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-DateTime.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-DeleteTrash.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-DeleteTrash.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Display.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Display.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Energy.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Energy.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-FlexibleSpace.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-FlexibleSpace.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Fonts.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Fonts.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Forward.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Forward.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Italic.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Italic.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Pause.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Pause.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Play.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Play.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Print.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Print.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Record.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Record.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Redo.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Redo.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Remove.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Remove.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Restart.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Restart.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Security.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Security.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Separator.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Separator.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-ShutDown.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-ShutDown.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Space.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Space.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Stop.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Stop.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Underline.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Underline.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Undo.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Undo.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Unzoom.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Unzoom.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-User.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-User.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Users.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Users.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Warning.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Warning.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Zoom.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Toolbar-Zoom.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Volume-CD.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Volume-CD.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Volume-HardDrive.png
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources/Volume-HardDrive.tif
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/IconKitInfo.plist
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/libIconKit.so
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/libIconKit.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/libIconKit.so.%%LIBVERSION%%
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/IKApplicationIconProvider.h
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/IKCompositor.h
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/IKCompositorOperation.h
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/IKIcon.h
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/IKIconIdentifier.h
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/IKIconPositions.h
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/IKIconProvider.h
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/IKThumbnailProvider.h
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/IKWorkspaceAdditions.h
+Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/IconKit.h
+Local/Library/Frameworks/IconKit.framework/Versions/Current
+Local/Library/Frameworks/IconKit.framework/libIconKit.so
+Local/Library/Headers/IconKit
+Local/Library/Libraries/libIconKit.so
+Local/Library/Libraries/libIconKit.so.%%MAJORLIBVERSION%%
+Local/Library/Libraries/libIconKit.so.%%LIBVERSION%%
+@dirrm Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/Resources
+@dirrm Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme/COPYING
+@dirrm Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/GNUstep.icontheme
+@dirrm Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%
+@dirrm Local/Library/Frameworks/IconKit.framework/Versions
+@dirrm Local/Library/Frameworks/IconKit.framework
diff --git a/x11-wm/etoile-azalea/Makefile b/x11-wm/etoile-azalea/Makefile
index e22144408325..8369e2712b52 100644
--- a/x11-wm/etoile-azalea/Makefile
+++ b/x11-wm/etoile-azalea/Makefile
@@ -6,18 +6,15 @@
#
PORTNAME= azalea
-PORTVERSION= 0.1.${SNAPSHOT}
-PORTREVISION= 1
+PORTVERSION= 0.2
CATEGORIES= x11-wm 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= Azalea is a GNUstep window mamager
-USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
@@ -25,8 +22,7 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_SYSTEM_LIBS+= XWindowServerKit:${XWINDOWSERVERKIT_PORT}
-SNAPSHOT= 20061221
-WRKSRC= ${WRKDIR}/Etoile/
+WRKSRC= ${WRKDIR}/Etoile-${PORTVERSION}
USE_GNUSTEP_MAKE_DIRS+= Services/Private/Azalea
ADDITIONAL_INCLUDE_DIRS+= -I${LOCALBASE}/include
ADDITIONAL_LIB_DIRS+= -L${LOCALBASE}/lib
diff --git a/x11-wm/etoile-azalea/distinfo b/x11-wm/etoile-azalea/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/x11-wm/etoile-azalea/distinfo
+++ b/x11-wm/etoile-azalea/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/x11-wm/etoile-azalea/pkg-plist b/x11-wm/etoile-azalea/pkg-plist
index e7b959917b3c..1222b72b559f 100644
--- a/x11-wm/etoile-azalea/pkg-plist
+++ b/x11-wm/etoile-azalea/pkg-plist
@@ -1,22 +1,22 @@
-Local/Applications/Azalea.app/Azalea
-Local/Applications/Azalea.app/Resources/Azalea.desktop
-Local/Applications/Azalea.app/Resources/Info-gnustep.plist
-Local/Applications/Azalea.app/Resources/openbox/menu.xml
-Local/Applications/Azalea.app/Resources/openbox/rc.xml
-Local/Applications/Azalea.app/Resources/themes/Azalea/openbox-3/bullet.xbm
-Local/Applications/Azalea.app/Resources/themes/Azalea/openbox-3/close.xbm
-Local/Applications/Azalea.app/Resources/themes/Azalea/openbox-3/desk.xbm
-Local/Applications/Azalea.app/Resources/themes/Azalea/openbox-3/desk_toggled.xbm
-Local/Applications/Azalea.app/Resources/themes/Azalea/openbox-3/iconify.xbm
-Local/Applications/Azalea.app/Resources/themes/Azalea/openbox-3/max.xbm
-Local/Applications/Azalea.app/Resources/themes/Azalea/openbox-3/max_toggled.xbm
-Local/Applications/Azalea.app/Resources/themes/Azalea/openbox-3/shade.xbm
-Local/Applications/Azalea.app/Resources/themes/Azalea/openbox-3/themerc
-Local/Applications/Azalea.app/stamp.make
-Local/Tools/Azalea
-@dirrm Local/Applications/Azalea.app/Resources/themes/Azalea/openbox-3
-@dirrm Local/Applications/Azalea.app/Resources/themes/Azalea
-@dirrm Local/Applications/Azalea.app/Resources/themes
-@dirrm Local/Applications/Azalea.app/Resources/openbox
-@dirrm Local/Applications/Azalea.app/Resources
-@dirrm Local/Applications/Azalea.app
+System/Applications/Azalea.app/Azalea
+System/Applications/Azalea.app/Resources/Azalea.desktop
+System/Applications/Azalea.app/Resources/Info-gnustep.plist
+System/Applications/Azalea.app/Resources/openbox/menu.xml
+System/Applications/Azalea.app/Resources/openbox/rc.xml
+System/Applications/Azalea.app/Resources/themes/Azalea/openbox-3/bullet.xbm
+System/Applications/Azalea.app/Resources/themes/Azalea/openbox-3/close.xbm
+System/Applications/Azalea.app/Resources/themes/Azalea/openbox-3/desk.xbm
+System/Applications/Azalea.app/Resources/themes/Azalea/openbox-3/desk_toggled.xbm
+System/Applications/Azalea.app/Resources/themes/Azalea/openbox-3/iconify.xbm
+System/Applications/Azalea.app/Resources/themes/Azalea/openbox-3/max.xbm
+System/Applications/Azalea.app/Resources/themes/Azalea/openbox-3/max_toggled.xbm
+System/Applications/Azalea.app/Resources/themes/Azalea/openbox-3/shade.xbm
+System/Applications/Azalea.app/Resources/themes/Azalea/openbox-3/themerc
+System/Applications/Azalea.app/stamp.make
+System/Tools/Azalea
+@dirrm System/Applications/Azalea.app/Resources/themes/Azalea/openbox-3
+@dirrm System/Applications/Azalea.app/Resources/themes/Azalea
+@dirrm System/Applications/Azalea.app/Resources/themes
+@dirrm System/Applications/Azalea.app/Resources/openbox
+@dirrm System/Applications/Azalea.app/Resources
+@dirrm System/Applications/Azalea.app
diff --git a/x11-wm/etoile-azdock/Makefile b/x11-wm/etoile-azdock/Makefile
index 4470b0027b86..d055c6b8741b 100644
--- a/x11-wm/etoile-azdock/Makefile
+++ b/x11-wm/etoile-azdock/Makefile
@@ -6,18 +6,15 @@
#
PORTNAME= azdock
-PORTVERSION= 0.1.${SNAPSHOT}
-PORTREVISION= 1
+PORTVERSION= 0.2
CATEGORIES= x11-wm 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 AZDock is a wm-dock
-USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
@@ -25,15 +22,15 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_SYSTEM_LIBS+= XWindowServerKit:${XWINDOWSERVERKIT_PORT}
USE_GNUSTEP_LOCAL_LIBS+= BookmarkKit:${BOOKMARKKIT_PORT}
+USE_GNUSTEP_LOCAL_LIBS+= IconKit:${ICONKIT_PORT}
-SNAPSHOT= 20061221
-WRKSRC= ${WRKDIR}/Etoile/
+WRKSRC= ${WRKDIR}/Etoile-${PORTVERSION}
USE_GNUSTEP_MAKE_DIRS+= Services/Private/AZDock
ADDITIONAL_OBJCFLAGS+= -I${LOCALBASE}/include
ADDITIONAL_LDFLAGS+= -L${LOCALBASE}/lib
-MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
XWINDOWSERVERKIT_PORT?= x11/etoile-xwindowserverkit
BOOKMARKKIT_PORT?= www/etoile-bookmarkkit
+ICONKIT_PORT?= x11-themes/etoile-iconkit
.include <bsd.port.mk>
diff --git a/x11-wm/etoile-azdock/distinfo b/x11-wm/etoile-azdock/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/x11-wm/etoile-azdock/distinfo
+++ b/x11-wm/etoile-azdock/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/x11-wm/etoile-azdock/pkg-plist b/x11-wm/etoile-azdock/pkg-plist
index ac40ab34856b..60bcff3b0f29 100644
--- a/x11-wm/etoile-azdock/pkg-plist
+++ b/x11-wm/etoile-azdock/pkg-plist
@@ -1,5 +1,6 @@
System/Applications/AZDock.app/AZDock
System/Applications/AZDock.app/Resources/AZDock.desktop
+System/Applications/AZDock.app/Resources/Etoile.tiff
System/Applications/AZDock.app/Resources/Info-gnustep.plist
System/Applications/AZDock.app/Resources/Unknown.tiff
System/Applications/AZDock.app/stamp.make
diff --git a/x11/etoile-xwindowserverkit/Makefile b/x11/etoile-xwindowserverkit/Makefile
index 3e3bc7f64ec1..36c49adad3bb 100644
--- a/x11/etoile-xwindowserverkit/Makefile
+++ b/x11/etoile-xwindowserverkit/Makefile
@@ -6,18 +6,15 @@
#
PORTNAME= xwindowserverkit
-PORTVERSION= 0.1.${SNAPSHOT}
-PORTREVISION= 1
+PORTVERSION= 0.2
CATEGORIES= x11 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 XWindowServerKit frameowrk
-USE_BZIP2= yes
USE_GNUSTEP= yes
USE_GNUSTEP_PREFIX= yes
USE_GNUSTEP_BACK= yes
@@ -25,8 +22,7 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
-SNAPSHOT= 20061221
-WRKSRC= ${WRKDIR}/Etoile/
+WRKSRC= ${WRKDIR}/Etoile-${PORTVERSION}
USE_GNUSTEP_MAKE_DIRS+= Frameworks/XWindowServerKit
ADDITIONAL_OBJCFLAGS+= -I${LOCALBASE}/include
ADDITIONAL_LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/x11/etoile-xwindowserverkit/distinfo b/x11/etoile-xwindowserverkit/distinfo
index 545ac18e8091..2ac1ee4891af 100644
--- a/x11/etoile-xwindowserverkit/distinfo
+++ b/x11/etoile-xwindowserverkit/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/x11/etoile-xwindowserverkit/pkg-plist b/x11/etoile-xwindowserverkit/pkg-plist
index 96d1fc0c94f2..864886a0ffd1 100644
--- a/x11/etoile-xwindowserverkit/pkg-plist
+++ b/x11/etoile-xwindowserverkit/pkg-plist
@@ -1,8 +1,24 @@
-System/Library/Headers/XWindowServerKit/XFunctions.h
-System/Library/Headers/XWindowServerKit/XScreen.h
-System/Library/Headers/XWindowServerKit/XWindow.h
-System/Library/Headers/XWindowServerKit/gnustep.h
+System/Library/Frameworks/XWindowServerKit.framework/Headers
+System/Library/Frameworks/XWindowServerKit.framework/Resources
+System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/XFunctions.h
+System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/XScreen.h
+System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/XWindow.h
+System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/gnustep.h
+System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/Info-gnustep.plist
+System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Resources/ScriptingInfo.plist
+System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/XWindowServerKit
+System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/libXWindowServerKit.so
+System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/libXWindowServerKit.so.%%MAJORLIBVERSION%%
+System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/libXWindowServerKit.so.%%LIBVERSION%%
+System/Library/Frameworks/XWindowServerKit.framework/Versions/Current
+System/Library/Frameworks/XWindowServerKit.framework/XWindowServerKit
+System/Library/Frameworks/XWindowServerKit.framework/libXWindowServerKit.so
+System/Library/Headers/XWindowServerKit
System/Library/Libraries/libXWindowServerKit.so
System/Library/Libraries/libXWindowServerKit.so.%%MAJORLIBVERSION%%
System/Library/Libraries/libXWindowServerKit.so.%%LIBVERSION%%
-@dirrm System/Library/Headers/XWindowServerKit
+@dirrm System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Resources
+@dirrm System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%/Headers
+@dirrm System/Library/Frameworks/XWindowServerKit.framework/Versions/%%MAJORLIBVERSION%%
+@dirrm System/Library/Frameworks/XWindowServerKit.framework/Versions
+@dirrm System/Library/Frameworks/XWindowServerKit.framework
diff --git a/x11/etoile/Makefile b/x11/etoile/Makefile
index e8331f7fc71d..262883cf4714 100644
--- a/x11/etoile/Makefile
+++ b/x11/etoile/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= etoile
-PORTVERSION= 0.1.0
-PORTREVISION= 5
+PORTVERSION= 0.2
CATEGORIES= x11 gnustep
MASTER_SITES= # empty
DISTFILES= # empty
@@ -52,8 +51,9 @@ USE_GNUSTEP_LOCAL_LIBS+= \
SystemConfig:deskutils/etoile-systemconfig \
MultimediaKit:multimedia/etoile-multimediakit \
EtoileUI:deskutils/etoile-ui \
+ DistributedView:deskutils/etoile-distributedview \
-# DistributedView:deskutils/etoile-distributedview \
+# InspectorKit:deskutils/etoile-inspectorkit \
USE_GNUSTEP_SYSTEM_BUNDLES+= \
EtoileMenus:x11-themes/etoile-etoilemenus \
@@ -68,6 +68,7 @@ USE_GNUSTEP_LOCAL_THEMES+= \
WildMenus:x11-themes/etoile-wildmenus \
USE_GNUSTEP_SYSTEM_APPS+= \
+ Azalea:x11-wm/etoile-azalea \
AZDock:x11-wm/etoile-azdock \
AZBackground:x11-themes/etoile-azbackground \
@@ -77,7 +78,6 @@ USE_GNUSTEP_LOCAL_APPS+= \
Installer:sysutils/etoile-installer \
Hardware:deskutils/etoile-hardware \
LookAndBehavior:deskutils/etoile-lookandbehavior \
- Azalea:x11-wm/etoile-azalea \
EtoileMenuServer:deskutils/etoile-menuserver \
Vindaloo:graphics/vindaloo \
Typewriter:editors/etoile-typewriter \
diff --git a/x11/gnustep-app/Makefile b/x11/gnustep-app/Makefile
index 700c5a0c6db8..29deb28d62f1 100644
--- a/x11/gnustep-app/Makefile
+++ b/x11/gnustep-app/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gnustep-app
-PORTVERSION= 1.13.0
-PORTREVISION= 24
+PORTVERSION= 1.14.3
CATEGORIES= x11 gnustep
MASTER_SITES= # empty
DISTFILES= # empty
@@ -76,6 +75,9 @@ USE_GNUSTEP_LOCAL_LIBS+= \
SystemConfig:deskutils/etoile-systemconfig \
MultimediaKit:multimedia/etoile-multimediakit \
EtoileUI:deskutils/etoile-ui \
+ DistributedView:deskutils/etoile-distributedview \
+
+# InspectorKit:deskutils/etoile-inspectorkit \
USE_GNUSTEP_SYSTEM_BUNDLES+= \
EtoileMenus:x11-themes/etoile-etoilemenus \
@@ -106,14 +108,13 @@ USE_GNUSTEP_SYSTEM_APPS+= \
SystemPreferences:deskutils/systempreferences \
WrapperFactory:deskutils/gnustep-wrapper \
GRubik:games/grubik \
+ Azalea:x11-wm/etoile-azalea \
AZDock:x11-wm/etoile-azdock \
Position:astro/position \
AZBackground:x11-themes/etoile-azbackground \
ClipBook:deskutils/gworkspace-clipbook \
MDFinder:deskutils/gworkspace-gwmetadata \
-# DistributedView:deskutils/etoile-distributedview \
-
USE_GNUSTEP_LOCAL_APPS+= \
Gomoku:games/gomoku.app \
GNUMail:mail/gnumail \
@@ -175,7 +176,6 @@ USE_GNUSTEP_LOCAL_APPS+= \
Installer:sysutils/etoile-installer \
Hardware:deskutils/etoile-hardware \
LookAndBehavior:deskutils/etoile-lookandbehavior \
- Azalea:x11-wm/etoile-azalea \
EtoileMenuServer:deskutils/etoile-menuserver \
Expense:finance/expense \
FreeTar:archivers/freetar \