6 files changed, 19 insertions, 13 deletions

diff --git a/x11-themes/etoile-azbackground/Makefile b/x11-themes/etoile-azbackground/Makefile
index 2293d60ae738..74d012b90026 100644
--- a/x11-themes/etoile-azbackground/Makefile
+++ b/x11-themes/etoile-azbackground/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	azbackground
-PORTVERSION=	0.2
-PORTREVISION=	1
+PORTVERSION=	0.4.0
 CATEGORIES=	x11-themes gnustep
 MASTER_SITES=	http://download.gna.org/etoile/
 PKGNAMEPREFIX=	etoile-
@@ -16,6 +15,7 @@ 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
diff --git a/x11-themes/etoile-azbackground/distinfo b/x11-themes/etoile-azbackground/distinfo
index 2ac1ee4891af..2c1e8a612c54 100644
--- a/x11-themes/etoile-azbackground/distinfo
+++ b/x11-themes/etoile-azbackground/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/x11-themes/etoile-iconkit/Makefile b/x11-themes/etoile-iconkit/Makefile
index 9f302d9c18e7..eac7eebde0cb 100644
--- a/x11-themes/etoile-iconkit/Makefile
+++ b/x11-themes/etoile-iconkit/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	iconkit
-PORTVERSION=	0.2
-PORTREVISION=	1
+PORTVERSION=	0.4.0
 CATEGORIES=	x11-themes gnustep
 MASTER_SITES=	http://download.gna.org/etoile/
 PKGNAMEPREFIX=	etoile-
@@ -16,6 +15,9 @@ DISTNAME=	etoile-${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Etoile Project IconKit framework
 
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+
+USE_BZIP2=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
@@ -24,6 +26,7 @@ USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LOCAL_LIBS+=	UnitKit:${UNITKIT_PORT}
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
+DEFAULT_LIBVERSION=	0.2
 WRKSRC=	${WRKDIR}/Etoile-${PORTVERSION}
 USE_GNUSTEP_MAKE_DIRS+=	Frameworks/IconKit
 
diff --git a/x11-themes/etoile-iconkit/distinfo b/x11-themes/etoile-iconkit/distinfo
index 2ac1ee4891af..2c1e8a612c54 100644
--- a/x11-themes/etoile-iconkit/distinfo
+++ b/x11-themes/etoile-iconkit/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/x11-themes/etoile-iconkit/pkg-descr b/x11-themes/etoile-iconkit/pkg-descr
index b1742cf5200f..b5e6b15a8728 100644
--- a/x11-themes/etoile-iconkit/pkg-descr
+++ b/x11-themes/etoile-iconkit/pkg-descr
@@ -1,5 +1,7 @@
-This IconKit framework is used to create icons using different elements.
-It helps keeping consistency accross a set of icons (for example,
-using the same background..) and permit to easily create icons "families".
+This framework provides icon theming and various facilities to create icons at
+run-time by compositing by different elements.
+The icon compositing is very useful for the consistency accross a set of icons
+(for example, using the same background) and permit to easily create icon
+families. IconKit icon themes are a complement to Camaelon widget themes.
 
 WWW: http://www.etoile-project.org/
diff --git a/x11-themes/etoile-iconkit/pkg-plist b/x11-themes/etoile-iconkit/pkg-plist
index b0ccf59e4a90..06ba12a31f87 100644
--- a/x11-themes/etoile-iconkit/pkg-plist
+++ b/x11-themes/etoile-iconkit/pkg-plist
@@ -1,5 +1,6 @@
 Local/Library/Frameworks/IconKit.framework/Headers
 Local/Library/Frameworks/IconKit.framework/IconKit
+Local/Library/Frameworks/IconKit.framework/IconKit.framework
 Local/Library/Frameworks/IconKit.framework/Resources
 Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/Headers/IKIconTheme.h
 Local/Library/Frameworks/IconKit.framework/Versions/%%MAJORLIBVERSION%%/IconKit