author: Stanislav Sedov <stas@FreeBSD.org> 2006-10-08 13:48:37 +0000
committer: Stanislav Sedov <stas@FreeBSD.org> 2006-10-08 13:48:37 +0000
commit: ee774b0f4fa7f1842f6b4dfdfe60b22cbcf12442 (patch)
tree: 1bf12eadb5a7920766bf7a613174c0475b810d0d /x11-wm
parent: 32e98c797bd5b952894ff185e59df8a91844f4ab (diff)
download: ports-ee774b0f4fa7f1842f6b4dfdfe60b22cbcf12442.tar.gz
ports-ee774b0f4fa7f1842f6b4dfdfe60b22cbcf12442.zip
62 files changed, 893 insertions, 611 deletions
diff --git a/x11-wm/e17-module-calendar/Makefile b/x11-wm/e17-module-calendar/Makefile
index a0c387313007..96735db318aa 100644
--- a/x11-wm/e17-module-calendar/Makefile
+++ b/x11-wm/e17-module-calendar/Makefile
@@ -6,27 +6,28 @@
 #
 
 PORTNAME=	calendar
-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=	Nice calendar module for e17
 
-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
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	ecore evas edje eet
+USE_EFL_ESMART=	trans_x11
 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}
+IGNORE=		doesn't compile with recent e17
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +37,10 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e s,`${PRINTF} '\r'`,,g ${WRKSRC}/src/*.[ch]
+
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-wm/e17-module-calendar/distinfo b/x11-wm/e17-module-calendar/distinfo
index 3e641ac6c035..492ca7b8e1dc 100644
--- a/x11-wm/e17-module-calendar/distinfo
+++ b/x11-wm/e17-module-calendar/distinfo
@@ -1,3 +1,3 @@
-MD5 (calendar-23062006.tar.bz2) = 161a388d25c7abd9a73142aad0792f4b
-SHA256 (calendar-23062006.tar.bz2) = 3c96faa84c4776c9a1d970962ade1b36113d2226ed657ee0290fc98328f90e4d
-SIZE (calendar-23062006.tar.bz2) = 554819
+MD5 (calendar-20060926.tar.bz2) = a7c47f3efc02a2688ce4b8cc3fe2a659
+SHA256 (calendar-20060926.tar.bz2) = cdfaa4277375994287149310cf3b2a4be224cd38304ff3909f99006c55ec9331
+SIZE (calendar-20060926.tar.bz2) = 552639
diff --git a/x11-wm/e17-module-calendar/files/patch-src_e_mod_main.c b/x11-wm/e17-module-calendar/files/patch-src_e_mod_main.c
deleted file mode 100644
index 1425a4ef7ec1..000000000000
--- a/x11-wm/e17-module-calendar/files/patch-src_e_mod_main.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/e_mod_main.c.orig	Thu Jul  6 23:11:37 2006
-+++ src/e_mod_main.c	Thu Jul  6 23:13:48 2006
-@@ -47,7 +47,7 @@
-       
-      {
-         
-e_error_dialog_show 
--           ("Module API Error", 
-"Error initializing Module: calendar\n" 
-+           (module, "Module API Error", 
-"Error initializing Module: calendar\n" 
-             "It requires a minimum module API version of: %i.\n" 
-             "The module API advertized by Enlightenment is: %i.\n" 
-             "Aborting module.", 
-E_MODULE_API_VERSION, module->api->version);
-@@ -102,7 +102,7 @@
- EAPI int 
- e_modapi_about(E_Module *module) 
- {
--   
-e_error_dialog_show(D_("Enlightenment calendar Module"), 
-D_("A simple module to give E17 a desktop calendar "));
-+   
-e_error_dialog_show(module, D_("Enlightenment calendar Module"), 
-D_("A simple module to give E17 a desktop calendar "));
-    
-return 1;
- 
-}
- 
diff --git a/x11-wm/e17-module-cpu/Makefile b/x11-wm/e17-module-cpu/Makefile
index fa8c0da18c55..015ecef1a6cb 100644
--- a/x11-wm/e17-module-cpu/Makefile
+++ b/x11-wm/e17-module-cpu/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	cpu
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 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 module which allows users to monitor cpu load
 
-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
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 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}
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +33,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-cpu/distinfo b/x11-wm/e17-module-cpu/distinfo
index 5b0ebc87a26d..7a0ddda8eeeb 100644
--- a/x11-wm/e17-module-cpu/distinfo
+++ b/x11-wm/e17-module-cpu/distinfo
@@ -1,3 +1,3 @@
-MD5 (cpu-20060707.tar.bz2) = c4f763fc3cf8bcac6da1fb90a54c60ac
-SHA256 (cpu-20060707.tar.bz2) = 8b81a3acae9a48613ef4d10ef0f037687e084f572f4f1c7e023739fd7d4acac7
-SIZE (cpu-20060707.tar.bz2) = 298803
+MD5 (cpu-20060926.tar.bz2) = 1cd0a1463cb4e30bcc1bcb65416ed54b
+SHA256 (cpu-20060926.tar.bz2) = a66b516bfb10e0b9094bbc4bc6fdc3c34946cf0873142e7eb151a952e704ab0d
+SIZE (cpu-20060926.tar.bz2) = 261091
diff --git a/x11-wm/e17-module-cpu/files/patch-e_mod_main.c b/x11-wm/e17-module-cpu/files/patch-e_mod_main.c
deleted file mode 100644
index 79b3a8ba3412..000000000000
--- a/x11-wm/e17-module-cpu/files/patch-e_mod_main.c
+++ /dev/null
@@ -1,93 +0,0 @@
---- e_mod_main.c.orig	Sun Jul  9 14:15:46 2006
-+++ e_mod_main.c	Sun Jul  9 15:58:09 2006
-@@ -3,6 +3,12 @@
- #include "e_mod_config.h"
- #include "config.h"
- 
-+#if defined(__FreeBSD__)
-+# include <sys/types.h>
-+# include <sys/sysctl.h>
-+# include <sys/resource.h>
-+#endif
-+
- static Cpu *_cpu_init(E_Module *m);
- static void _cpu_shutdown(Cpu *n);
- static void _cpu_config_menu_new(Cpu *n);
-@@ -460,31 +466,66 @@
-    FILE *f;
-    int cpu = -1;
- 
-+#if defined(__FreeBSD__)
-+   cpu = 1; /* We can't retrive per-cpu statistics, so we'll assume UP arch*/
-+#else
-    if (!(f = fopen("/proc/stat", "r")))
-       return -1;
- 
-    while (fscanf(f, "cp%s %*u %*u %*u %*u %*u %*u %*u %*u\n", (char *)&tmp) == 1)
-       cpu++;
--
-    fclose(f);
-+#endif
-+
-    return cpu;
- }
- 
- static void
- _cpu_face_get_load(Cpu_Face *cf)
- {
-+   int cpu_count;
-+   Edje_Message_Float msg;
-+#if defined(__FreeBSD__)
-+   long cp_time[CPUSTATES];
-+   static long old_used, old_tot;
-+   long new_used, new_tot;
-+   size_t len;
-+#else
-    static unsigned long old_u[4], old_n[4], old_s[4], old_i[4], old_wa[4], old_hi[4], old_si[4];
-    unsigned long new_u, new_n, new_s, new_i, new_wa = 0, new_hi = 0, new_si = 0, ticks_past;
-    int tmp_u, tmp_n, tmp_s, tmp_i;
-    char dummy[16];
-    FILE *stat;
--   int cpu_count;
--   Edje_Message_Float msg;
-+#endif
- 
-    cpu_count = _cpu_face_get_cpu_count(cf);
-    if (cpu_count == -1)
-       return;
- 
-+#if defined(__FreeBSD__)
-+   len = sizeof(cp_time);
-+
-+   if (sysctlbyname("kern.cp_time", &cp_time, &len, NULL, 0) < 0) {
-+	warn("sysctl()");
-+	return;
-+   }
-+
-+   new_used = cp_time[CP_USER] + cp_time[CP_NICE] + cp_time[CP_SYS];
-+   new_tot = new_used + cp_time[CP_IDLE];
-+
-+   if (new_tot == old_tot)
-+	msg.val = 0;
-+   else
-+	msg.val = 100 * (float)(new_used - old_used) / (float)(new_tot - old_tot);
-+
-+   cpu_stats[0] = msg.val;
-+   edje_object_message_send(cf->cpu_obj, EDJE_MESSAGE_FLOAT, 0, &msg);
-+
-+   old_tot = new_tot;
-+   old_used = new_used;
-+
-+#else
-+
-    if (!(stat = fopen("/proc/stat", "r")))
-       return;
- 
-@@ -537,6 +578,7 @@
-         i++;
-      }
-    fclose(stat);
-+#endif
- }
- 
- static void
diff --git a/x11-wm/e17-module-cpu/pkg-plist b/x11-wm/e17-module-cpu/pkg-plist
index 33b6656b67a2..42144630fef3 100644
--- a/x11-wm/e17-module-cpu/pkg-plist
+++ b/x11-wm/e17-module-cpu/pkg-plist
@@ -1,15 +1,11 @@
 lib/enlightenment/modules/cpu/cpu.edj
-lib/enlightenment/modules/cpu/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/cpu/module.eap
-lib/enlightenment/modules/cpu/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/cpu/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/cpu/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/cpu/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/cpu/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/cpu/module.desktop
+lib/enlightenment/modules/cpu/module.edj
 lib/enlightenment/modules/cpu/module_icon.png
-%%NLS%%share/locale/bg/LC_MESSAGES/cpu.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/cpu.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/cpu.mo
-%%NLS%%share/locale/it/LC_MESSAGES/cpu.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/cpu.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/cpu.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/cpu.mo
-@dirrm lib/enlightenment/modules/cpu/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/cpu/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/cpu
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-deskshow/Makefile b/x11-wm/e17-module-deskshow/Makefile
index bf966ed69126..3bd1342191c7 100644
--- a/x11-wm/e17-module-deskshow/Makefile
+++ b/x11-wm/e17-module-deskshow/Makefile
@@ -6,26 +6,25 @@
 #
 
 PORTNAME=	deskshow
-PORTVERSION=	20060728
+PORTVERSION=	20060926
 PORTREVISION=	0
 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=	E17 module that minimizes all windows to show the desktop
 
-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
 
-.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-deskshow/distinfo b/x11-wm/e17-module-deskshow/distinfo
index bbc3c00c9a13..7bf5af25b44c 100644
--- a/x11-wm/e17-module-deskshow/distinfo
+++ b/x11-wm/e17-module-deskshow/distinfo
@@ -1,3 +1,3 @@
-MD5 (deskshow-20060728.tar.bz2) = cb2041f4bc2d5a0bdaf03c85f9efe3ea
-SHA256 (deskshow-20060728.tar.bz2) = c56e569e92d462a87350c67f884ebc23f0dcf390e8f7da1ba03b5662bc44e609
-SIZE (deskshow-20060728.tar.bz2) = 572628
+MD5 (deskshow-20060926.tar.bz2) = ca9f52acca54fb00923bc83344b38349
+SHA256 (deskshow-20060926.tar.bz2) = a689ee52663c4180b8d506a83d35b713fe9f328273627d03c6def55635b6230b
+SIZE (deskshow-20060926.tar.bz2) = 279254
diff --git a/x11-wm/e17-module-deskshow/pkg-plist b/x11-wm/e17-module-deskshow/pkg-plist
index 8e21b5eb7c54..a5528559f717 100644
--- a/x11-wm/e17-module-deskshow/pkg-plist
+++ b/x11-wm/e17-module-deskshow/pkg-plist
@@ -1,8 +1,11 @@
 lib/enlightenment/modules/deskshow/deskshow.edj
-lib/enlightenment/modules/deskshow/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/deskshow/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/deskshow/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/deskshow/module.eap
+lib/enlightenment/modules/deskshow/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/deskshow/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/deskshow/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/deskshow/module.desktop
+lib/enlightenment/modules/deskshow/module.edj
 lib/enlightenment/modules/deskshow/module_icon.png
-@dirrm lib/enlightenment/modules/deskshow/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/deskshow/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/deskshow
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-flame/Makefile b/x11-wm/e17-module-flame/Makefile
index 52927d0fd452..f41380ec4e8f 100644
--- a/x11-wm/e17-module-flame/Makefile
+++ b/x11-wm/e17-module-flame/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	flame
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 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 module which draws flames on your desktop
 
-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 +33,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-flame/distinfo b/x11-wm/e17-module-flame/distinfo
index 1a1e925dc9a8..e2b2a353bafc 100644
--- a/x11-wm/e17-module-flame/distinfo
+++ b/x11-wm/e17-module-flame/distinfo
@@ -1,3 +1,3 @@
-MD5 (flame-20060707.tar.bz2) = 7fe367c4ace70b7add9a8448664dcf45
-SHA256 (flame-20060707.tar.bz2) = 0e0825c9a0208eedf4d48831ce10bbf4eed0c8bbd0125124f52240b3484bb413
-SIZE (flame-20060707.tar.bz2) = 244132
+MD5 (flame-20060926.tar.bz2) = e7ebdd2606517342e0a35ebfbb996c62
+SHA256 (flame-20060926.tar.bz2) = 3aa971dcbd72023ad14a491d0a338f337a5d1509f1e47e5c0cff9cbfefff6fe5
+SIZE (flame-20060926.tar.bz2) = 250902
diff --git a/x11-wm/e17-module-flame/pkg-plist b/x11-wm/e17-module-flame/pkg-plist
index 9ed88f7d9756..716fee610674 100644
--- a/x11-wm/e17-module-flame/pkg-plist
+++ b/x11-wm/e17-module-flame/pkg-plist
@@ -1,11 +1,16 @@
-lib/enlightenment/modules/flame/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/flame/module.eap
-lib/enlightenment/modules/flame/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/flame/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/flame/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/flame/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/flame/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/flame/module.desktop
+lib/enlightenment/modules/flame/module.edj
 lib/enlightenment/modules/flame/module_icon.png
 %%NLS%%share/locale/eo/LC_MESSAGES/flame.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/flame.mo
 %%NLS%%share/locale/it/LC_MESSAGES/flame.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/flame.mo
-@dirrm lib/enlightenment/modules/flame/%%MODULE_ARCH%%
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+@dirrm lib/enlightenment/modules/flame/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/flame
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-language/Makefile b/x11-wm/e17-module-language/Makefile
index 593b48b4e9ea..25ddecefa9d3 100644
--- a/x11-wm/e17-module-language/Makefile
+++ b/x11-wm/e17-module-language/Makefile
@@ -6,27 +6,26 @@
 #
 
 PORTNAME=	language
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 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 module to switch XKB input language
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-LIB_DEPENDS=	exml.1:${PORTSDIR}/textproc/exml
-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_GETTEXT=	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 exml
 
-.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-language/distinfo b/x11-wm/e17-module-language/distinfo
index bcc0a4c24107..385ea90a9d6f 100644
--- a/x11-wm/e17-module-language/distinfo
+++ b/x11-wm/e17-module-language/distinfo
@@ -1,3 +1,3 @@
-MD5 (language-20060707.tar.bz2) = 23ddc1567ef8c3cded46e69faca53b88
-SHA256 (language-20060707.tar.bz2) = 6a21fa661476c265898e1a952a65b574dfa91353c5d04e84b278a2e89195908f
-SIZE (language-20060707.tar.bz2) = 394068
+MD5 (language-20060926.tar.bz2) = 701d7dddddfa4ed4fcc0a11422cd5fb0
+SHA256 (language-20060926.tar.bz2) = f7ff47aa19a5015046bea49d6ac999bd9b8eba513856242f86614efc2d9d77fb
+SIZE (language-20060926.tar.bz2) = 422313
diff --git a/x11-wm/e17-module-language/pkg-plist b/x11-wm/e17-module-language/pkg-plist
index c2b6e7a54141..b4a26ed34c97 100644
--- a/x11-wm/e17-module-language/pkg-plist
+++ b/x11-wm/e17-module-language/pkg-plist
@@ -1,6 +1,6 @@
-lib/enlightenment/modules/language/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/language/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/language/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/language/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/language/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/language/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/language/images/AFG_flag.png
 lib/enlightenment/modules/language/images/ALB_flag.png
 lib/enlightenment/modules/language/images/AND_flag.png
@@ -72,11 +72,14 @@ lib/enlightenment/modules/language/images/UZB_flag.png
 lib/enlightenment/modules/language/images/VNM_flag.png
 lib/enlightenment/modules/language/images/ZAR_flag.png
 lib/enlightenment/modules/language/images/unknown_flag.png
-lib/enlightenment/modules/language/language.edc
 lib/enlightenment/modules/language/language.edj
-lib/enlightenment/modules/language/module.eap
+lib/enlightenment/modules/language/module.desktop
+lib/enlightenment/modules/language/module.edj
+share/locale/eo/LC_MESSAGES/language.mo
+share/locale/it/LC_MESSAGES/language.mo
+share/locale/sv/LC_MESSAGES/language.mo
 @dirrm lib/enlightenment/modules/language/images
-@dirrm lib/enlightenment/modules/language/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/language/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/language
 @dirrmtry lib/enlightenment/modules
 @dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-mail/Makefile b/x11-wm/e17-module-mail/Makefile
index 0740274cc5e6..d002958813c8 100644
--- a/x11-wm/e17-module-mail/Makefile
+++ b/x11-wm/e17-module-mail/Makefile
@@ -6,26 +6,26 @@
 #
 
 PORTNAME=	mail
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 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 module to check your mailboxes (like xbiff does)
 
-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_GETTEXT=	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
 
-.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-mail/distinfo b/x11-wm/e17-module-mail/distinfo
index ee79645fe7e4..ef41257f2c56 100644
--- a/x11-wm/e17-module-mail/distinfo
+++ b/x11-wm/e17-module-mail/distinfo
@@ -1,3 +1,3 @@
-MD5 (mail-20060707.tar.bz2) = 5fb424681cf466841f647dba0cec2c5c
-SHA256 (mail-20060707.tar.bz2) = 6c726c376672a30bd43e94eb5ad216b41897d6b27f8ceb0f51eef6a854ad58e6
-SIZE (mail-20060707.tar.bz2) = 269002
+MD5 (mail-20060926.tar.bz2) = d63660b2e38d82a212684420024458bb
+SHA256 (mail-20060926.tar.bz2) = b526a1d4d3cbb5b0e54d22b9cc87b4462d0bda6ba9a06450f7e8a1d95885d898
+SIZE (mail-20060926.tar.bz2) = 309337
diff --git a/x11-wm/e17-module-mail/pkg-plist b/x11-wm/e17-module-mail/pkg-plist
index e9882ccdf3f9..d32b8e0e82c8 100644
--- a/x11-wm/e17-module-mail/pkg-plist
+++ b/x11-wm/e17-module-mail/pkg-plist
@@ -1,9 +1,12 @@
+lib/enlightenment/modules/mail/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/mail/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/mail/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/mail/mail.edj
-lib/enlightenment/modules/mail/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/mail/module.eap
-lib/enlightenment/modules/mail/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/mail/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/mail/module.desktop
+lib/enlightenment/modules/mail/module.edj
 lib/enlightenment/modules/mail/module_icon.png
-lib/enlightenment/modules/mail/newmail.png
-@dirrm lib/enlightenment/modules/mail/%%MODULE_ARCH%%
+share/locale/it/LC_MESSAGES/mail.mo
+@dirrm lib/enlightenment/modules/mail/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/mail
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
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
diff --git a/x11-wm/e17-module-mixer/Makefile b/x11-wm/e17-module-mixer/Makefile
new file mode 100644
index 000000000000..c979be1591a9
--- /dev/null
+++ b/x11-wm/e17-module-mixer/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	e17-module-mixer
+# Date created:		30 September 2006
+# Whom:			Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	mixer
+PORTVERSION=	20060926
+CATEGORIES=	x11
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+PKGNAMEPREFIX=	e17-module-
+DISTNAME=	${PORTNAME}-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	An e17 module to adjust audio mixer settings
+
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
+GNU_CONFIGURE=	yes
+
+.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-mixer/distinfo b/x11-wm/e17-module-mixer/distinfo
new file mode 100644
index 000000000000..058aebf14405
--- /dev/null
+++ b/x11-wm/e17-module-mixer/distinfo
@@ -0,0 +1,3 @@
+MD5 (mixer-20060926.tar.bz2) = 3652211f1b7fe321440de97d8801f5d0
+SHA256 (mixer-20060926.tar.bz2) = 0bbacb948166eb5324c602ffd741d1597aea07c69e51c2061d84fcb6638d2a1d
+SIZE (mixer-20060926.tar.bz2) = 289454
diff --git a/x11-wm/e17-module-mixer/pkg-descr b/x11-wm/e17-module-mixer/pkg-descr
new file mode 100644
index 000000000000..f631d3706434
--- /dev/null
+++ b/x11-wm/e17-module-mixer/pkg-descr
@@ -0,0 +1,4 @@
+This e17 module allows users to adjust the sound mixer settings.
+
+Author:	Christopher 'devilhorns' Michael <devilhorns@comcast.net>
+WWW:	http://www.enlightenment.org
diff --git a/x11-wm/e17-module-mixer/pkg-plist b/x11-wm/e17-module-mixer/pkg-plist
new file mode 100644
index 000000000000..7b5d44decf2c
--- /dev/null
+++ b/x11-wm/e17-module-mixer/pkg-plist
@@ -0,0 +1,9 @@
+lib/enlightenment/modules/mixer/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/mixer/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/mixer/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/mixer/mixer.edj
+lib/enlightenment/modules/mixer/module.eap
+@dirrm lib/enlightenment/modules/mixer/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/mixer
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-moon/Makefile b/x11-wm/e17-module-moon/Makefile
index aaeb04b9a162..f442da8955c6 100644
--- a/x11-wm/e17-module-moon/Makefile
+++ b/x11-wm/e17-module-moon/Makefile
@@ -6,27 +6,25 @@
 #
 
 PORTNAME=	moon
-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 Moon Clock 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-moon/distinfo b/x11-wm/e17-module-moon/distinfo
index 8a1a8789bb68..872df226239c 100644
--- a/x11-wm/e17-module-moon/distinfo
+++ b/x11-wm/e17-module-moon/distinfo
@@ -1,3 +1,3 @@
-MD5 (moon-23062006.tar.bz2) = 6db65094f895971195fb1a1e5c792cf1
-SHA256 (moon-23062006.tar.bz2) = 83a7a52e60e9a603b53a1eef0c5798e1953a13951188a2a9691c9026c931c78b
-SIZE (moon-23062006.tar.bz2) = 646800
+MD5 (moon-20060926.tar.bz2) = f967701d2f031631d3b0a63b58df76c3
+SHA256 (moon-20060926.tar.bz2) = 3319d37fcd7fdfe0bf65aeb5d9016e3660e730263a97d18538e397ea5e2d50c0
+SIZE (moon-20060926.tar.bz2) = 672466
diff --git a/x11-wm/e17-module-moon/files/patch-src__e_mod_main.c b/x11-wm/e17-module-moon/files/patch-src__e_mod_main.c
deleted file mode 100644
index 1b64751d1dbd..000000000000
--- a/x11-wm/e17-module-moon/files/patch-src__e_mod_main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/e_mod_main.c.orig	Sat Jun  3 12:35:27 2006
-+++ src/e_mod_main.c	Thu Jul  6 23:01:10 2006
-@@ -124,7 +124,7 @@
- 
-    snprintf(title, sizeof(title), "%s %s", D_("Moon Clock Module"), 
- 	 PACKAGE_VERSION);
--   e_module_dialog_show(title, 
-+   e_module_dialog_show(module, title, 
- 	 D_("Display current phase of the moon ala e16 E-MoonClock")); 
-    return 1;
- }
diff --git a/x11-wm/e17-module-moon/pkg-plist b/x11-wm/e17-module-moon/pkg-plist
index 3c1c40aadf35..9e45a173c835 100644
--- a/x11-wm/e17-module-moon/pkg-plist
+++ b/x11-wm/e17-module-moon/pkg-plist
@@ -1,11 +1,14 @@
-lib/enlightenment/modules/moon/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/moon/module.eap
-lib/enlightenment/modules/moon/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/moon/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/moon/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/moon/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/moon/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/moon/module.desktop
+lib/enlightenment/modules/moon/module.edj
 lib/enlightenment/modules/moon/moon.edj
 %%NLS%%share/locale/eo/LC_MESSAGES/moon.mo
 %%NLS%%share/locale/it/LC_MESSAGES/moon.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/moon.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/moon.mo
-@dirrm lib/enlightenment/modules/moon/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/moon/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/moon
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-rain/Makefile b/x11-wm/e17-module-rain/Makefile
index 2bf4b5f17222..77f5f19018dc 100644
--- a/x11-wm/e17-module-rain/Makefile
+++ b/x11-wm/e17-module-rain/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	rain
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 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 module which draws raindrops on your screen
 
-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 +33,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-rain/distinfo b/x11-wm/e17-module-rain/distinfo
index 84ba93d6b7e8..1df8e3b07846 100644
--- a/x11-wm/e17-module-rain/distinfo
+++ b/x11-wm/e17-module-rain/distinfo
@@ -1,3 +1,3 @@
-MD5 (rain-20060707.tar.bz2) = 603ae7f4c58b27d0be633030fbbb88cb
-SHA256 (rain-20060707.tar.bz2) = 0901114c5c4477f4c60480d4c03475a2e8558930bc60668a08897b77ad2712a0
-SIZE (rain-20060707.tar.bz2) = 309011
+MD5 (rain-20060926.tar.bz2) = 4505ab2f405c09191fb3dace3160ef88
+SHA256 (rain-20060926.tar.bz2) = 5f7b172c99518b1bee0d9a79c150e25cdbf289e1506bedf72bbe0f2c0eee212f
+SIZE (rain-20060926.tar.bz2) = 315366
diff --git a/x11-wm/e17-module-rain/pkg-plist b/x11-wm/e17-module-rain/pkg-plist
index 7d2e9998e063..fad84f556792 100644
--- a/x11-wm/e17-module-rain/pkg-plist
+++ b/x11-wm/e17-module-rain/pkg-plist
@@ -2,10 +2,11 @@ lib/enlightenment/modules/rain/cloud.png
 lib/enlightenment/modules/rain/drop-l.png
 lib/enlightenment/modules/rain/drop-m.png
 lib/enlightenment/modules/rain/drop-s.png
-lib/enlightenment/modules/rain/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/rain/module.eap
-lib/enlightenment/modules/rain/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/rain/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/rain/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/rain/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/rain/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/rain/module.desktop
+lib/enlightenment/modules/rain/module.edj
 lib/enlightenment/modules/rain/module_icon.png
 %%NLS%%share/locale/eo/LC_MESSAGES/rain.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/rain.mo
@@ -13,5 +14,9 @@ lib/enlightenment/modules/rain/module_icon.png
 %%NLS%%share/locale/it/LC_MESSAGES/rain.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/rain.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/rain.mo
-@dirrm lib/enlightenment/modules/rain/%%MODULE_ARCH%%
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+@dirrm lib/enlightenment/modules/rain/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/rain
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-screenshot/Makefile b/x11-wm/e17-module-screenshot/Makefile
index aaddd8aacd42..42347fec4de2 100644
--- a/x11-wm/e17-module-screenshot/Makefile
+++ b/x11-wm/e17-module-screenshot/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	screenshot
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 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 module which allows users to take screenshots
 
-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
 
 OPTIONS=	IMAGIC "Use ImageMagick" on \
 		SCROT "Use Scrot" off
@@ -34,10 +31,12 @@ OPTIONS=	IMAGIC "Use ImageMagick" on \
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_IMAGIC)
+BUILD_DEPENDS+=	import:${PORTSDIR}/graphics/ImageMagick
 RUN_DEPENDS+=	import:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 .if defined(WITH_SCROT)
+BUILD_DEPENDS+=	scrot:${PORTSDIR}/graphics/scrot
 RUN_DEPENDS+=	scrot:${PORTSDIR}/graphics/scrot
 .endif
 
@@ -49,4 +48,5 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
 .include <bsd.port.post.mk>
diff --git a/x11-wm/e17-module-screenshot/distinfo b/x11-wm/e17-module-screenshot/distinfo
index 0836f4795b07..fc042b17e8d8 100644
--- a/x11-wm/e17-module-screenshot/distinfo
+++ b/x11-wm/e17-module-screenshot/distinfo
@@ -1,3 +1,3 @@
-MD5 (screenshot-20060707.tar.bz2) = 9171aaf311bcf74762f42c6317045813
-SHA256 (screenshot-20060707.tar.bz2) = 3c1dbfb464e4f440b2d9dc43387563e22cf2a20f94ded7f56930470ddce13bd8
-SIZE (screenshot-20060707.tar.bz2) = 364926
+MD5 (screenshot-20060926.tar.bz2) = 59d9780357c3f41676474800d274d6b9
+SHA256 (screenshot-20060926.tar.bz2) = fc5f809d6af7da0a65033e28a27f91db424e716c46574f449a3300ba8a73277f
+SIZE (screenshot-20060926.tar.bz2) = 373270
diff --git a/x11-wm/e17-module-screenshot/pkg-plist b/x11-wm/e17-module-screenshot/pkg-plist
index 5cdca64316e5..190a2187bff1 100644
--- a/x11-wm/e17-module-screenshot/pkg-plist
+++ b/x11-wm/e17-module-screenshot/pkg-plist
@@ -1,12 +1,10 @@
-lib/enlightenment/modules/screenshot/screenshot.edj
-lib/enlightenment/modules/screenshot/e17_titlebar_glint1.png
-lib/enlightenment/modules/screenshot/e17_titlebar_glint2.png
-lib/enlightenment/modules/screenshot/e17_titlebar_glint3.png
-lib/enlightenment/modules/screenshot/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/screenshot/module.eap
-lib/enlightenment/modules/screenshot/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/screenshot/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/screenshot/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/screenshot/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/screenshot/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/screenshot/module.desktop
+lib/enlightenment/modules/screenshot/module.edj
 lib/enlightenment/modules/screenshot/module_icon.png
+lib/enlightenment/modules/screenshot/screenshot.edj
 %%NLS%%share/locale/eo/LC_MESSAGES/screenshot.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/screenshot.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/screenshot.mo
@@ -14,5 +12,9 @@ lib/enlightenment/modules/screenshot/module_icon.png
 %%NLS%%share/locale/ja/LC_MESSAGES/screenshot.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/screenshot.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/screenshot.mo
-@dirrm lib/enlightenment/modules/screenshot/%%MODULE_ARCH%%
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+@dirrm lib/enlightenment/modules/screenshot/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/screenshot
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-slideshow/Makefile b/x11-wm/e17-module-slideshow/Makefile
index 6e498a894b5a..5b9ac9375aae 100644
--- a/x11-wm/e17-module-slideshow/Makefile
+++ b/x11-wm/e17-module-slideshow/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	slideshow
-PORTVERSION=	20060728
+PORTVERSION=	20060926
 PORTREVISION=	0
 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 module which cycles desktop backgrounds
 
-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 +33,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-slideshow/distinfo b/x11-wm/e17-module-slideshow/distinfo
index 148b9f6eb244..973d1ebc4ca0 100644
--- a/x11-wm/e17-module-slideshow/distinfo
+++ b/x11-wm/e17-module-slideshow/distinfo
@@ -1,3 +1,3 @@
-MD5 (slideshow-20060728.tar.bz2) = fba7f99ab060e90f46647e8552fc01c7
-SHA256 (slideshow-20060728.tar.bz2) = f612d49d96aff81858c85d9884bca61bdcd0527c729120922817d8f12a76f6d0
-SIZE (slideshow-20060728.tar.bz2) = 249348
+MD5 (slideshow-20060926.tar.bz2) = 26e082dfe8aeb43d0fb1f56fcf27cee4
+SHA256 (slideshow-20060926.tar.bz2) = 9b709121621489fe84d9941fc2fd276800ddfe9be6b763f7242ebc00f79ea295
+SIZE (slideshow-20060926.tar.bz2) = 254831
diff --git a/x11-wm/e17-module-slideshow/pkg-plist b/x11-wm/e17-module-slideshow/pkg-plist
index ca6c7797c4f8..de126aa1c465 100644
--- a/x11-wm/e17-module-slideshow/pkg-plist
+++ b/x11-wm/e17-module-slideshow/pkg-plist
@@ -1,7 +1,8 @@
-lib/enlightenment/modules/slideshow/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/slideshow/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/slideshow/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/slideshow/module.eap
+lib/enlightenment/modules/slideshow/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/slideshow/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/slideshow/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/slideshow/module.desktop
+lib/enlightenment/modules/slideshow/module.edj
 lib/enlightenment/modules/slideshow/module_icon.png
 lib/enlightenment/modules/slideshow/slideshow.edj
 %%NLS%%share/locale/eo/LC_MESSAGES/slideshow.mo
@@ -10,5 +11,9 @@ lib/enlightenment/modules/slideshow/slideshow.edj
 %%NLS%%share/locale/it/LC_MESSAGES/slideshow.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/slideshow.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/slideshow.mo
-@dirrm lib/enlightenment/modules/slideshow/%%MODULE_ARCH%%
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+@dirrm lib/enlightenment/modules/slideshow/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/slideshow
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-snow/Makefile b/x11-wm/e17-module-snow/Makefile
index 91472f0604ce..f01e84a9df7a 100644
--- a/x11-wm/e17-module-snow/Makefile
+++ b/x11-wm/e17-module-snow/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	snow
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 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 module which draws snowflakes on your screen
 
-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 +33,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-snow/distinfo b/x11-wm/e17-module-snow/distinfo
index 2226f0d968cb..b2e53b54dd7b 100644
--- a/x11-wm/e17-module-snow/distinfo
+++ b/x11-wm/e17-module-snow/distinfo
@@ -1,3 +1,3 @@
-MD5 (snow-20060707.tar.bz2) = 138b18e7afc538955d2409727ad3507e
-SHA256 (snow-20060707.tar.bz2) = ff064eef0bee90ea7f40c5d10c27a6e0e6392657bc47f632a6568fac792e112b
-SIZE (snow-20060707.tar.bz2) = 241756
+MD5 (snow-20060926.tar.bz2) = c5dbea13f4151b4d0851d1b083c90732
+SHA256 (snow-20060926.tar.bz2) = 4372038f755e2e99f53a3e367ff175a634b94f618ad47533dbd68892f5f22490
+SIZE (snow-20060926.tar.bz2) = 248633
diff --git a/x11-wm/e17-module-snow/pkg-plist b/x11-wm/e17-module-snow/pkg-plist
index 5437ff0125b6..d3d75cd2e5a8 100644
--- a/x11-wm/e17-module-snow/pkg-plist
+++ b/x11-wm/e17-module-snow/pkg-plist
@@ -1,10 +1,11 @@
 lib/enlightenment/modules/snow/flake-l.png
 lib/enlightenment/modules/snow/flake-m.png
 lib/enlightenment/modules/snow/flake-s.png
-lib/enlightenment/modules/snow/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/snow/module.eap
-lib/enlightenment/modules/snow/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/snow/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/snow/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/snow/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/snow/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/snow/module.desktop
+lib/enlightenment/modules/snow/module.edj
 lib/enlightenment/modules/snow/module_icon.png
 lib/enlightenment/modules/snow/tree.png
 %%NLS%%share/locale/eo/LC_MESSAGES/snow.mo
@@ -13,5 +14,9 @@ lib/enlightenment/modules/snow/tree.png
 %%NLS%%share/locale/it/LC_MESSAGES/snow.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/snow.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/snow.mo
-@dirrm lib/enlightenment/modules/snow/%%MODULE_ARCH%%
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+@dirrm lib/enlightenment/modules/snow/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/snow
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-uptime/Makefile b/x11-wm/e17-module-uptime/Makefile
index 2b279b4a2bd2..c977b63d67e7 100644
--- a/x11-wm/e17-module-uptime/Makefile
+++ b/x11-wm/e17-module-uptime/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	uptime
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 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 uptime and load average indicator 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 +33,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-uptime/distinfo b/x11-wm/e17-module-uptime/distinfo
index 851ccb9f799e..5257ad423257 100644
--- a/x11-wm/e17-module-uptime/distinfo
+++ b/x11-wm/e17-module-uptime/distinfo
@@ -1,3 +1,3 @@
-MD5 (uptime-20060707.tar.bz2) = 83d8f63ee637ddcc3eb8cbff01e1a50d
-SHA256 (uptime-20060707.tar.bz2) = 9a4713e04faa55c309cf03d7f431b81ee6ddc36a238f696b7a132a0099926783
-SIZE (uptime-20060707.tar.bz2) = 275549
+MD5 (uptime-20060926.tar.bz2) = f39c2c7643adef2456e4e3994a3696d0
+SHA256 (uptime-20060926.tar.bz2) = 145ce4451b0df08985b691fbaa4fe783cac32a5b2bab007f093ebfb3cbfb5bec
+SIZE (uptime-20060926.tar.bz2) = 285109
diff --git a/x11-wm/e17-module-uptime/pkg-plist b/x11-wm/e17-module-uptime/pkg-plist
index 9ba376e9e8dd..2d2960917bac 100644
--- a/x11-wm/e17-module-uptime/pkg-plist
+++ b/x11-wm/e17-module-uptime/pkg-plist
@@ -1,13 +1,21 @@
-lib/enlightenment/modules/uptime/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/uptime/module.eap
-lib/enlightenment/modules/uptime/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/uptime/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/uptime/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/uptime/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/uptime/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/uptime/module.desktop
+lib/enlightenment/modules/uptime/module.edj
 lib/enlightenment/modules/uptime/uptime.edj
-%%NLS%%share/locale/bg/LC_MESSAGES/uptime.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/uptime.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/uptime.mo
-%%NLS%%share/locale/it/LC_MESSAGES/uptime.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/uptime.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/uptime.mo
-@dirrm lib/enlightenment/modules/uptime/%%MODULE_ARCH%%
-@dirrm lib/enlightenment/modules/uptime
+lib/enlightenment/modules/uptime/uptime.png
+share/locale/bg/LC_MESSAGES/uptime.mo
+share/locale/eo/LC_MESSAGES/uptime.mo
+share/locale/fi/LC_MESSAGES/uptime.mo
+share/locale/it/LC_MESSAGES/uptime.mo
+share/locale/ja/LC_MESSAGES/uptime.mo
+share/locale/sv/LC_MESSAGES/uptime.mo
+share/nls/POSIX
+share/nls/en_US.US-ASCII
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry lib/enlightenment/modules/uptime/%%E17_ARCH%%
+@dirrmtry lib/enlightenment/modules/uptime
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-weather/Makefile b/x11-wm/e17-module-weather/Makefile
index 8d4ccdd37b55..458c9d203ff7 100644
--- a/x11-wm/e17-module-weather/Makefile
+++ b/x11-wm/e17-module-weather/Makefile
@@ -6,27 +6,25 @@
 #
 
 PORTNAME=	weather
-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 weather 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-weather/distinfo b/x11-wm/e17-module-weather/distinfo
index 286d80bf9239..51bc6124cecc 100644
--- a/x11-wm/e17-module-weather/distinfo
+++ b/x11-wm/e17-module-weather/distinfo
@@ -1,3 +1,3 @@
-MD5 (weather-23062006.tar.bz2) = ea95150b91bd794e1c4d2381e4729a80
-SHA256 (weather-23062006.tar.bz2) = 4847c88494e6f33424911464f91cfe696ae82e70ed512fd900e70a1123ce3ea8
-SIZE (weather-23062006.tar.bz2) = 941161
+MD5 (weather-20060926.tar.bz2) = 6bda3b61f7f026040865a262305fc9a4
+SHA256 (weather-20060926.tar.bz2) = 02371844b0d466d7a90ad47bef5e40470dec77aff07c8635cea4cf985ba384d3
+SIZE (weather-20060926.tar.bz2) = 948459
diff --git a/x11-wm/e17-module-weather/files/patch-e_mod_main.c b/x11-wm/e17-module-weather/files/patch-e_mod_main.c
deleted file mode 100644
index 64cfef8a20e0..000000000000
--- a/x11-wm/e17-module-weather/files/patch-e_mod_main.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- e_mod_main.c.orig	Thu Jul  6 23:05:04 2006
-+++ e_mod_main.c	Thu Jul  6 23:05:19 2006
-@@ -354,7 +354,8 @@
- EAPI int
- e_modapi_about(E_Module *m)
- {
--   e_module_dialog_show(D_("Enlightenment Weather Module"), D_("A weather forecast module for Enlightenment"));
-+   e_module_dialog_show(m, D_("Enlightenment Weather Module"), 
-+	D_("A weather forecast module for Enlightenment"));
-    return 1;
- }
- 
diff --git a/x11-wm/e17-module-weather/pkg-plist b/x11-wm/e17-module-weather/pkg-plist
index 66c078bb5d6f..bd4bcd2c0fbd 100644
--- a/x11-wm/e17-module-weather/pkg-plist
+++ b/x11-wm/e17-module-weather/pkg-plist
@@ -1,4 +1,6 @@
-lib/enlightenment/modules/weather/VeraBd.ttf
+lib/enlightenment/modules/weather/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/weather/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/weather/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/weather/images/blizzard.png
 lib/enlightenment/modules/weather/images/blowingsnow.png
 lib/enlightenment/modules/weather/images/chancetstorm.png
@@ -61,17 +63,16 @@ lib/enlightenment/modules/weather/images/unknown.png
 lib/enlightenment/modules/weather/images/wind.png
 lib/enlightenment/modules/weather/images/wswarning.png
 lib/enlightenment/modules/weather/images/wswatch.png
-lib/enlightenment/modules/weather/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/weather/module.eap
-lib/enlightenment/modules/weather/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/weather/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/weather/module.desktop
+lib/enlightenment/modules/weather/module.edj
 lib/enlightenment/modules/weather/module_icon.png
-lib/enlightenment/modules/weather/vera.ttf
-lib/enlightenment/modules/weather/weather.edc
 lib/enlightenment/modules/weather/weather.edj
 %%NLS%%share/locale/eo/LC_MESSAGES/weather.mo
 %%NLS%%share/locale/it/LC_MESSAGES/weather.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/weather.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/weather.mo
 @dirrm lib/enlightenment/modules/weather/images
-@dirrm lib/enlightenment/modules/weather/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/weather/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/weather
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-winselector/Makefile b/x11-wm/e17-module-winselector/Makefile
new file mode 100644
index 000000000000..553c0ec4c557
--- /dev/null
+++ b/x11-wm/e17-module-winselector/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	winselector
+# Date created:		2006-08-15
+# Whom:			Stanislav Sedov <ssedov@mbsd.msk.ru>
+#
+# $MBSDlabs$
+# $FreeBSD$
+#
+
+PORTNAME=	winselector
+PORTVERSION=	20060926
+CATEGORIES=	x11
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+PKGNAMEPREFIX=	e17-module-
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	An e17 module to switch between windows
+
+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_GMAKE=	yes
+USE_GNOME=	pkgconfig gnometarget
+USE_EFL=	edje
+
+.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-winselector/distinfo b/x11-wm/e17-module-winselector/distinfo
new file mode 100644
index 000000000000..12ddf1232176
--- /dev/null
+++ b/x11-wm/e17-module-winselector/distinfo
@@ -0,0 +1,3 @@
+MD5 (winselector-20060926.tar.bz2) = 7f3f5d26dff799c4c37945043b171d28
+SHA256 (winselector-20060926.tar.bz2) = f6e433dda44c9bedc81b12032a7618b015d33acdb7177becea4e56a2baa13484
+SIZE (winselector-20060926.tar.bz2) = 277497
diff --git a/x11-wm/e17-module-winselector/pkg-descr b/x11-wm/e17-module-winselector/pkg-descr
new file mode 100644
index 000000000000..8e25ba30168d
--- /dev/null
+++ b/x11-wm/e17-module-winselector/pkg-descr
@@ -0,0 +1,4 @@
+An E17 module that enables access to all windows through a shelf button.
+
+Author:	Viktor Kojouharov <vkojouharov@gmail.com>
+WWW:	http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-winselector/pkg-plist b/x11-wm/e17-module-winselector/pkg-plist
new file mode 100644
index 000000000000..27724a16ee28
--- /dev/null
+++ b/x11-wm/e17-module-winselector/pkg-plist
@@ -0,0 +1,11 @@
+lib/enlightenment/modules/winselector/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/winselector/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/winselector/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/winselector/module.desktop
+lib/enlightenment/modules/winselector/module.edj
+lib/enlightenment/modules/winselector/module_icon.png
+lib/enlightenment/modules/winselector/winselector.edj
+@dirrm lib/enlightenment/modules/winselector/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/winselector
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-utils/Makefile b/x11-wm/e17-utils/Makefile
index 7eaa6c1185b4..5322ae6666e2 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 af98e261ab80..af03eaf36cd6 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 0a50165550f1..000000000000
--- 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 ea1b1b0fc313..3092b77dc2d3 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
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index 82232ce1d6ce..a6cbb3d0ce0a 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -6,33 +6,25 @@
 #
 
 PORTNAME=	enlightenment
-PORTVERSION=	0.16.999.032
+PORTVERSION=	20060926
 PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://enlightenment.freedesktop.org/files/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+DISTNAME=	e-${PORTVERSION}
 
-MAINTAINER=	vanilla@FreeBSD.org
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	A very artistic X window manager
 
-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
-
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomehack gnometarget
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack gnometarget pkgconfig
+USE_EFL=	imlib2 evas edje ecore embryo eet
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 NO_LATEST_LINK=	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}
 
 .include <bsd.port.pre.mk>
 
@@ -40,4 +32,5 @@ PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
 IGNORE=	does not build on 4.X
 .endif
 
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
 .include <bsd.port.post.mk>
diff --git a/x11-wm/enlightenment-devel/bsd.efl.mk b/x11-wm/enlightenment-devel/bsd.efl.mk
new file mode 100644
index 000000000000..58a4c15dca60
--- /dev/null
+++ b/x11-wm/enlightenment-devel/bsd.efl.mk
@@ -0,0 +1,307 @@
+#
+# $MBSDlabs: portmk/bsd.efl.mk,v 1.17 2006/10/02 14:57:48 stas Exp $
+# $FreeBSD$
+#
+# bsd.efl.mk - Support for Enlightenment Foundation Libraries (EFL)
+#
+# Author: Stanislav Sedov <ssedov@mbsd.msk.ru>
+# Inspired by bsd.sdl.mk by Edwin Groothuis <edwin@freebsd.org>
+#
+# You can specify EFL-related library dependency using "USE_EFL=" statement,
+# e.g. "USE_EFL= ecore evas" will add x11/ecore and graphics/evas as dependency
+# for your port.
+# You can check existency of certain library throught "WANT_EFL/HAVE_EFL" pair.
+# Note: WANT_EFL should be defined before including <bsd.port.pre.mk>, and
+# HAVE_EFL variable could be tested after it. For example:
+#
+#	WANT_EFL=	yes
+#	.include <bsd.port.pre.mk>
+#	.if ${HAVE_EFL:Mevas}
+#	USE_EFL+=	evas
+#	.endif
+#
+# Currently recognized variables are:
+# USE_EFL	- lists all EFL libraries which port depends on
+# WANT_EFL	- the port wants to test which of EFL libraries are installed
+#		  on the target system
+# USE_EFL_ESMART- the ports depends on specified esmart objects (or on all
+#		  esmart objects if "yes")
+#
+# The following variables could be tested after inclusion of bsd.port.pre.mk:
+# HAVE_EFL	- lists all EFL libraries which are available on target system
+# HAVE_EFL_ESMART - esmart objects available
+#
+# Feel free to send any comments and suggestion to maintainer.
+#
+
+EFL_Include_MAINTAINER=	ssedov@mbsd.msk.ru
+
+#
+# Define all supported libraries
+#
+_USE_EFL_ALL=	ecore edb edje eet embryo emotion engrave enhance epeg \
+		epsilon etk etox evas evfs ewl exml imlib2
+
+# For each library supported we define the following variables:
+#	_%%LIB%%_CATEGORY	- category the port belongs to
+#	_%%LIB%%_DEPENDS	- other EFL libraries the library
+#		itself depends on. We'll define them explicitly
+#		to handle unwanted deinstalls.
+#	_%%LIB%%_PREFIX		- where the library is installed
+#	_%%LIB%%_VERSION	- version of the shared library
+#	_%%LIB%%_SLIB		- name of the shared library
+#
+
+_ecore_CATEGORY=	x11
+_ecore_DEPENDS=		evas
+_ecore_PREFIX=		${LOCALBASE}
+_ecore_VERSION=		1
+
+_edb_CATEGORY=		databases
+_edb_PREFIX=		${LOCALBASE}
+_edb_VERSION=		1
+
+_eet_CATEGORY=		devel
+_eet_PREFIX=		${LOCALBASE}
+_eet_VERSION=		9
+
+_edje_CATEGORY=		graphics
+_edje_DEPENDS=		embryo eet imlib2 evas ecore
+_edje_PREFIX=		${LOCALBASE}
+_edje_VERSION=		5
+
+_embryo_CATEGORY=	lang
+_embryo_PREFIX=		${LOCALBASE}
+_embryo_VERSION=	9
+
+_emotion_CATEGORY=	multimedia
+_emotion_DEPENDS=	ecore edje eet embryo evas
+_emotion_PREFIX=	${LOCALBASE}
+_emotion_VERSION=	0
+
+_engrave_CATEGORY=	devel
+_engrave_DEPENDS=	ecore evas
+_engrave_PREFIX=	${LOCALBASE}
+_engrave_VERSION=	1
+
+_enhance_CATEGORY=	x11-toolkits
+_enhance_DEPENDS=	ecore etk exml
+_enhance_PREFIX=	${LOCALBASE}
+_enhance_VERSION=	0
+
+_epeg_CATEGORY=		graphics
+_epeg_PREFIX=		${LOCALBASE}
+_epeg_VERSION=		9
+
+_epsilon_CATEGORY=	graphics
+_epsilon_DEPENDS=	epeg edje imlib2 ecore
+_epsilon_PREFIX=	${LOCALBASE}
+_epsilon_VERSION=	0
+
+_etk_CATEGORY=		x11-toolkits
+_etk_DEPENDS=		evas ecore edje
+_etk_PREFIX=		${LOCALBASE}
+_etk_VERSION=		1
+
+_etox_CATEGORY=		x11-toolkits
+_etox_DEPENDS=		edb evas ecore
+_etox_PREFIX=		${LOCALBASE}
+_etox_VERSION=		0
+
+_evas_CATEGORY=		graphics
+_evas_DEPENDS=		eet edb
+_evas_PREFIX=		${LOCALBASE}
+_evas_VERSION=		1
+
+_evfs_CATEGORY=		devel
+_evfs_DEPENDS=		eet ecore
+_evfs_PREFIX=		${LOCALBASE}
+_evfs_VERSION=		0
+
+_ewl_CATEGORY=		x11-toolkits
+_ewl_DEPENDS=		evas ecore edje epsilon
+_ewl_PREFIX=		${LOCALBASE}
+_ewl_VERSION=		0
+
+_exml_CATEGORY=		textproc
+_exml_DEPENDS=		ecore
+_exml_PREFIX=		${LOCALBASE}
+_exml_VERSION=		1
+
+_imlib2_CATEGORY=	graphics
+_imlib2_PREFIX=		${LOCALBASE}
+_imlib2_VERSION=	3
+_imlib2_SLIB=		Imlib2
+
+#
+# Assign values for variables which were not defined explicitly
+#
+.for LIB in ${_USE_EFL_ALL}
+. if !defined(_${LIB}_DEPENDS)
+_${LIB}_DEPENDS=	#empty
+. endif
+. if !defined(_${LIB}_SLIB)
+_${LIB}_SLIB=${LIB}
+. endif
+.endfor
+
+#
+# Esmart support. We'll define esmart components in the way the're 
+# defined for EFL.
+# Values processed:
+# _esmart_COMP_CATEGORY	- Where the port for this esmart object is located
+# _esmart_COMP_PORTNAME	- Object's port subdirectory
+# _esmart_COMP_DEPENDS	- Other components which this object depends on
+# _esmart_COMP_PREFIX	- Where the shared library for this object is located
+# _esmart_COMP_VERSION	- Version of the shared library
+#
+
+# All components that are currently supported
+_EFL_ESMART_ALL=	container draggies file_dialog text_entry \
+			thumb trans_x11
+
+#
+# Generic stock esmart definitions
+#
+_EFL_ESMART_CATEGORY=	graphics
+_EFL_ESMART_PORTNAME=	esmart
+_EFL_ESMART_DEPENDS=	epsilon evas ecore imlib2 edje
+_EFL_ESMART_PREFIX=	${LOCALBASE}
+_EFL_ESMART_VERSION=	0
+
+#
+# Assign values for variables which were not defined explicitly
+#
+.for COMP in ${_EFL_ESMART_ALL}
+. if !defined(_esmart_${COMP}_CATEGORY)
+_esmart_${COMP}_CATEGORY=	${_EFL_ESMART_CATEGORY}
+. endif
+. if !defined(_esmart_${COMP}_PORTNAME)
+_esmart_${COMP}_PORTNAME=	${_EFL_ESMART_PORTNAME}
+. endif
+. if !defined(_esmart_${COMP}_PREFIX)
+_esmart_${COMP}_PREFIX=	${_EFL_ESMART_PREFIX}
+. endif
+. if !defined(_esmart_${COMP}_DEPENDS)
+_esmart_${COMP}_DEPENDS=	#empty
+. endif
+. if !defined(_esmart_${COMP}_SLIB)
+_esmart_${COMP}_SLIB=	esmart_${COMP}
+. endif
+. if !defined(_esmart_${COMP}_VERSION)
+_esmart_${COMP}_VERSION=	${_EFL_ESMART_VERSION}
+. endif
+.endfor
+
+#
+# Handle WANT_EFL feature
+#
+.if !defined(AFTERPORTMK)
+.if !defined(EFL_Include_pre)
+
+EFL_Include_pre=	bsd.efl.mk
+
+HAVE_EFL?=
+HAVE_EFL_ESMART?=
+.if defined(WANT_EFL)
+. for LIB in ${_USE_EFL_ALL}
+.  if exists(${_${LIB}_PREFIX}/lib/lib${_${LIB}_SLIB}.so.${_${LIB}_VERSION})
+HAVE_EFL+=	${LIB}
+.  endif
+. endfor
+. for COMP in ${_EFL_ESMART_ALL}
+.  if exists(${_esmart_${COMP}_PREFIX}/lib/lib${_esmart_${COMP}_SLIB}.so.${_esmart_${COMP}_VERSION})
+HAVE_EFL_ESMART+=	${COMP}
+.  endif
+. endfor
+.endif
+
+.endif #EFL_Include_pre
+.endif #AFTERPORTMK
+
+#
+# Handle USE_EFL & USE_ESMART feature
+#
+.if !defined(BEFOREPORTMK)
+.if !defined(EFL_Include_post)
+
+.if defined(USE_EFL_ESMART)
+
+USE_EFL+=	${_EFL_ESMART_DEPENDS} #we use EFL too
+
+_USE_EFL_ESMART=	#empty
+.if USE_EFL_ESMART=="yes"
+_USE_EFL_ESMART=	${_EFL_ESMART_ALL}
+.else
+. for COMP in ${USE_EFL_ESMART}
+.  if ${_EFL_ESMART_ALL:M${COMP}}==""
+IGNORE=	cannot install: unknown Esmart component ${COMP}
+.  else
+_USE_EFL_ESMART+=	${COMP} ${_esmart_${COMP}_DEPENDS}
+.  endif
+. endfor
+.endif
+
+# Get rid of duplicates
+.if ${OSVERSION} > 700016
+_USE_EFL_ESMART_UQ=	${_USE_EFL_ESMART:O:u}
+.else
+_USE_EFL_ESMART_UQ=	#empty
+. for COMP in ${_USE_EFL_ESMART}
+.  if ${_USE_EFL_ESMART_UQ:M${COMP}}==""
+_USE_EFL_ESMART_UQ+=	${COMP}
+.  endif
+. endfor
+.endif
+
+.for COMP in ${_USE_EFL_ESMART_UQ}
+LIB_DEPENDS+=	${_esmart_${COMP}_SLIB}.${_esmart_${COMP}_VERSION}:${PORTSDIR}/${_esmart_${COMP}_CATEGORY}/${_esmart_${COMP}_PORTNAME}
+.endfor
+
+.endif #USE_EFL_ESMART
+
+.if defined(USE_EFL)
+
+EFL_Include_post=	bsd.efl.mk
+
+#
+# Check if we have all libraries requiested and build depends list
+#
+_USE_EFL=	#empty
+.for LIB in ${USE_EFL}
+. if ${_USE_EFL_ALL:M${LIB}}==""
+IGNORE=	cannot install: unknown library ${LIB}
+. endif
+_USE_EFL+=	${_${LIB}_DEPENDS} ${LIB}
+.endfor
+
+#
+# Get rid of duplicates
+#
+_USE_EFL_UQ=	#empty
+.for LIB in ${_USE_EFL}
+. if ${_USE_EFL_UQ:M${LIB}}==""
+_USE_EFL_UQ+=	${LIB}
+. endif
+.endfor
+
+#
+# define dependencies
+#
+.for LIB in ${_USE_EFL_UQ}
+LIB_DEPENDS+=	${_${LIB}_SLIB}.${_${LIB}_VERSION}:${PORTSDIR}/${_${LIB}_CATEGORY}/${LIB}
+.endfor
+
+#
+# Initialize configure enviropment
+#
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${LDFLAGS}"
+
+PLIST_SUB+=	E17_ARCH=freebsd${OSREL}-${ARCH}
+
+.endif #USE_EFL
+
+.endif #EFL_Include_post
+.endif #BEFOREPORTMK
diff --git a/x11-wm/enlightenment-devel/distinfo b/x11-wm/enlightenment-devel/distinfo
index 934d88520b6d..96e4ff935a0d 100644
--- a/x11-wm/enlightenment-devel/distinfo
+++ b/x11-wm/enlightenment-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (enlightenment-0.16.999.032.tar.gz) = 206dca9d967ea4898ca0b9139e51e31f
-SHA256 (enlightenment-0.16.999.032.tar.gz) = 7643f56131a6db9635e0224b1d6806c412c4638731f62355cf892236d0dcded9
-SIZE (enlightenment-0.16.999.032.tar.gz) = 29911903
+MD5 (e-20060926.tar.bz2) = 440377d3f561b2dc8dbc5a04be50193f
+SHA256 (e-20060926.tar.bz2) = fdba2748a0a172d11b5edd8f8ee1ecec17b4e270a7b9983a8d8f156d5e95d6bd
+SIZE (e-20060926.tar.bz2) = 31174715
diff --git a/x11-wm/enlightenment-devel/pkg-plist b/x11-wm/enlightenment-devel/pkg-plist
index e33de5dabce8..ce5df7f81b4c 100644
--- a/x11-wm/enlightenment-devel/pkg-plist
+++ b/x11-wm/enlightenment-devel/pkg-plist
@@ -1,17 +1,18 @@
+bin/eap_to_desktop
 bin/enlightenment
 bin/enlightenment-config
 bin/enlightenment_eapp
-bin/enlightenment_eapp_cache_gen
 bin/enlightenment_imc
 bin/enlightenment_remote
 bin/enlightenment_start
+bin/enlightenment_sys
 bin/enlightenment_thumb
+etc/enlightenment/sysactions.conf
 include/enlightenment/e.h
 include/enlightenment/e_about.h
 include/enlightenment/e_actions.h
 include/enlightenment/e_alert.h
 include/enlightenment/e_apps.h
-include/enlightenment/e_apps_cache.h
 include/enlightenment/e_apps_error.h
 include/enlightenment/e_atoms.h
 include/enlightenment/e_bg.h
@@ -19,7 +20,9 @@ include/enlightenment/e_bindings.h
 include/enlightenment/e_border.h
 include/enlightenment/e_box.h
 include/enlightenment/e_canvas.h
+include/enlightenment/e_color.h
 include/enlightenment/e_color_class.h
+include/enlightenment/e_color_dialog.h
 include/enlightenment/e_config.h
 include/enlightenment/e_config_dialog.h
 include/enlightenment/e_configure.h
@@ -32,29 +35,21 @@ include/enlightenment/e_deskpreview.h
 include/enlightenment/e_dialog.h
 include/enlightenment/e_dnd.h
 include/enlightenment/e_eap_editor.h
+include/enlightenment/e_editable.h
 include/enlightenment/e_entry.h
 include/enlightenment/e_entry_dialog.h
 include/enlightenment/e_error.h
 include/enlightenment/e_exebuf.h
 include/enlightenment/e_exehist.h
-include/enlightenment/e_file_dialog.h
-include/enlightenment/e_file_selector.h
-include/enlightenment/e_fileman.h
-include/enlightenment/e_fileman_file.h
-include/enlightenment/e_fileman_icon.h
-include/enlightenment/e_fileman_mime.h
-include/enlightenment/e_fileman_smart.h
+include/enlightenment/e_fdo_menu_to_order.h
 include/enlightenment/e_fm.h
+include/enlightenment/e_fm_mime.h
 include/enlightenment/e_focus.h
 include/enlightenment/e_font.h
 include/enlightenment/e_gadcon.h
-include/enlightenment/e_gadget.h
-include/enlightenment/e_gadman.h
 include/enlightenment/e_grabinput.h
 include/enlightenment/e_hints.h
 include/enlightenment/e_icon.h
-include/enlightenment/e_icon_canvas.h
-include/enlightenment/e_icon_grid.h
 include/enlightenment/e_ilist.h
 include/enlightenment/e_includes.h
 include/enlightenment/e_init.h
@@ -63,8 +58,7 @@ include/enlightenment/e_int_border_locks.h
 include/enlightenment/e_int_border_menu.h
 include/enlightenment/e_int_border_prop.h
 include/enlightenment/e_int_border_remember.h
-include/enlightenment/e_int_config_background.h
-include/enlightenment/e_int_config_background_import.h
+include/enlightenment/e_int_config_apps.h
 include/enlightenment/e_int_config_cfgdialogs.h
 include/enlightenment/e_int_config_cursor.h
 include/enlightenment/e_int_config_desklock.h
@@ -73,21 +67,28 @@ include/enlightenment/e_int_config_display.h
 include/enlightenment/e_int_config_exebuf.h
 include/enlightenment/e_int_config_focus.h
 include/enlightenment/e_int_config_fonts.h
-include/enlightenment/e_int_config_hinting.h
+include/enlightenment/e_int_config_icon_themes.h
+include/enlightenment/e_int_config_intl.h
 include/enlightenment/e_int_config_keybindings.h
-include/enlightenment/e_int_config_startup.h
 include/enlightenment/e_int_config_menus.h
 include/enlightenment/e_int_config_modules.h
+include/enlightenment/e_int_config_mousebindings.h
 include/enlightenment/e_int_config_paths.h
 include/enlightenment/e_int_config_performance.h
-include/enlightenment/e_int_config_shelf.h
+include/enlightenment/e_int_config_sh%%PORTOBJFORMAT%%.h
+include/enlightenment/e_int_config_startup.h
 include/enlightenment/e_int_config_theme.h
+include/enlightenment/e_int_config_theme_import.h
+include/enlightenment/e_int_config_transitions.h
+include/enlightenment/e_int_config_wallpaper.h
+include/enlightenment/e_int_config_wallpaper_gradient.h
+include/enlightenment/e_int_config_wallpaper_import.h
 include/enlightenment/e_int_config_window_display.h
 include/enlightenment/e_int_config_window_manipulation.h
 include/enlightenment/e_int_config_winlist.h
 include/enlightenment/e_int_gadcon_config.h
 include/enlightenment/e_int_menus.h
-include/enlightenment/e_int_shelf_config.h
+include/enlightenment/e_int_sh%%PORTOBJFORMAT%%_config.h
 include/enlightenment/e_intl.h
 include/enlightenment/e_ipc.h
 include/enlightenment/e_ipc_codec.h
@@ -102,6 +103,7 @@ include/enlightenment/e_mmx.h
 include/enlightenment/e_module.h
 include/enlightenment/e_moveresize.h
 include/enlightenment/e_msg.h
+include/enlightenment/e_obj_dialog.h
 include/enlightenment/e_object.h
 include/enlightenment/e_pan.h
 include/enlightenment/e_path.h
@@ -113,11 +115,13 @@ include/enlightenment/e_remember.h
 include/enlightenment/e_resist.h
 include/enlightenment/e_scrollframe.h
 include/enlightenment/e_sha1.h
-include/enlightenment/e_shelf.h
+include/enlightenment/e_sh%%PORTOBJFORMAT%%.h
 include/enlightenment/e_signals.h
 include/enlightenment/e_slider.h
+include/enlightenment/e_spectrum.h
 include/enlightenment/e_startup.h
 include/enlightenment/e_stolen.h
+include/enlightenment/e_sys.h
 include/enlightenment/e_table.h
 include/enlightenment/e_test.h
 include/enlightenment/e_theme.h
@@ -129,13 +133,14 @@ include/enlightenment/e_utils.h
 include/enlightenment/e_widget.h
 include/enlightenment/e_widget_button.h
 include/enlightenment/e_widget_check.h
+include/enlightenment/e_widget_color_well.h
 include/enlightenment/e_widget_config_list.h
+include/enlightenment/e_widget_csel.h
+include/enlightenment/e_widget_cslider.h
 include/enlightenment/e_widget_entry.h
-include/enlightenment/e_widget_fileman.h
 include/enlightenment/e_widget_framelist.h
 include/enlightenment/e_widget_frametable.h
 include/enlightenment/e_widget_fsel.h
-include/enlightenment/e_widget_iconsel.h
 include/enlightenment/e_widget_ilist.h
 include/enlightenment/e_widget_image.h
 include/enlightenment/e_widget_label.h
@@ -144,6 +149,7 @@ include/enlightenment/e_widget_preview.h
 include/enlightenment/e_widget_radio.h
 include/enlightenment/e_widget_scrollframe.h
 include/enlightenment/e_widget_slider.h
+include/enlightenment/e_widget_spectrum.h
 include/enlightenment/e_widget_table.h
 include/enlightenment/e_widget_textblock.h
 include/enlightenment/e_widget_tlist.h
@@ -151,45 +157,58 @@ include/enlightenment/e_win.h
 include/enlightenment/e_winlist.h
 include/enlightenment/e_xinerama.h
 include/enlightenment/e_zone.h
-lib/enlightenment/modules/battery/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/battery/module.eap
-lib/enlightenment/modules/battery/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/battery/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/clock/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/clock/module.eap
-lib/enlightenment/modules/clock/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/clock/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/cpufreq/%%MODULE_ARCH%%/freqset
-lib/enlightenment/modules/cpufreq/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/cpufreq/module.eap
-lib/enlightenment/modules/cpufreq/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/cpufreq/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/dropshadow/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/dropshadow/module.eap
-lib/enlightenment/modules/dropshadow/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/dropshadow/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/ibar/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/ibar/module.eap
-lib/enlightenment/modules/ibar/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/ibar/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/ibox/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/ibox/module.eap
-lib/enlightenment/modules/ibox/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/ibox/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/pager/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/pager/module.eap
-lib/enlightenment/modules/pager/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/pager/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/start/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/start/module.eap
-lib/enlightenment/modules/start/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/start/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/temperature/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/temperature/module.eap
-lib/enlightenment/modules/temperature/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/temperature/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/battery/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/battery/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/battery/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/battery/module.desktop
+lib/enlightenment/modules/battery/module.edj
+lib/enlightenment/modules/clock/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/clock/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/clock/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/clock/module.desktop
+lib/enlightenment/modules/clock/module.edj
+lib/enlightenment/modules/cpufreq/%%E17_ARCH%%/freqset
+lib/enlightenment/modules/cpufreq/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/cpufreq/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/cpufreq/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/cpufreq/module.desktop
+lib/enlightenment/modules/cpufreq/module.edj
+lib/enlightenment/modules/dropshadow/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/dropshadow/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/dropshadow/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/dropshadow/module.desktop
+lib/enlightenment/modules/dropshadow/module.edj
+lib/enlightenment/modules/ibar/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/ibar/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/ibar/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/ibar/module.desktop
+lib/enlightenment/modules/ibar/module.edj
+lib/enlightenment/modules/ibox/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/ibox/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/ibox/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/ibox/module.desktop
+lib/enlightenment/modules/ibox/module.edj
+lib/enlightenment/modules/pager/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/pager/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/pager/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/pager/module.desktop
+lib/enlightenment/modules/pager/module.edj
+lib/enlightenment/modules/start/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/start/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/start/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/start/module.desktop
+lib/enlightenment/modules/start/module.edj
+lib/enlightenment/modules/temperature/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/temperature/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/temperature/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/temperature/module.desktop
+lib/enlightenment/modules/temperature/module.edj
 %%DATADIR%%/AUTHORS
 %%DATADIR%%/COPYING
+%%DATADIR%%/data/backgrounds/Blue_Sky_Tree.edj
+%%DATADIR%%/data/backgrounds/Cracked_Earth.edj
+%%DATADIR%%/data/backgrounds/Ivy_Wall.edj
+%%DATADIR%%/data/backgrounds/Ladybug.edj
 %%DATADIR%%/data/fonts/Vera.COPYING
 %%DATADIR%%/data/fonts/Vera.ttf
 %%DATADIR%%/data/fonts/VeraBI.ttf
@@ -203,6 +222,10 @@ lib/enlightenment/modules/temperature/%%MODULE_ARCH%%/module.so
 %%DATADIR%%/data/fonts/VeraSeBd.ttf
 %%DATADIR%%/data/fonts/fonts.alias
 %%DATADIR%%/data/fonts/fonts.dir
+%%DATADIR%%/data/icons/audio_player.png
+%%DATADIR%%/data/icons/video_player.png
+%%DATADIR%%/data/icons/web_browser.png
+%%DATADIR%%/data/icons/xterm.png
 %%DATADIR%%/data/images/button_in.png
 %%DATADIR%%/data/images/button_out.png
 %%DATADIR%%/data/images/e.png
@@ -210,7 +233,7 @@ lib/enlightenment/modules/temperature/%%MODULE_ARCH%%/module.so
 %%DATADIR%%/data/images/test.edj
 %%DATADIR%%/data/images/test.jpg
 %%DATADIR%%/data/images/test.png
-%%DATADIR%%/data/init/init.edj
+%%DATADIR%%/data/init/default.edj
 %%DATADIR%%/data/input_methods/iiimf.imc
 %%DATADIR%%/data/input_methods/scim.imc
 %%DATADIR%%/data/input_methods/uim.imc
@@ -218,6 +241,8 @@ lib/enlightenment/modules/temperature/%%MODULE_ARCH%%/module.so
 %%DATADIR%%/data/other/efm_favorites.tar.gz
 %%DATADIR%%/data/other/icon_example.tar.gz
 %%DATADIR%%/data/themes/default.edj
+%%DATADIR%%/doc/FDO.txt
+%%DATADIR%%/doc/cache.txt
 %%DATADIR%%/doc/documentation.html
 %%DATADIR%%/doc/enlightenment.png
 share/locale/bg/LC_MESSAGES/enlightenment.mo
@@ -243,34 +268,55 @@ share/locale/sv/LC_MESSAGES/enlightenment.mo
 share/locale/zh_CN/LC_MESSAGES/enlightenment.mo
 share/locale/zh_TW/LC_MESSAGES/enlightenment.mo
 share/xsessions/enlightenment.desktop
+@dirrmtry share/xsessions
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
 @dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/data/themes
 @dirrm %%DATADIR%%/data/other
-@dirrm %%DATADIR%%/data/init
 @dirrm %%DATADIR%%/data/input_methods
+@dirrm %%DATADIR%%/data/init
 @dirrm %%DATADIR%%/data/images
+@dirrm %%DATADIR%%/data/icons
 @dirrm %%DATADIR%%/data/fonts
+@dirrm %%DATADIR%%/data/backgrounds
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
-@dirrmtry share/xsessions
-@dirrm lib/enlightenment/modules/temperature/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/temperature/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/temperature
-@dirrm lib/enlightenment/modules/start/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/start/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/start
-@dirrm lib/enlightenment/modules/pager/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/pager/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/pager
-@dirrm lib/enlightenment/modules/ibox/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/ibox/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/ibox
-@dirrm lib/enlightenment/modules/ibar/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/ibar/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/ibar
-@dirrm lib/enlightenment/modules/dropshadow/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/dropshadow/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/dropshadow
-@dirrm lib/enlightenment/modules/cpufreq/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/cpufreq/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/cpufreq
-@dirrm lib/enlightenment/modules/clock/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/clock/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/clock
-@dirrm lib/enlightenment/modules/battery/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/battery/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/battery
 @dirrm lib/enlightenment/modules
 @dirrm lib/enlightenment
 @dirrm include/enlightenment
+@dirrm etc/enlightenment
author	Stanislav Sedov <stas@FreeBSD.org>	2006-10-08 13:48:37 +0000
committer	Stanislav Sedov <stas@FreeBSD.org>	2006-10-08 13:48:37 +0000
commit	ee774b0f4fa7f1842f6b4dfdfe60b22cbcf12442 (patch)
tree	1bf12eadb5a7920766bf7a613174c0475b810d0d /x11-wm
parent	32e98c797bd5b952894ff185e59df8a91844f4ab (diff)
download	ports-ee774b0f4fa7f1842f6b4dfdfe60b22cbcf12442.tar.gz ports-ee774b0f4fa7f1842f6b4dfdfe60b22cbcf12442.zip