- update to etoile 0.2

5 files changed, 37 insertions, 25 deletions

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 \