8 files changed, 42 insertions, 279 deletions

diff --git a/x11-toolkits/ewl/Makefile b/x11-toolkits/ewl/Makefile
index 5a93d4742186..00a47a63df96 100644
--- a/x11-toolkits/ewl/Makefile
+++ b/x11-toolkits/ewl/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	ewl
-PORTVERSION=	0.0.4.004
-pORTREVISION=	1
+PORTVERSION=	0.0.4.005
+pORTREVISION=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://enlightenment.freedesktop.org/files/
 
@@ -20,8 +20,6 @@ LIB_DEPENDS=	embryo.9:${PORTSDIR}/lang/embryo \
 		edje.5:${PORTSDIR}/graphics/edje \
 		ecore.1:${PORTSDIR}/x11/ecore
 
-BROKEN=		Does not build
-
 USE_X_PREFIX=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
diff --git a/x11-toolkits/ewl/distinfo b/x11-toolkits/ewl/distinfo
index a58b9c6ff852..45cdb5b6b19d 100644
--- a/x11-toolkits/ewl/distinfo
+++ b/x11-toolkits/ewl/distinfo
@@ -1,2 +1,3 @@
-MD5 (ewl-0.0.4.004.tar.gz) = aed8f9eaf06ed5f0120d6f9ce2dc985c
-SIZE (ewl-0.0.4.004.tar.gz) = 1222523
+MD5 (ewl-0.0.4.005.tar.gz) = d5a16e0028023bd92b0f59b5a79bf35f
+SHA256 (ewl-0.0.4.005.tar.gz) = 5d9336dbc2a63082b2e18bcbb7784168572c7aefe33e0af7e4020e13e3a762ea
+SIZE (ewl-0.0.4.005.tar.gz) = 2336547
diff --git a/x11-toolkits/ewl/files/patch-src_bin_ewl_test.h b/x11-toolkits/ewl/files/patch-src_bin_ewl_test.h
deleted file mode 100644
index 9a3f7c1e01c0..000000000000
--- a/x11-toolkits/ewl/files/patch-src_bin_ewl_test.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/bin/ewl_test.h.orig	Mon Jul 11 08:14:53 2005
-+++ src/bin/ewl_test.h	Sun Sep 25 11:25:52 2005
-@@ -1,5 +1,15 @@
- #include "Ewl.h"
--#include <ewl-config.h>
-+#include <ewl_macros.h>
-+#ifdef HAVE_CONFIG_H
-+#include "ewl-config.h"
-+#endif
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <dirent.h>
-+#include <limits.h>
-+#include <sys/stat.h>
- 
- #if HAVE___ATTRIBUTE__
- #define __UNUSED__ __attribute__((unused))
diff --git a/x11-toolkits/ewl/files/patch-src_lib_Ewl.h.in b/x11-toolkits/ewl/files/patch-src_lib_Ewl.h.in
deleted file mode 100644
index 3838b3061f64..000000000000
--- a/x11-toolkits/ewl/files/patch-src_lib_Ewl.h.in
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/lib/Ewl.h.in.orig	Mon Jul 11 08:14:53 2005
-+++ src/lib/Ewl.h.in	Sun Sep 25 11:14:35 2005
-@@ -255,23 +255,10 @@
- #endif
- 
- #include <Evas.h>
--#include <Edje.h>
- #include <Ecore.h>
--#include <Edb.h>
--
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--#include <limits.h>
--#include <ctype.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--#include <unistd.h>
--
--#ifndef PATH_MAX
--#define PATH_MAX 4096
--#endif
-+#include <Ecore_Data.h>
- 
-+#include <ewl_private.h>
- #include <ewl_enums.h>
- 
- #include <ewl_object.h>
diff --git a/x11-toolkits/ewl/files/patch-src_lib_emacros.h b/x11-toolkits/ewl/files/patch-src_lib_emacros.h
deleted file mode 100644
index 1ea820b9d6d2..000000000000
--- a/x11-toolkits/ewl/files/patch-src_lib_emacros.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/lib/ewl_macros.h.orig	Mon Mar 28 22:32:27 2005
-+++ src/lib/ewl_macros.h	Sun Sep 25 10:58:16 2005
-@@ -58,10 +58,12 @@
-  */
- #define ZERO(ptr, type, num) ptr = memset(ptr, 0, sizeof(type) * (num))
- 
--#if HAVE___ATTRIBUTE__
--#define __UNUSED__ __attribute__((unused))
--#else
--#define __UNUSED__
-+#ifndef MIN
-+#define MIN(x, y) (((x) > (y)) ? (y) : (x))
-+#endif
-+
-+#ifndef MAX
-+#define MAX(x, y) (((x) > (y)) ? (x) : (y))
- #endif
- 
- #endif				/* __EWL_MACROS_H__ */
diff --git a/x11-toolkits/ewl/files/patch-src_lib_ewl_config.c b/x11-toolkits/ewl/files/patch-src_lib_ewl_config.c
deleted file mode 100644
index 3c73c10bf38c..000000000000
--- a/x11-toolkits/ewl/files/patch-src_lib_ewl_config.c
+++ /dev/null
@@ -1,145 +0,0 @@
---- src/lib/ewl_config.c.orig	Mon Mar 28 22:32:26 2005
-+++ src/lib/ewl_config.c	Sun Sep 25 11:20:04 2005
-@@ -210,8 +210,8 @@
- 
- 		cc = ewl_config_int_get("/ewl/theme/color_classes/count");
- 		prop = ecore_config_get("/ewl/theme/color_classes/count");
--		prop->flags &= ~PF_MODIFIED;
--		prop->flags |= PF_SYSTEM;
-+		prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+		prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 		for (i = 0; i < cc; i++) {
- 			char *name;
-@@ -221,8 +221,8 @@
- 					"/ewl/theme/color_classes/%d/name", i);
- 			name = ewl_config_str_get(key);
- 			prop = ecore_config_get(key);
--			prop->flags &= ~PF_MODIFIED;
--			prop->flags |= PF_SYSTEM;
-+			prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+			prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 			if (name) {
- 				int r, g, b, a;
-@@ -233,85 +233,85 @@
- 						"/ewl/theme/color_classes/%d/r", i);
- 				r = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				snprintf(key, PATH_MAX,
- 						"/ewl/theme/color_classes/%d/g", i);
- 				g = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				snprintf(key, PATH_MAX,
- 						"/ewl/theme/color_classes/%d/b", i);
- 				b = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				snprintf(key, PATH_MAX,
- 						"/ewl/theme/color_classes/%d/a", i);
- 				a = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				snprintf(key, PATH_MAX,
- 						"/ewl/theme/color_classes/%d/r2", i);
- 				r2 = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				snprintf(key, PATH_MAX,
- 						"/ewl/theme/color_classes/%d/g2", i);
- 				g2 = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				snprintf(key, PATH_MAX,
- 						"/ewl/theme/color_classes/%d/b2", i);
- 				b2 = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				snprintf(key, PATH_MAX,
- 						"/ewl/theme/color_classes/%d/a2", i);
- 				a2 = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				snprintf(key, PATH_MAX,
- 						"/ewl/theme/color_classes/%d/r3", i);
- 				r3 = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				snprintf(key, PATH_MAX,
- 						"/ewl/theme/color_classes/%d/g3", i);
- 				g3 = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				snprintf(key, PATH_MAX,
- 						"/ewl/theme/color_classes/%d/b3", i);
- 				b3 = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				snprintf(key, PATH_MAX,
- 						"/ewl/theme/color_classes/%d/a3", i);
- 				a3 = ewl_config_int_get(key);
- 				prop = ecore_config_get(key);
--				prop->flags &= ~PF_MODIFIED;
--				prop->flags |= PF_SYSTEM;
-+				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 
- 				edje_color_class_set(name, r, g, b, a,
- 						r2, g2, b2, a2,
-@@ -389,8 +389,8 @@
- 
- 		for(i = 0; keys[i] != NULL; i++) {
- 			prop = ecore_config_get(keys[i]);
--			prop->flags &= ~PF_MODIFIED;
--			prop->flags |= PF_SYSTEM;
-+			prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+			prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- 		}
- 
- 		ecore_config_listen("ewl_debug_enable", "/ewl/debug/enable",
diff --git a/x11-toolkits/ewl/files/patch-src_lib_ewl_private.h b/x11-toolkits/ewl/files/patch-src_lib_ewl_private.h
deleted file mode 100644
index d0ae2a222307..000000000000
--- a/x11-toolkits/ewl/files/patch-src_lib_ewl_private.h
+++ /dev/null
@@ -1,52 +0,0 @@
---- /dev/null	Sun Sep 25 11:15:00 2005
-+++ src/lib/ewl_private.h	Mon Sep  5 22:20:30 2005
-@@ -0,0 +1,49 @@
-+#ifndef _EWL_PRIVATE_H
-+#define _EWL_PRIVATE_H
-+
-+#include <Ecore_Config.h>
-+#include <Ecore_File.h>
-+#include <Edje.h>
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <limits.h>
-+#include <ctype.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
-+#include <math.h>
-+#include <assert.h>
-+#include <time.h>
-+#include <regex.h>
-+
-+#ifdef HAVE_CONFIG_H
-+#include "ewl-config.h"
-+#endif
-+
-+#ifdef HAVE_EVAS_ENGINE_FB_H
-+#include <Ecore_Fb.h>
-+#include <Evas_Engine_FB.h>
-+#endif
-+
-+#ifdef HAVE_EVAS_ENGINE_GL_X11_H
-+#include <Evas_Engine_GL_X11.h>
-+#endif
-+
-+#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
-+#include <Ecore_X.h>
-+#include <Evas_Engine_Software_X11.h>
-+#endif
-+
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
-+
-+#if HAVE___ATTRIBUTE__
-+#define __UNUSED__ __attribute__((unused))
-+#else
-+#define __UNUSED__
-+#endif
-+
-+#endif
diff --git a/x11-toolkits/ewl/pkg-plist b/x11-toolkits/ewl/pkg-plist
index ff1517bd370f..d338b35aef0b 100644
--- a/x11-toolkits/ewl/pkg-plist
+++ b/x11-toolkits/ewl/pkg-plist
@@ -1,13 +1,12 @@
 bin/ewl-config
-bin/ewl_edb_ed
 bin/ewl_embed_test
 bin/ewl_simple_test
 bin/ewl_test
 include/ewl/Ewl.h
+include/ewl/ewl_attach.h
 include/ewl/ewl_border.h
 include/ewl/ewl_box.h
 include/ewl/ewl_button.h
-include/ewl/ewl_button_stock.h
 include/ewl/ewl_calendar.h
 include/ewl/ewl_callback.h
 include/ewl/ewl_colordialog.h
@@ -21,6 +20,7 @@ include/ewl/ewl_container.h
 include/ewl/ewl_datepicker.h
 include/ewl/ewl_debug.h
 include/ewl/ewl_dialog.h
+include/ewl/ewl_dnd.h
 include/ewl/ewl_embed.h
 include/ewl/ewl_entry.h
 include/ewl/ewl_enums.h
@@ -28,7 +28,9 @@ include/ewl/ewl_events.h
 include/ewl/ewl_filedialog.h
 include/ewl/ewl_fileselector.h
 include/ewl/ewl_floater.h
+include/ewl/ewl_freebox.h
 include/ewl/ewl_grid.h
+include/ewl/ewl_icon.h
 include/ewl/ewl_iconbox.h
 include/ewl/ewl_image.h
 include/ewl/ewl_imenu.h
@@ -36,6 +38,7 @@ include/ewl/ewl_label.h
 include/ewl/ewl_macros.h
 include/ewl/ewl_menu.h
 include/ewl/ewl_menu_base.h
+include/ewl/ewl_menu_item.h
 include/ewl/ewl_menubar.h
 include/ewl/ewl_misc.h
 include/ewl/ewl_notebook.h
@@ -49,8 +52,6 @@ include/ewl/ewl_row.h
 include/ewl/ewl_scrollbar.h
 include/ewl/ewl_scrollpane.h
 include/ewl/ewl_seeker.h
-include/ewl/ewl_selectionbar.h
-include/ewl/ewl_selectionbook.h
 include/ewl/ewl_separator.h
 include/ewl/ewl_spacer.h
 include/ewl/ewl_spectrum.h
@@ -59,8 +60,8 @@ include/ewl/ewl_statusbar.h
 include/ewl/ewl_table.h
 include/ewl/ewl_text.h
 include/ewl/ewl_theme.h
-include/ewl/ewl_tooltip.h
 include/ewl/ewl_tree.h
+include/ewl/ewl_tree2.h
 include/ewl/ewl_widget.h
 include/ewl/ewl_window.h
 lib/libewl.a
@@ -82,6 +83,8 @@ share/aclocal/ewl.m4
 %%DATADIR%%/examples/ewl_filedialog_test.c
 %%DATADIR%%/examples/ewl_fileselector_test.c
 %%DATADIR%%/examples/ewl_floater_test.c
+%%DATADIR%%/examples/ewl_freebox_test.c
+%%DATADIR%%/examples/ewl_icon_test.c
 %%DATADIR%%/examples/ewl_iconbox_test.c
 %%DATADIR%%/examples/ewl_image_test.c
 %%DATADIR%%/examples/ewl_imenu_test.c
@@ -92,22 +95,46 @@ share/aclocal/ewl.m4
 %%DATADIR%%/examples/ewl_password_test.c
 %%DATADIR%%/examples/ewl_progressbar_test.c
 %%DATADIR%%/examples/ewl_seeker_test.c
-%%DATADIR%%/examples/ewl_selectionbar_test.c
-%%DATADIR%%/examples/ewl_selectionbook_test.c
 %%DATADIR%%/examples/ewl_spinner_test.c
 %%DATADIR%%/examples/ewl_statusbar_test.c
 %%DATADIR%%/examples/ewl_table_test.c
 %%DATADIR%%/examples/ewl_test.c
 %%DATADIR%%/examples/ewl_test.h
+%%DATADIR%%/examples/ewl_text_editor_test.c
 %%DATADIR%%/examples/ewl_text_test.c
 %%DATADIR%%/examples/ewl_theme_test.c
 %%DATADIR%%/examples/ewl_tooltip_test.c
 %%DATADIR%%/examples/ewl_tree_test.c
-%%DATADIR%%/themes/default.edj
+%%DATADIR%%/images/Draw.png
+%%DATADIR%%/images/End.png
+%%DATADIR%%/images/NewBCard.png
+%%DATADIR%%/images/Open.png
+%%DATADIR%%/images/Package.png
+%%DATADIR%%/images/World.png
+%%DATADIR%%/images/banner-top.png
+%%DATADIR%%/images/e-logo.png
+%%DATADIR%%/images/elicit.png
+%%DATADIR%%/images/elicit1.png
+%%DATADIR%%/images/elicit2.png
+%%DATADIR%%/images/elicit3.png
+%%DATADIR%%/images/entice.png
+%%DATADIR%%/images/entice1.png
+%%DATADIR%%/images/entice2.png
+%%DATADIR%%/images/entice3.png
+%%DATADIR%%/images/entrance.png
+%%DATADIR%%/images/entrance1.png
+%%DATADIR%%/images/entrance2.png
+%%DATADIR%%/images/entrance3.png
+%%DATADIR%%/images/evidence.png
+%%DATADIR%%/images/evidence1.png
+%%DATADIR%%/images/evidence2.png
+%%DATADIR%%/images/evidence3.png
+%%DATADIR%%/images/evidence4.png
+%%DATADIR%%/images/lilbottom.png
+%%DATADIR%%/images/lilgrad.png
 %%DATADIR%%/themes/e17.edj
-%%DATADIR%%/themes/skeleton.edj
-%%DATADIR%%/themes/zero.edj
 @dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%
 @dirrm include/ewl