6 files changed, 5 insertions, 70 deletions

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"