3 files changed, 29 insertions, 33 deletions

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