- update etoile-0.4.0

3 files changed, 56 insertions, 56 deletions

diff --git a/deskutils/etoile-menuserver/Makefile b/deskutils/etoile-menuserver/Makefile
index f0de63b4b260..93ba9181820d 100644
--- a/deskutils/etoile-menuserver/Makefile
+++ b/deskutils/etoile-menuserver/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	menuserver
-PORTVERSION=	0.2
-PORTREVISION=	1
+PORTVERSION=	0.4.0
 CATEGORIES=	deskutils gnustep
 MASTER_SITES=	http://download.gna.org/etoile/
 PKGNAMEPREFIX=	etoile-
@@ -16,13 +15,14 @@ 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
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_SYSTEM_LIBS+=	XWindowServerKit:${XWINDOWSERVERKIT_PORT}
-USE_GNUSTEP_SYSTEM_LIBS+=	WorkspaceCommKit:${ETOILE_SYSTEM_PORT}
+USE_GNUSTEP_LOCAL_LIBS+=	SystemConfig:${SYSTEMCONFIG_PORT}
 
 WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Services/Private/MenuServer
@@ -30,6 +30,6 @@ ADDITIONAL_OBJCFLAGS+=	-I${LOCALBASE}/include
 ADDITIONAL_LDFLAGS+=	-L${LOCALBASE}/lib
 
 XWINDOWSERVERKIT_PORT?=		x11/etoile-xwindowserverkit
-ETOILE_SYSTEM_PORT?=		sysutils/etoile-system
+SYSTEMCONFIG_PORT?=		deskutils/etoile-systemconfig
 
 .include <bsd.port.mk>
diff --git a/deskutils/etoile-menuserver/distinfo b/deskutils/etoile-menuserver/distinfo
index 2ac1ee4891af..2c1e8a612c54 100644
--- a/deskutils/etoile-menuserver/distinfo
+++ b/deskutils/etoile-menuserver/distinfo
@@ -1,3 +1,3 @@
-MD5 (etoile-0.2.tar.gz) = cc1b54ba2e4ba371c5eda45c756bece9
-SHA256 (etoile-0.2.tar.gz) = 293cb9e5c50b27a8e38f16374c17595f20c5950ba44d00ffac3fb17ddd852d2c
-SIZE (etoile-0.2.tar.gz) = 21373391
+MD5 (etoile-0.4.0.tar.bz2) = 7c33baf8ec3a708d0d419b1e137452de
+SHA256 (etoile-0.4.0.tar.bz2) = 05b5f01932aaad2ae6251ae01a1ad5376d29c984ee83d9fb62688c8d4a20237a
+SIZE (etoile-0.4.0.tar.bz2) = 8225128
diff --git a/deskutils/etoile-menuserver/pkg-plist b/deskutils/etoile-menuserver/pkg-plist
index 9b934f5ccbd6..ac7ec3ceab6a 100644
--- a/deskutils/etoile-menuserver/pkg-plist
+++ b/deskutils/etoile-menuserver/pkg-plist
@@ -1,49 +1,49 @@
-Local/Applications/EtoileMenuServer.app/EtoileMenuServer
-Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/AboutEtoileEntry
-Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/Credits.rtf
-Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/Credits.tiff
-Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/English.lproj/AboutEtoileEntry.gorm/data.classes
-Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/English.lproj/AboutEtoileEntry.gorm/data.info
-Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/English.lproj/AboutEtoileEntry.gorm/objects.gorm
-Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/Info-gnustep.plist
-Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/stamp.make
-Local/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/ApplicationsEntry
-Local/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/English.lproj/ApplicationsPanel.gorm/data.classes
-Local/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/English.lproj/ApplicationsPanel.gorm/data.info
-Local/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/English.lproj/ApplicationsPanel.gorm/objects.gorm
-Local/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/Info-gnustep.plist
-Local/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/stamp.make
-Local/Applications/EtoileMenuServer.app/Resources/ClockMenulet.menulet/ClockMenulet
-Local/Applications/EtoileMenuServer.app/Resources/ClockMenulet.menulet/Resources/Info-gnustep.plist
-Local/Applications/EtoileMenuServer.app/Resources/ClockMenulet.menulet/stamp.make
-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/Info-gnustep.plist
-Local/Applications/EtoileMenuServer.app/Resources/MenuBarFiller.tiff
-Local/Applications/EtoileMenuServer.app/Resources/MenuBarLeftEdge.tiff
-Local/Applications/EtoileMenuServer.app/Resources/MenuBarRightEdge.tiff
-Local/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry/Resources/Info-gnustep.plist
-Local/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry/SystemPreferencesEntry
-Local/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry/stamp.make
-Local/Applications/EtoileMenuServer.app/stamp.make
-Local/Tools/EtoileMenuServer
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry/Resources
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/LookAndBehaviorEntry.sysbarentry/Resources
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/LookAndBehaviorEntry.sysbarentry
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/HardwareEntry.sysbarentry/Resources
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/HardwareEntry.sysbarentry
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/ClockMenulet.menulet/Resources
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/ClockMenulet.menulet
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/English.lproj/ApplicationsPanel.gorm
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/English.lproj
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/English.lproj/AboutEtoileEntry.gorm
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/English.lproj
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources
-@dirrm Local/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry
-@dirrm Local/Applications/EtoileMenuServer.app/Resources
-@dirrm Local/Applications/EtoileMenuServer.app
+System/Applications/EtoileMenuServer.app/EtoileMenuServer
+System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/AboutEtoileEntry
+System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/Credits.rtf
+System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/Credits.tiff
+System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/English.lproj/AboutEtoileEntry.gorm/data.classes
+System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/English.lproj/AboutEtoileEntry.gorm/data.info
+System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/English.lproj/AboutEtoileEntry.gorm/objects.gorm
+System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/Info-gnustep.plist
+System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/stamp.make
+System/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/ApplicationsEntry
+System/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/English.lproj/ApplicationsPanel.gorm/data.classes
+System/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/English.lproj/ApplicationsPanel.gorm/data.info
+System/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/English.lproj/ApplicationsPanel.gorm/objects.gorm
+System/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/Info-gnustep.plist
+System/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/stamp.make
+System/Applications/EtoileMenuServer.app/Resources/ClockMenulet.menulet/ClockMenulet
+System/Applications/EtoileMenuServer.app/Resources/ClockMenulet.menulet/Resources/Info-gnustep.plist
+System/Applications/EtoileMenuServer.app/Resources/ClockMenulet.menulet/stamp.make
+System/Applications/EtoileMenuServer.app/Resources/Etoile.tiff
+System/Applications/EtoileMenuServer.app/Resources/EtoileLogo.tiff
+System/Applications/EtoileMenuServer.app/Resources/EtoileLogoH.tiff
+System/Applications/EtoileMenuServer.app/Resources/EtoileMenuServer.desktop
+System/Applications/EtoileMenuServer.app/Resources/Info-gnustep.plist
+System/Applications/EtoileMenuServer.app/Resources/MenuBarFiller.tiff
+System/Applications/EtoileMenuServer.app/Resources/MenuBarLeftEdge.tiff
+System/Applications/EtoileMenuServer.app/Resources/MenuBarRightEdge.tiff
+System/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry/Resources/Info-gnustep.plist
+System/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry/SystemPreferencesEntry
+System/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry/stamp.make
+System/Applications/EtoileMenuServer.app/stamp.make
+System/Tools/EtoileMenuServer
+@dirrm System/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry/Resources
+@dirrm System/Applications/EtoileMenuServer.app/Resources/SystemPreferencesEntry.sysbarentry
+@dirrm System/Applications/EtoileMenuServer.app/Resources/LookAndBehaviorEntry.sysbarentry/Resources
+@dirrm System/Applications/EtoileMenuServer.app/Resources/LookAndBehaviorEntry.sysbarentry
+@dirrm System/Applications/EtoileMenuServer.app/Resources/HardwareEntry.sysbarentry/Resources
+@dirrm System/Applications/EtoileMenuServer.app/Resources/HardwareEntry.sysbarentry
+@dirrm System/Applications/EtoileMenuServer.app/Resources/ClockMenulet.menulet/Resources
+@dirrm System/Applications/EtoileMenuServer.app/Resources/ClockMenulet.menulet
+@dirrm System/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/English.lproj/ApplicationsPanel.gorm
+@dirrm System/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources/English.lproj
+@dirrm System/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry/Resources
+@dirrm System/Applications/EtoileMenuServer.app/Resources/ApplicationsEntry.sysbarentry
+@dirrm System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/English.lproj/AboutEtoileEntry.gorm
+@dirrm System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources/English.lproj
+@dirrm System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry/Resources
+@dirrm System/Applications/EtoileMenuServer.app/Resources/AboutEtoileEntry.sysbarentry
+@dirrm System/Applications/EtoileMenuServer.app/Resources
+@dirrm System/Applications/EtoileMenuServer.app