- update etoile-0.4.0

2 files changed, 48 insertions, 8 deletions

diff --git a/x11/etoile/Makefile b/x11/etoile/Makefile
index 348f79c8ef52..558d064e0889 100644
--- a/x11/etoile/Makefile
+++ b/x11/etoile/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	etoile
-PORTVERSION=	0.2
-PORTREVISION=	2
+PORTVERSION=	0.4.0
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -51,10 +50,17 @@ USE_GNUSTEP_LOCAL_LIBS+=	\
 	PaneKit:deskutils/etoile-panekit \
 	SystemConfig:deskutils/etoile-systemconfig \
 	MultimediaKit:multimedia/etoile-multimediakit \
+	EtoileSerialize:devel/etoile-serialize \
+	CoreObject:devel/etoile-coreobject \
 	EtoileUI:deskutils/etoile-ui \
 	DistributedView:deskutils/etoile-distributedview \
 	InspectorKit:deskutils/etoile-inspectorkit \
 	OPMLKit:textproc/etoile-opmlkit \
+	ScriptKit:lang/etoile-scriptkit \
+	MediaKit:multimedia/etoile-mediakit \
+	LanguageKit:lang/etoile-languagekit \
+	SmalltalkKit:lang/etoile-smalltalkkit \
+	XMPPKit:net-im/etoile-xmppkit \
 
 USE_GNUSTEP_SYSTEM_BUNDLES+=	\
 	EtoileMenus:x11-themes/etoile-etoilemenus \
@@ -68,12 +74,18 @@ USE_GNUSTEP_SYSTEM_THEMES+=	\
 USE_GNUSTEP_LOCAL_THEMES+=	\
 	WildMenus:x11-themes/etoile-wildmenus \
 
+USE_GNUSTEP_LOCAL_MENULETS+=	\
+	PowerMenulet.menulet:sysutils/etoile-powermenulet \
+	ServiceMenulet.menulet:deskutils/etoile-servicemenulet \
+	VolumeControlMenulet.menulet:audio/etoile-volumecontrolmenulet \
+
 USE_GNUSTEP_SYSTEM_APPS+=	\
 	Azalea:x11-wm/etoile-azalea \
 	AZDock:x11-wm/etoile-azdock \
 	AZBackground:x11-themes/etoile-azbackground \
 	AZSwitch:x11-wm/etoile-azswitch \
 	Login:x11-wm/etoile-login \
+	EtoileMenuServer:deskutils/etoile-menuserver \
 
 USE_GNUSTEP_LOCAL_APPS+=	\
 	DictionaryReader:deskutils/etoile-dictionaryreader \
@@ -81,15 +93,23 @@ USE_GNUSTEP_LOCAL_APPS+=	\
 	Installer:sysutils/etoile-installer \
 	Hardware:deskutils/etoile-hardware \
 	LookAndBehavior:deskutils/etoile-lookandbehavior \
-	EtoileMenuServer:deskutils/etoile-menuserver \
 	Vindaloo:graphics/vindaloo \
 	Typewriter:editors/etoile-typewriter \
 	Babbler:multimedia/etoile-babbler \
 	Mollusk:www/etoile-mollusk \
+	FontManager:x11-fm/etoile-fontmanager \
+	ScriptServices:deskutils/etoile-scriptservices \
+	Melodie:audio/etoile-melodie \
+	StepChat:net-im/etoile-stepchat \
 
 #	Mantella:www/etoile-mantella \
 
+USE_GNUSTEP_SYSTEM_TOOLS+=	\
+	Idle:x11/etoile-idle \
+	Corner:deskutils/etoile-corner \
+
 USE_GNUSTEP_LOCAL_TOOLS+=	\
 	ioobjc:lang/etoile-io \
+	edlc:lang/etoile-compiler \
 
 .include <bsd.port.mk>
diff --git a/x11/gnustep-app/Makefile b/x11/gnustep-app/Makefile
index f4a5aae4b818..a4246d8b14e9 100644
--- a/x11/gnustep-app/Makefile
+++ b/x11/gnustep-app/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnustep-app
 PORTVERSION=	1.14.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -75,10 +75,17 @@ USE_GNUSTEP_LOCAL_LIBS+=	\
 	PaneKit:deskutils/etoile-panekit \
 	SystemConfig:deskutils/etoile-systemconfig \
 	MultimediaKit:multimedia/etoile-multimediakit \
+	EtoileSerialize:devel/etoile-serialize \
+	CoreObject:devel/etoile-coreobject \
 	EtoileUI:deskutils/etoile-ui \
 	DistributedView:deskutils/etoile-distributedview \
 	InspectorKit:deskutils/etoile-inspectorkit \
 	OPMLKit:textproc/etoile-opmlkit \
+	ScriptKit:lang/etoile-scriptkit \
+	MediaKit:multimedia/etoile-mediakit \
+	LanguageKit:lang/etoile-languagekit \
+	SmalltalkKit:lang/etoile-smalltalkkit \
+	XMPPKit:net-im/etoile-xmppkit \
 
 USE_GNUSTEP_SYSTEM_BUNDLES+=	\
 	EtoileMenus:x11-themes/etoile-etoilemenus \
@@ -86,14 +93,18 @@ USE_GNUSTEP_SYSTEM_BUNDLES+=	\
 
 USE_GNUSTEP_LOCAL_BUNDLES+=	\
 	Cddb:audio/cddb-bundle	\
+	Burn/MP3ToWav:audio/mp3towav-bundle \
 
 USE_GNUSTEP_SYSTEM_THEMES+=	\
 	Camaelon:x11-themes/etoile-camaelon \
 
-#	MP3ToWav:audio/mp3towav-bundle \
-
 USE_GNUSTEP_LOCAL_THEMES+=	\
-	WildMenus:x11-themes/etoile-wildmenus
+	WildMenus:x11-themes/etoile-wildmenus \
+
+USE_GNUSTEP_LOCAL_MENULETS+=	\
+	PowerMenulet:sysutils/etoile-powermenulet \
+	ServiceMenulet:deskutils/etoile-servicemenulet \
+	VolumeControlMenulet:audio/etoile-volumecontrolmenulet \
 
 USE_GNUSTEP_SYSTEM_APPS+=	\
 	Gorm:devel/gorm \
@@ -116,6 +127,7 @@ USE_GNUSTEP_SYSTEM_APPS+=	\
 	MDFinder:deskutils/gworkspace-gwmetadata \
 	AZSwitch:x11-wm/etoile-azswitch \
 	Login:x11-wm/etoile-login \
+	EtoileMenuServer:deskutils/etoile-menuserver \
 
 USE_GNUSTEP_LOCAL_APPS+=	\
 	Gomoku:games/gomoku.app \
@@ -179,7 +191,6 @@ USE_GNUSTEP_LOCAL_APPS+=	\
 	Installer:sysutils/etoile-installer \
 	Hardware:deskutils/etoile-hardware \
 	LookAndBehavior:deskutils/etoile-lookandbehavior \
-	EtoileMenuServer:deskutils/etoile-menuserver \
 	Expense:finance/expense \
 	FreeTar:archivers/freetar \
 	CodeEditor:editors/codeeditor \
@@ -203,14 +214,23 @@ USE_GNUSTEP_LOCAL_APPS+=	\
 	BioCocoa:biology/biococoa \
 	Yap:graphics/yap \
 	Sudoku:games/gnustep-sudoku \
+	FontManager:x11-fm/etoile-fontmanager \
+	ScriptServices:deskutils/etoile-scriptservices \
+	Melodie:audio/etoile-melodie \
+	StepChat:net-im/etoile-stepchat \
 
 #	CameraTransfer:graphics/cameratransfer \
 #	Mantella:www/etoile-mantella \
 
+USE_GNUSTEP_SYSTEM_TOOLS+=	\
+	Idle:x11/etoile-idle \
+	Corner:deskutils/etoile-corner \
+
 USE_GNUSTEP_LOCAL_TOOLS+=	\
 	zillion:net/zillion \
 	adtool:mail/addresses-goodies \
 	ioobjc:lang/etoile-io \
+	edlc:lang/etoile-compiler \
 
 #	open:deskutils/openapp \