- Move to LOCALBASE

- Use new EFL framework
- Update all e17 ports to the lates stable cvs snapshot
- Add additional knobs/options to ports makefiles to control the
  feature set
- Add a bunch of new e17 applications/libraries
- Minor improvements/modification.

Approved by:	vanilla (old maintainer), sem (mentor)

4 files changed, 15 insertions, 43 deletions

diff --git a/x11-wm/e17-utils/Makefile b/x11-wm/e17-utils/Makefile
index 7eaa6c1185b..5322ae6666e 100644
--- a/x11-wm/e17-utils/Makefile
+++ b/x11-wm/e17-utils/Makefile
@@ -7,35 +7,27 @@
 #
 
 PORTNAME=	utils
-PORTVERSION=	20060719
+PORTVERSION=	20060926
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-
 DISTNAME=	e_${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Various supplementary utilities for e17 window manager
 
 BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2 \
-		evas.1:${PORTSDIR}/graphics/evas \
-		edje.5:${PORTSDIR}/graphics/edje \
-		ecore.1:${PORTSDIR}/x11/ecore \
-		embryo.9:${PORTSDIR}/lang/embryo \
-		eet.9:${PORTSDIR}/devel/eet \
-		ewl.0:${PORTSDIR}/x11-toolkits/ewl \
-		engrave.1:${PORTSDIR}/devel/engrave \
-		epsilon.0:${PORTSDIR}/graphics/epsilon \
-		esmart_trans_x11.0:${PORTSDIR}/graphics/esmart
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
 
 DATADIR=	${PREFIX}/share/e_utils
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	imlib2 evas edje ecore embryo eet ewl engrave epsilon
+USE_EFL_ESMART=	trans_x11
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-wm/e17-utils/distinfo b/x11-wm/e17-utils/distinfo
index af98e261ab8..af03eaf36cd 100644
--- a/x11-wm/e17-utils/distinfo
+++ b/x11-wm/e17-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (e_utils-20060719.tar.bz2) = 7408a1f6806294f7663f90b39558290f
-SHA256 (e_utils-20060719.tar.bz2) = dc2a9775a4df2a4a59d7a6f746ade244c8f066802b7eea858898c9913b32d524
-SIZE (e_utils-20060719.tar.bz2) = 1000780
+MD5 (e_utils-20060926.tar.bz2) = a7cf259d61a67eae2d53099b75eabd3d
+SHA256 (e_utils-20060926.tar.bz2) = bda5268080bcf1e04544f2f3dc85b142afe9f033e83f63a5eb9990a8306a8a99
+SIZE (e_utils-20060926.tar.bz2) = 921212
diff --git a/x11-wm/e17-utils/files/patch-src_bin_eapp_edit_eapp_edit_main.c b/x11-wm/e17-utils/files/patch-src_bin_eapp_edit_eapp_edit_main.c
deleted file mode 100644
index 0a50165550f..00000000000
--- a/x11-wm/e17-utils/files/patch-src_bin_eapp_edit_eapp_edit_main.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/bin/eapp_edit/eapp_edit_main.c.orig	Thu Sep  7 22:16:56 2006
-+++ src/bin/eapp_edit/eapp_edit_main.c	Thu Sep  7 22:20:34 2006
-@@ -420,13 +420,11 @@
-     e = ev;
-     if (e->response == EWL_STOCK_OK)
-     {
--        char *icon;
-         const char *icon2;
-         char icon3[PATH_MAX];
-     
--        icon = ewl_filedialog_selected_file_get(EWL_FILEDIALOG(w));
--        icon2 = ewl_filedialog_directory_get(EWL_FILEDIALOG(w));
--        snprintf(icon3, PATH_MAX, "%s/%s", icon2, icon);
-+	icon2 = ewl_filedialog_file_get(EWL_FILEDIALOG(w));
-+        snprintf(icon3, PATH_MAX, "%s", icon2);
- 
-         o = ewl_widget_name_find("icon");
-         ewl_widget_data_set(o, "file", strdup(icon3));
diff --git a/x11-wm/e17-utils/pkg-plist b/x11-wm/e17-utils/pkg-plist
index ea1b1b0fc31..3092b77dc2d 100644
--- a/x11-wm/e17-utils/pkg-plist
+++ b/x11-wm/e17-utils/pkg-plist
@@ -18,15 +18,13 @@ bin/exige
 %%DATADIR%%/data/e17genmenu/icons/package_toys.png
 %%DATADIR%%/data/e17genmenu/icons/package_utilities.png
 %%DATADIR%%/data/e17genmenu/icons/package_wordprocessing.png
-%%DATADIR%%/data/emblem/default.edj
-%%DATADIR%%/data/emblem/gant.edj
 %%DATADIR%%/data/entangle/default.edj
 %%DATADIR%%/data/exige/default.edj
 share/enlightenment/config-apps/entangle.eap
+@dirrmtry share/enlightenment
 @dirrmtry share/enlightenment/config-apps
 @dirrm %%DATADIR%%/data/exige
 @dirrm %%DATADIR%%/data/entangle
-@dirrm %%DATADIR%%/data/emblem
 @dirrm %%DATADIR%%/data/e17genmenu/icons
 @dirrm %%DATADIR%%/data/e17genmenu
 @dirrm %%DATADIR%%/data