- 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, 26 insertions, 56 deletions

diff --git a/x11-wm/e17-module-mem/Makefile b/x11-wm/e17-module-mem/Makefile
index ae7c42ca79ed..623362f4038e 100644
--- a/x11-wm/e17-module-mem/Makefile
+++ b/x11-wm/e17-module-mem/Makefile
@@ -6,27 +6,25 @@
 #
 
 PORTNAME=	mem
-PORTVERSION=	23062006
-PORTREVISION=	2
+PORTVERSION=	20060926
+PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 memory monitoring module
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+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"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +34,6 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.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-module-mem/distinfo b/x11-wm/e17-module-mem/distinfo
index 9d89499b0331..cf64d06cdfc1 100644
--- a/x11-wm/e17-module-mem/distinfo
+++ b/x11-wm/e17-module-mem/distinfo
@@ -1,3 +1,3 @@
-MD5 (mem-23062006.tar.bz2) = dff9e3cad99d050232dc4d0df0a9c201
-SHA256 (mem-23062006.tar.bz2) = c0466c3d9449fd85c935c99ab38d470bfd0ff62d8e30cb37fd23765bad6978dd
-SIZE (mem-23062006.tar.bz2) = 426819
+MD5 (mem-20060926.tar.bz2) = 8cb953cc229a1864336ea6e4e547aef1
+SHA256 (mem-20060926.tar.bz2) = eed0876ef948eeabf15c67bfdb8e08d6ba9b6a5479b1ffd60cd29adb69793c49
+SIZE (mem-20060926.tar.bz2) = 389496
diff --git a/x11-wm/e17-module-mem/files/patch-e_mod_main.c b/x11-wm/e17-module-mem/files/patch-e_mod_main.c
deleted file mode 100644
index 045b3ea456f8..000000000000
--- a/x11-wm/e17-module-mem/files/patch-e_mod_main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- e_mod_main.c.orig	Thu Jul  6 22:43:05 2006
-+++ e_mod_main.c	Thu Jul  6 22:43:18 2006
-@@ -339,7 +339,7 @@
- EAPI int
- e_modapi_about(E_Module *m) 
- {
--   e_module_dialog_show(D_("Enlightenment Mem Monitor Module"), 
-+   e_module_dialog_show(m, D_("Enlightenment Mem Monitor Module"), 
- 			D_("This module is used to monitor memory."));
-    return 1;   
- }
diff --git a/x11-wm/e17-module-mem/pkg-plist b/x11-wm/e17-module-mem/pkg-plist
index 6614afa2ae08..aae66c519dca 100644
--- a/x11-wm/e17-module-mem/pkg-plist
+++ b/x11-wm/e17-module-mem/pkg-plist
@@ -1,38 +1,19 @@
-lib/enlightenment/modules/mem/DejaVuSansMono.ttf
-lib/enlightenment/modules/mem/mem.edc
+lib/enlightenment/modules/mem/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/mem/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/mem/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/mem/mem.edj
-lib/enlightenment/modules/mem/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/mem/module.eap
-lib/enlightenment/modules/mem/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/mem/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/mem/module.desktop
+lib/enlightenment/modules/mem/module.edj
 lib/enlightenment/modules/mem/module_icon.png
-lib/enlightenment/modules/mem/real_00.png
-lib/enlightenment/modules/mem/real_01.png
-lib/enlightenment/modules/mem/real_02.png
-lib/enlightenment/modules/mem/real_03.png
-lib/enlightenment/modules/mem/real_04.png
-lib/enlightenment/modules/mem/real_05.png
-lib/enlightenment/modules/mem/real_06.png
-lib/enlightenment/modules/mem/real_07.png
-lib/enlightenment/modules/mem/real_08.png
-lib/enlightenment/modules/mem/real_09.png
-lib/enlightenment/modules/mem/real_10.png
-lib/enlightenment/modules/mem/swap_00.png
-lib/enlightenment/modules/mem/swap_01.png
-lib/enlightenment/modules/mem/swap_02.png
-lib/enlightenment/modules/mem/swap_03.png
-lib/enlightenment/modules/mem/swap_04.png
-lib/enlightenment/modules/mem/swap_05.png
-lib/enlightenment/modules/mem/swap_06.png
-lib/enlightenment/modules/mem/swap_07.png
-lib/enlightenment/modules/mem/swap_08.png
-lib/enlightenment/modules/mem/swap_09.png
-lib/enlightenment/modules/mem/swap_10.png
 %%NLS%%share/locale/eo/LC_MESSAGES/mem.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/mem.mo
 %%NLS%%share/locale/it/LC_MESSAGES/mem.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/mem.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/mem.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/mem.mo
-@dirrm lib/enlightenment/modules/mem/%%MODULE_ARCH%%
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+@dirrm lib/enlightenment/modules/mem/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/mem
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment