- update etoile-0.4.0

9 files changed, 247 insertions, 75 deletions

diff --git a/x11-themes/etoile-camaelon/Makefile b/x11-themes/etoile-camaelon/Makefile
index 063c21263a38..93dfd8f8ffc3 100644
--- a/x11-themes/etoile-camaelon/Makefile
+++ b/x11-themes/etoile-camaelon/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	camaelon
-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=	Etoile Project Camaelon bundle
 
+USE_BZIP2=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
diff --git a/x11-themes/etoile-camaelon/distinfo b/x11-themes/etoile-camaelon/distinfo
index 2ac1ee4891af..2c1e8a612c54 100644
--- a/x11-themes/etoile-camaelon/distinfo
+++ b/x11-themes/etoile-camaelon/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-camaelon/pkg-plist b/x11-themes/etoile-camaelon/pkg-plist
index e7bd4dcc2b6d..f134a4e1f1a4 100644
--- a/x11-themes/etoile-camaelon/pkg-plist
+++ b/x11-themes/etoile-camaelon/pkg-plist
@@ -1,5 +1,216 @@
 System/Library/Bundles/Camaelon.themeEngine/Camaelon
 System/Library/Bundles/Camaelon.themeEngine/Resources/Info-gnustep.plist
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Arrows/checkmark.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Arrows/hierarchical-arrows-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Arrows/hierarchical-arrows-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Arrows/popup-arrows.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/BevelButton/BevelButton-corners-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/BevelButton/BevelButton-corners-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/BevelButton/BevelButton-corners-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/BevelButton/BevelButton-fill-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/BevelButton/BevelButton-fill-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/BevelButton/BevelButton-fill-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/BevelButton/BevelButton-left-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/BevelButton/BevelButton-left-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/BevelButton/BevelButton-left-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/BevelButton/BevelButton-right-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/BevelButton/BevelButton-right-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/BevelButton/BevelButton-right-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/BevelButton/BevelButton-topbottom-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/BevelButton/BevelButton-topbottom-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/BevelButton/BevelButton-topbottom-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/BrowserHeader/BrowserHeader-caps.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/BrowserHeader/BrowserHeader-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/BrowserHeader/BrowserHeader-textcolor.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Button/Button-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Button/Button-fill-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Button/Button-fill-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Button/Button-fill-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Button/Button-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Button/Button-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Button/Button-unselected.xcf
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/COPYING
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Checkbox/Checkbox-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Checkbox/Checkbox-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Checkbox/Checkbox-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Colors/Colors-alternate-row-background.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Colors/Colors-control-background.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Colors/Colors-row-background.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Colors/Colors-row-text.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Colors/Colors-selected-control.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Colors/Colors-selected-row-background.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Colors/Colors-selected-row-text.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Colors/Colors-selected-text-background.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Colors/Colors-selected-text.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Colors/Colors-selected-titlebar-text.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Colors/Colors-titlebar-text.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Colors/Colors-toolbar-key.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Colors/Colors-toolbar-main.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Colors/Colors-toolbar.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Colors/Colors-window-background-key.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Colors/Colors-window-background-main.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Colors/Colors-window-background.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Colors/Colors-window-border.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Elements/Knob
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Elements/Knob.png
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Elements/Knob.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Elements/Untitled-1.tif
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/GroupBox/GroupBox-bottom-left.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/GroupBox/GroupBox-bottom-right.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/GroupBox/GroupBox-bottom.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/GroupBox/GroupBox-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/GroupBox/GroupBox-left.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/GroupBox/GroupBox-right.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/GroupBox/GroupBox-top-left.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/GroupBox/GroupBox-top-right.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/GroupBox/GroupBox-top.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Info.plist
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ListHeader/ListHeader-caps-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ListHeader/ListHeader-corner.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ListHeader/ListHeader-fill-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ListHeader/ListHeader-fill-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ListHeader/ListHeader-separator-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ListHeader/ListHeader-separator-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Menu/Menu-background-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Menu/Menu-background-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Menu/Menu-hierarchicalArrow-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Menu/Menu-hierarchicalArrow-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Menu/Menu-titlebar-caps.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Menu/Menu-titlebar-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/PopupButton/PopupButton-ArrowEnds-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/PopupButton/PopupButton-ArrowEnds.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/PopupButton/PopupButton-arrows-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/PopupButton/PopupButton-arrows.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/PopupButton/PopupButton-endcap-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/PopupButton/PopupButton-endcap.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/PopupButton/PopupButton-fill-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/PopupButton/PopupButton-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ProgressBar/ProgressBar-horizontal-background-caps-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ProgressBar/ProgressBar-horizontal-background-caps.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ProgressBar/ProgressBar-horizontal-background-fill-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ProgressBar/ProgressBar-horizontal-background-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ProgressBar/ProgressBar-horizontal-caps.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ProgressBar/ProgressBar-horizontal-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ProgressBar/ProgressBar-horizontal-fill.xcf
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ProgressBar/ProgressBar-horizontal-indicator.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ProgressBar/ProgressBar-vertical-background-caps-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ProgressBar/ProgressBar-vertical-background-caps.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ProgressBar/ProgressBar-vertical-background-fill-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ProgressBar/ProgressBar-vertical-background-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ProgressBar/ProgressBar-vertical-indicator.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/RadioButton/RadioButton-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/RadioButton/RadioButton-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/RadioButton/RadioButton-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Scrollbar/Scrollbar-horizontal-slot-arrows-left.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Scrollbar/Scrollbar-horizontal-slot-arrows-right.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Scrollbar/Scrollbar-horizontal-slot-arrows-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Scrollbar/Scrollbar-horizontal-slot-arrows.xcf
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Scrollbar/Scrollbar-horizontal-slot-caps.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Scrollbar/Scrollbar-horizontal-slot-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Scrollbar/Scrollbar-horizontal-slot-left.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Scrollbar/Scrollbar-horizontal-slot-right.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Scrollbar/Scrollbar-horizontal-thumb-caps.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Scrollbar/Scrollbar-horizontal-thumb-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Scrollbar/Scrollbar-vertical-slot-arrows-bottom.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Scrollbar/Scrollbar-vertical-slot-arrows-top.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Scrollbar/Scrollbar-vertical-slot-arrows-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Scrollbar/Scrollbar-vertical-slot-arrows-unselected.xcf
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Scrollbar/Scrollbar-vertical-slot-arrows.xcf
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Scrollbar/Scrollbar-vertical-slot-caps.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Scrollbar/Scrollbar-vertical-slot-down.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Scrollbar/Scrollbar-vertical-slot-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Scrollbar/Scrollbar-vertical-slot-up.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Scrollbar/Scrollbar-vertical-thumb-caps.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Scrollbar/Scrollbar-vertical-thumb-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ShadowlessButton/ShadowlessButton-corners-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ShadowlessButton/ShadowlessButton-corners-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ShadowlessButton/ShadowlessButton-corners-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ShadowlessButton/ShadowlessButton-fill-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ShadowlessButton/ShadowlessButton-fill-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ShadowlessButton/ShadowlessButton-fill-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ShadowlessButton/ShadowlessButton-left-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ShadowlessButton/ShadowlessButton-left-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ShadowlessButton/ShadowlessButton-left-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ShadowlessButton/ShadowlessButton-right-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ShadowlessButton/ShadowlessButton-right-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ShadowlessButton/ShadowlessButton-right-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ShadowlessButton/ShadowlessButton-topbottom-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ShadowlessButton/ShadowlessButton-topbottom-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ShadowlessButton/ShadowlessButton-topbottom-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Slider/Slider-horizontal-thumb-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Slider/Slider-horizontal-thumb.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Slider/Slider-horizontal-tickmark-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Slider/Slider-horizontal-tickmark.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Slider/Slider-horizontal-track-caps-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Slider/Slider-horizontal-track-caps.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Slider/Slider-horizontal-track-fill-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Slider/Slider-horizontal-track-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Slider/Slider-hozizontal-track-caps-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Slider/Slider-vertical-thumb-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Slider/Slider-vertical-thumb.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Slider/Slider-vertical-tickmark-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Slider/Slider-vertical-tickmark.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Slider/Slider-vertical-track-caps-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Slider/Slider-vertical-track-caps.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Slider/Slider-vertical-track-fill-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Slider/Slider-vertical-track-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/Tabs-junction-selected-right.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/Tabs-junction-selected-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/Tabs-junction-unselected-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/Tabs-pane-bottom.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/Tabs-pane-corners.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/Tabs-pane-fill-stripes.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/Tabs-pane-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/Tabs-pane-left.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/Tabs-pane-leftright.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/Tabs-pane-right.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/Tabs-pane-top.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/Tabs-pane-topbottom.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/Tabs-panebar-caps.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/Tabs-panebar-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/Tabs-selected-caps.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/Tabs-selected-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/Tabs-unselected-caps.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/Tabs-unselected-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/old/Tabs-selected-caps.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/old/Tabs-selected-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/old/Tabs-unselected-caps.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/old/Tabs-unselected-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/prev/Tabs-pane-corners.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/prev/Tabs-pane-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/prev/Tabs-pane-leftright.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/prev/Tabs-pane-topbottom.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/prev/Tabs-selected-caps.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/prev/Tabs-selected-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/prev/Tabs-unselected-caps.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/prev/Tabs-unselected-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Textfield/Textfield-corners-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Textfield/Textfield-corners-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Textfield/Textfield-corners-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Textfield/Textfield-leftright-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Textfield/Textfield-leftright-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Textfield/Textfield-leftright-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Textfield/Textfield-topbottom-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Textfield/Textfield-topbottom-selected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Textfield/Textfield-topbottom-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Window/Window-background.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Window/Window-background.tiff-gray
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Window/Window-background.tiff-metal
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Window/Window-background.tiff-stripes
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Window/Window-resizebar-caps-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Window/Window-resizebar-caps.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Window/Window-resizebar-fill-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Window/Window-resizebar-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Window/Window-titlebar-caps-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Window/Window-titlebar-caps-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Window/Window-titlebar-caps.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Window/Window-titlebar-closebutton-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Window/Window-titlebar-closebutton.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Window/Window-titlebar-fill-disabled.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Window/Window-titlebar-fill-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Window/Window-titlebar-fill.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Window/Window-titlebar-minimizebutton-unselected.tiff
+System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Window/Window-titlebar-minimizebutton.tiff
 System/Library/Bundles/Camaelon.themeEngine/Resources/Nesedah.theme/Arrows/checkmark.tiff
 System/Library/Bundles/Camaelon.themeEngine/Resources/Nesedah.theme/Arrows/hierarchical-arrows-selected.tiff
 System/Library/Bundles/Camaelon.themeEngine/Resources/Nesedah.theme/Arrows/hierarchical-arrows-unselected.tiff
@@ -232,5 +443,31 @@ System/Library/Bundles/Camaelon.themeEngine/stamp.make
 @dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Nesedah.theme/BevelButton
 @dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Nesedah.theme/Arrows
 @dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Nesedah.theme
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Window
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Titlebar
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Textfield
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/prev
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs/old
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Tabs
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Slider
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ShadowlessButton/BevelButton
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ShadowlessButton
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Scrollbar/Elements
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Scrollbar
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/RadioButton
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ProgressBar
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/PopupButton
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Menu
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/ListHeader
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/GroupBox
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Elements
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Colors
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Checkbox
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Button
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/BrowserHeader
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/BevelButton/BevelButton
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/BevelButton
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme/Arrows
+@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources/Narcissus.theme
 @dirrm System/Library/Bundles/Camaelon.themeEngine/Resources
 @dirrm System/Library/Bundles/Camaelon.themeEngine
diff --git a/x11-themes/etoile-etoilemenus/Makefile b/x11-themes/etoile-etoilemenus/Makefile
index 82331610e692..42994eb8c78e 100644
--- a/x11-themes/etoile-etoilemenus/Makefile
+++ b/x11-themes/etoile-etoilemenus/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	etoilemenus
-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=	Etoile Project EtoileMenus bundle
 
+USE_BZIP2=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
diff --git a/x11-themes/etoile-etoilemenus/distinfo b/x11-themes/etoile-etoilemenus/distinfo
index 2ac1ee4891af..2c1e8a612c54 100644
--- a/x11-themes/etoile-etoilemenus/distinfo
+++ b/x11-themes/etoile-etoilemenus/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-etoilemenus/files/patch-GSHorizontalMenuItemCell.m b/x11-themes/etoile-etoilemenus/files/patch-GSHorizontalMenuItemCell.m
deleted file mode 100644
index 821091a7f9a1..000000000000
--- a/x11-themes/etoile-etoilemenus/files/patch-GSHorizontalMenuItemCell.m
+++ /dev/null
@@ -1,10 +0,0 @@
---- Bundles/EtoileWildMenus/GSHorizontalMenuItemCell.m.orig	2006-05-06 21:13:03.000000000 +0200
-+++ Bundles/EtoileWildMenus/GSHorizontalMenuItemCell.m	2008-05-03 09:22:21.000000000 +0200
-@@ -22,6 +22,7 @@
- 
- #import "GSHorizontalMenuItemCell.h"
- 
-+#import <AppKit/NSAttributedString.h>
- #import <AppKit/NSGraphics.h>
- #import <AppKit/NSImage.h>
- #import <AppKit/NSParagraphStyle.h>
diff --git a/x11-themes/etoile-etoilemenus/files/patch-GSHorizontalMenuView.m b/x11-themes/etoile-etoilemenus/files/patch-GSHorizontalMenuView.m
deleted file mode 100644
index b8d6225b99ad..000000000000
--- a/x11-themes/etoile-etoilemenus/files/patch-GSHorizontalMenuView.m
+++ /dev/null
@@ -1,10 +0,0 @@
---- Bundles/EtoileWildMenus/GSHorizontalMenuView.m.orig	2006-12-04 23:08:17.000000000 +0100
-+++ Bundles/EtoileWildMenus/GSHorizontalMenuView.m	2008-05-03 09:23:03.000000000 +0200
-@@ -23,6 +23,7 @@
- #include "GSHorizontalMenuView.h"
- #include <Foundation/Foundation.h>
- 
-+#import <AppKit/NSAttributedString.h>
- #import <AppKit/NSParagraphStyle.h>
- #import <AppKit/NSImage.h>
- #import <AppKit/NSColor.h>
diff --git a/x11-themes/etoile-etoilemenus/files/patch-NSMenu+Hackery.m b/x11-themes/etoile-etoilemenus/files/patch-NSMenu+Hackery.m
deleted file mode 100644
index 7f415f75b939..000000000000
--- a/x11-themes/etoile-etoilemenus/files/patch-NSMenu+Hackery.m
+++ /dev/null
@@ -1,35 +0,0 @@
---- Bundles/EtoileWildMenus/NSMenu+Hackery.m.orig	2008-01-04 00:44:24.000000000 +0100
-+++ Bundles/EtoileWildMenus/NSMenu+Hackery.m	2008-01-04 00:46:07.000000000 +0100
-@@ -27,6 +27,8 @@
- #include <AppKit/NSMenuView.h>
- #include <AppKit/NSWindow.h>
- 
-+#include <GNUstepGUI/GSVersion.h>
-+
- #include "NSMenu+Hackery.h"
- 
- #import "MenuBarHeight.h"
-@@ -47,7 +49,11 @@
- 
- - (void) shiftOnScreen
- {
-+#if (GNUSTEP_GUI_MINOR_VERSION < 13)
-   NSWindow *theWindow = _transient ? _bWindow : _aWindow;
-+#else
-+  NSWindow *theWindow = _menu.transient ? _bWindow : _aWindow;
-+#endif
-   NSRect    frameRect = [theWindow frame];
-   NSRect    screenRect = [[NSScreen mainScreen] frame];
-   NSPoint   vector    = {0.0, 0.0};
-@@ -103,7 +109,11 @@
- - (void) _rightMouseDisplay: (NSEvent*)theEvent 
- {
-   // enable context menus to function
-+#if (GNUSTEP_GUI_MINOR_VERSION < 13)
-   if (_horizontal == NO && [(NSMenuView *) _view isHorizontal] == NO)
-+#else
-+  if (_menu.horizontal == NO && [(NSMenuView *) _view isHorizontal] == NO)
-+#endif
-     {
-       [self displayTransient];
-       [_view mouseDown: theEvent];
diff --git a/x11-themes/etoile-etoilemenus/files/patch-NSMenuView+Hackery.m b/x11-themes/etoile-etoilemenus/files/patch-NSMenuView+Hackery.m
deleted file mode 100644
index 40ad0604a881..000000000000
--- a/x11-themes/etoile-etoilemenus/files/patch-NSMenuView+Hackery.m
+++ /dev/null
@@ -1,10 +0,0 @@
---- Bundles/EtoileWildMenus/NSMenuView+Hackery.m.orig	2007-08-03 16:46:33.000000000 +0200
-+++ Bundles/EtoileWildMenus/NSMenuView+Hackery.m	2008-08-11 10:28:16.000000000 +0200
-@@ -24,6 +24,7 @@
- #include "NSMenuView+Hackery.h"
- 
- #import <AppKit/NSApplication.h>
-+#import <AppKit/NSEvent.h>
- #import <AppKit/PSOperators.h>
- 
- #import "EtoileMenuTitleView.h"