- 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)
author: stas <stas@FreeBSD.org> 2006-10-08 21:48:37 +0800
committer: stas <stas@FreeBSD.org> 2006-10-08 21:48:37 +0800
commit: 173755349dc2dd22744f67ee65b533ef3b1c3649 (patch)
tree: fcddf9b33a006f3b495b40ac5641012787c2a99e /x11
parent: ed21c3e01f7d2d837804666f445b9249d985c327 (diff)
download: freebsd-ports-gnome-173755349dc2dd22744f67ee65b533ef3b1c3649.tar.gz
freebsd-ports-gnome-173755349dc2dd22744f67ee65b533ef3b1c3649.tar.zst
freebsd-ports-gnome-173755349dc2dd22744f67ee65b533ef3b1c3649.zip
77 files changed, 747 insertions, 590 deletions
diff --git a/x11/e17-module-calendar/Makefile b/x11/e17-module-calendar/Makefile
index a0c387313007..96735db318aa 100644
--- a/x11/e17-module-calendar/Makefile
+++ b/x11/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/e17-module-calendar/distinfo b/x11/e17-module-calendar/distinfo
index 3e641ac6c035..492ca7b8e1dc 100644
--- a/x11/e17-module-calendar/distinfo
+++ b/x11/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/e17-module-calendar/files/patch-src_e_mod_main.c b/x11/e17-module-calendar/files/patch-src_e_mod_main.c
deleted file mode 100644
index 1425a4ef7ec1..000000000000
--- a/x11/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/e17-module-cpu/Makefile b/x11/e17-module-cpu/Makefile
index fa8c0da18c55..015ecef1a6cb 100644
--- a/x11/e17-module-cpu/Makefile
+++ b/x11/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/e17-module-cpu/distinfo b/x11/e17-module-cpu/distinfo
index 5b0ebc87a26d..7a0ddda8eeeb 100644
--- a/x11/e17-module-cpu/distinfo
+++ b/x11/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/e17-module-cpu/files/patch-e_mod_main.c b/x11/e17-module-cpu/files/patch-e_mod_main.c
deleted file mode 100644
index 79b3a8ba3412..000000000000
--- a/x11/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/e17-module-cpu/pkg-plist b/x11/e17-module-cpu/pkg-plist
index 33b6656b67a2..42144630fef3 100644
--- a/x11/e17-module-cpu/pkg-plist
+++ b/x11/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/e17-module-deskshow/Makefile b/x11/e17-module-deskshow/Makefile
index bf966ed69126..3bd1342191c7 100644
--- a/x11/e17-module-deskshow/Makefile
+++ b/x11/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/e17-module-deskshow/distinfo b/x11/e17-module-deskshow/distinfo
index bbc3c00c9a13..7bf5af25b44c 100644
--- a/x11/e17-module-deskshow/distinfo
+++ b/x11/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/e17-module-deskshow/pkg-plist b/x11/e17-module-deskshow/pkg-plist
index 8e21b5eb7c54..a5528559f717 100644
--- a/x11/e17-module-deskshow/pkg-plist
+++ b/x11/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/e17-module-devian/Makefile b/x11/e17-module-devian/Makefile
index 5f4d9cdb1e9b..5d5e7017d2d6 100644
--- a/x11/e17-module-devian/Makefile
+++ b/x11/e17-module-devian/Makefile
@@ -6,26 +6,26 @@
 #
 
 PORTNAME=	devian
-PORTVERSION=	20060728
+PORTVERSION=	20060926
 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 module that displays images and rss feeds
 
-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"
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+IGNORE=		doesn't compile with recent e17
 
-.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/e17-module-devian/distinfo b/x11/e17-module-devian/distinfo
index a556bbebfa34..7268ad264ee3 100644
--- a/x11/e17-module-devian/distinfo
+++ b/x11/e17-module-devian/distinfo
@@ -1,3 +1,3 @@
-MD5 (devian-20060728.tar.bz2) = 0a89a14c06689bf77fd5eb485922e879
-SHA256 (devian-20060728.tar.bz2) = c3bbaf2fa67dcc2075635368ede0aae4a20c3f0d3b08ae60295aeb5ed1291875
-SIZE (devian-20060728.tar.bz2) = 1115532
+MD5 (devian-20060926.tar.bz2) = ee8a004b60761c2e1f50d0b02cf7ba06
+SHA256 (devian-20060926.tar.bz2) = f037f93eac25e71003a56cffd0d8c383c096260dea65e4acf2c868615156e37d
+SIZE (devian-20060926.tar.bz2) = 1138740
diff --git a/x11/e17-module-engage/Makefile b/x11/e17-module-engage/Makefile
index 9ccc1763fc3d..a7ef92b84a7b 100644
--- a/x11/e17-module-engage/Makefile
+++ b/x11/e17-module-engage/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://mbsd.msk.ru/dist/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Alternative e17 application launcher with tray support
 
 BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
@@ -31,4 +31,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 
 PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
 
+IGNORE=		doesn't compile with recent e17
+
 .include <bsd.port.mk>
diff --git a/x11/e17-module-eveil/Makefile b/x11/e17-module-eveil/Makefile
index e57a1dd80d62..ab0099dd2dcf 100644
--- a/x11/e17-module-eveil/Makefile
+++ b/x11/e17-module-eveil/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	eveil
-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 set alarms and timers
 
-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/e17-module-eveil/distinfo b/x11/e17-module-eveil/distinfo
index e32f420f507b..bf3f9f818699 100644
--- a/x11/e17-module-eveil/distinfo
+++ b/x11/e17-module-eveil/distinfo
@@ -1,3 +1,3 @@
-MD5 (eveil-20060707.tar.bz2) = 96ad35d8454ca13507f54153947a17aa
-SHA256 (eveil-20060707.tar.bz2) = 2c8361145a7d1ef66e6576adbdc84fbbfce03a368ddb2c852f660f0b1a1d48ee
-SIZE (eveil-20060707.tar.bz2) = 432968
+MD5 (eveil-20060926.tar.bz2) = dc87b851c847a84d4a85825ea84c92e2
+SHA256 (eveil-20060926.tar.bz2) = e9d3222d93c86415522ab05bbf3facaed7c6143cf998c993a0fc2815efe942e5
+SIZE (eveil-20060926.tar.bz2) = 440169
diff --git a/x11/e17-module-eveil/pkg-plist b/x11/e17-module-eveil/pkg-plist
index 55039b483dd8..4ef65ffbf605 100644
--- a/x11/e17-module-eveil/pkg-plist
+++ b/x11/e17-module-eveil/pkg-plist
@@ -1,11 +1,21 @@
+lib/enlightenment/modules/eveil/alarm_disabled.png
+lib/enlightenment/modules/eveil/alarm_enabled.png
+lib/enlightenment/modules/eveil/alarm_snooze.png
 lib/enlightenment/modules/eveil/eveil.edc
 lib/enlightenment/modules/eveil/eveil.edj
-lib/enlightenment/modules/eveil/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/eveil/module.eap
-lib/enlightenment/modules/eveil/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/eveil/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/eveil/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/eveil/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/eveil/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/eveil/module.desktop
+lib/enlightenment/modules/eveil/module.edj
+lib/enlightenment/modules/eveil/timer_disabled.png
+lib/enlightenment/modules/eveil/timer_enabled.png
 lib/enlightenment/modules/eveil/vera.ttf
+%%NLS%%share/locale/eo/LC_MESSAGES/eveil.mo
 %%NLS%%share/locale/it/LC_MESSAGES/eveil.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/eveil.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/eveil.mo
-@dirrm lib/enlightenment/modules/eveil/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/eveil/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/eveil
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11/e17-module-flame/Makefile b/x11/e17-module-flame/Makefile
index 52927d0fd452..f41380ec4e8f 100644
--- a/x11/e17-module-flame/Makefile
+++ b/x11/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/e17-module-flame/distinfo b/x11/e17-module-flame/distinfo
index 1a1e925dc9a8..e2b2a353bafc 100644
--- a/x11/e17-module-flame/distinfo
+++ b/x11/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/e17-module-flame/pkg-plist b/x11/e17-module-flame/pkg-plist
index 9ed88f7d9756..716fee610674 100644
--- a/x11/e17-module-flame/pkg-plist
+++ b/x11/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/e17-module-language/Makefile b/x11/e17-module-language/Makefile
index 593b48b4e9ea..25ddecefa9d3 100644
--- a/x11/e17-module-language/Makefile
+++ b/x11/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/e17-module-language/distinfo b/x11/e17-module-language/distinfo
index bcc0a4c24107..385ea90a9d6f 100644
--- a/x11/e17-module-language/distinfo
+++ b/x11/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/e17-module-language/pkg-plist b/x11/e17-module-language/pkg-plist
index c2b6e7a54141..b4a26ed34c97 100644
--- a/x11/e17-module-language/pkg-plist
+++ b/x11/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/e17-module-mail/Makefile b/x11/e17-module-mail/Makefile
index 0740274cc5e6..d002958813c8 100644
--- a/x11/e17-module-mail/Makefile
+++ b/x11/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/e17-module-mail/distinfo b/x11/e17-module-mail/distinfo
index ee79645fe7e4..ef41257f2c56 100644
--- a/x11/e17-module-mail/distinfo
+++ b/x11/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/e17-module-mail/pkg-plist b/x11/e17-module-mail/pkg-plist
index e9882ccdf3f9..d32b8e0e82c8 100644
--- a/x11/e17-module-mail/pkg-plist
+++ b/x11/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/e17-module-mem/Makefile b/x11/e17-module-mem/Makefile
index ae7c42ca79ed..623362f4038e 100644
--- a/x11/e17-module-mem/Makefile
+++ b/x11/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/e17-module-mem/distinfo b/x11/e17-module-mem/distinfo
index 9d89499b0331..cf64d06cdfc1 100644
--- a/x11/e17-module-mem/distinfo
+++ b/x11/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/e17-module-mem/files/patch-e_mod_main.c b/x11/e17-module-mem/files/patch-e_mod_main.c
deleted file mode 100644
index 045b3ea456f8..000000000000
--- a/x11/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/e17-module-mem/pkg-plist b/x11/e17-module-mem/pkg-plist
index 6614afa2ae08..aae66c519dca 100644
--- a/x11/e17-module-mem/pkg-plist
+++ b/x11/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/e17-module-mixer/Makefile b/x11/e17-module-mixer/Makefile
new file mode 100644
index 000000000000..c979be1591a9
--- /dev/null
+++ b/x11/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/e17-module-mixer/distinfo b/x11/e17-module-mixer/distinfo
new file mode 100644
index 000000000000..058aebf14405
--- /dev/null
+++ b/x11/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/e17-module-mixer/pkg-descr b/x11/e17-module-mixer/pkg-descr
new file mode 100644
index 000000000000..f631d3706434
--- /dev/null
+++ b/x11/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/e17-module-mixer/pkg-plist b/x11/e17-module-mixer/pkg-plist
new file mode 100644
index 000000000000..7b5d44decf2c
--- /dev/null
+++ b/x11/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/e17-module-moon/Makefile b/x11/e17-module-moon/Makefile
index aaeb04b9a162..f442da8955c6 100644
--- a/x11/e17-module-moon/Makefile
+++ b/x11/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/e17-module-moon/distinfo b/x11/e17-module-moon/distinfo
index 8a1a8789bb68..872df226239c 100644
--- a/x11/e17-module-moon/distinfo
+++ b/x11/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/e17-module-moon/files/patch-src__e_mod_main.c b/x11/e17-module-moon/files/patch-src__e_mod_main.c
deleted file mode 100644
index 1b64751d1dbd..000000000000
--- a/x11/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/e17-module-moon/pkg-plist b/x11/e17-module-moon/pkg-plist
index 3c1c40aadf35..9e45a173c835 100644
--- a/x11/e17-module-moon/pkg-plist
+++ b/x11/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/e17-module-rain/Makefile b/x11/e17-module-rain/Makefile
index 2bf4b5f17222..77f5f19018dc 100644
--- a/x11/e17-module-rain/Makefile
+++ b/x11/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/e17-module-rain/distinfo b/x11/e17-module-rain/distinfo
index 84ba93d6b7e8..1df8e3b07846 100644
--- a/x11/e17-module-rain/distinfo
+++ b/x11/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/e17-module-rain/pkg-plist b/x11/e17-module-rain/pkg-plist
index 7d2e9998e063..fad84f556792 100644
--- a/x11/e17-module-rain/pkg-plist
+++ b/x11/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/e17-module-screenshot/Makefile b/x11/e17-module-screenshot/Makefile
index aaddd8aacd42..42347fec4de2 100644
--- a/x11/e17-module-screenshot/Makefile
+++ b/x11/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/e17-module-screenshot/distinfo b/x11/e17-module-screenshot/distinfo
index 0836f4795b07..fc042b17e8d8 100644
--- a/x11/e17-module-screenshot/distinfo
+++ b/x11/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/e17-module-screenshot/pkg-plist b/x11/e17-module-screenshot/pkg-plist
index 5cdca64316e5..190a2187bff1 100644
--- a/x11/e17-module-screenshot/pkg-plist
+++ b/x11/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/e17-module-slideshow/Makefile b/x11/e17-module-slideshow/Makefile
index 6e498a894b5a..5b9ac9375aae 100644
--- a/x11/e17-module-slideshow/Makefile
+++ b/x11/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/e17-module-slideshow/distinfo b/x11/e17-module-slideshow/distinfo
index 148b9f6eb244..973d1ebc4ca0 100644
--- a/x11/e17-module-slideshow/distinfo
+++ b/x11/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/e17-module-slideshow/pkg-plist b/x11/e17-module-slideshow/pkg-plist
index ca6c7797c4f8..de126aa1c465 100644
--- a/x11/e17-module-slideshow/pkg-plist
+++ b/x11/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/e17-module-snow/Makefile b/x11/e17-module-snow/Makefile
index 91472f0604ce..f01e84a9df7a 100644
--- a/x11/e17-module-snow/Makefile
+++ b/x11/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/e17-module-snow/distinfo b/x11/e17-module-snow/distinfo
index 2226f0d968cb..b2e53b54dd7b 100644
--- a/x11/e17-module-snow/distinfo
+++ b/x11/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/e17-module-snow/pkg-plist b/x11/e17-module-snow/pkg-plist
index 5437ff0125b6..d3d75cd2e5a8 100644
--- a/x11/e17-module-snow/pkg-plist
+++ b/x11/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/e17-module-uptime/Makefile b/x11/e17-module-uptime/Makefile
index 2b279b4a2bd2..c977b63d67e7 100644
--- a/x11/e17-module-uptime/Makefile
+++ b/x11/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/e17-module-uptime/distinfo b/x11/e17-module-uptime/distinfo
index 851ccb9f799e..5257ad423257 100644
--- a/x11/e17-module-uptime/distinfo
+++ b/x11/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/e17-module-uptime/pkg-plist b/x11/e17-module-uptime/pkg-plist
index 9ba376e9e8dd..2d2960917bac 100644
--- a/x11/e17-module-uptime/pkg-plist
+++ b/x11/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/e17-module-weather/Makefile b/x11/e17-module-weather/Makefile
index 8d4ccdd37b55..458c9d203ff7 100644
--- a/x11/e17-module-weather/Makefile
+++ b/x11/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/e17-module-weather/distinfo b/x11/e17-module-weather/distinfo
index 286d80bf9239..51bc6124cecc 100644
--- a/x11/e17-module-weather/distinfo
+++ b/x11/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/e17-module-weather/files/patch-e_mod_main.c b/x11/e17-module-weather/files/patch-e_mod_main.c
deleted file mode 100644
index 64cfef8a20e0..000000000000
--- a/x11/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/e17-module-weather/pkg-plist b/x11/e17-module-weather/pkg-plist
index 66c078bb5d6f..bd4bcd2c0fbd 100644
--- a/x11/e17-module-weather/pkg-plist
+++ b/x11/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/e17-module-winselector/Makefile b/x11/e17-module-winselector/Makefile
new file mode 100644
index 000000000000..553c0ec4c557
--- /dev/null
+++ b/x11/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/e17-module-winselector/distinfo b/x11/e17-module-winselector/distinfo
new file mode 100644
index 000000000000..12ddf1232176
--- /dev/null
+++ b/x11/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/e17-module-winselector/pkg-descr b/x11/e17-module-winselector/pkg-descr
new file mode 100644
index 000000000000..8e25ba30168d
--- /dev/null
+++ b/x11/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/e17-module-winselector/pkg-plist b/x11/e17-module-winselector/pkg-plist
new file mode 100644
index 000000000000..27724a16ee28
--- /dev/null
+++ b/x11/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/ecore/Makefile b/x11/ecore/Makefile
index 59e23ddbe899..1d9841281237 100644
--- a/x11/ecore/Makefile
+++ b/x11/ecore/Makefile
@@ -6,27 +6,97 @@
 #
 
 PORTNAME=	ecore
-PORTVERSION=	0.9.9.032
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://enlightenment.freedesktop.org/files/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	vanilla@FreeBSD.org
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	A core event abstraction library
 
-LIB_DEPENDS=	evas.1:${PORTSDIR}/graphics/evas
-
-.if !exists(/usr/include/getopt.h)
-USE_GETOPT_LONG=	yes
-.endif
-
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
-INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS+=	--enable-pthreads
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+USE_EFL=	evas
+USE_LDCONFIG=	yes
+USE_GETOPT_LONG=yes
+
+CONFIGURE_ARGS=	--disable-ecore-dfb
+
+OPTIONS=	DBUS		"Enable DBUS support" off \
+		CURL		"Enable Curl support" on \
+		X11		"Enable X11 support" on \
+		EVAS		"Enable evas support" on \
+		EET		"Enable EET configs support" on
+#		OPENSSL		"Enable OpenSSL support" on \
+#		DIRECTFB	"Enable DirectFB support" off \
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_X11)
+CONFIGURE_ARGS+=	--enable-ecore-x
+USE_XLIB=		yes
+PLIST_SUB+=		X11=""
+.else
+CONFIGURE_ARGS+=	--disable-ecore-x
+PLIST_SUB+=		X11="@comment "
+.endif
+
+.if !defined(WITHOUT_EVAS)
+CONFIGURE_ARGS+=	--enable-ecore-evas
+USE_EFL+=		evas
+PLIST_SUB+=		EVAS=""
+.else
+CONFIGURE_ARGS+=	--disable-ecore-evas
+PLIST_SUB+=		EVAS="@comment "
+.endif
+
+.if !defined(WITHOUT_CURL)
+CONFIGURE_ARGS+=	--enable-curl
+LIB_DEPENDS+=		curl.3:${PORTSDIR}/ftp/curl
+PLIST_SUB+=		CURL=""
+.else
+CONFIGURE_ARGS+=	--disable-curl
+PLIST_SUB+=		CURL="@comment "
+.endif
+
+#.if !defined(WITHOUT_OPENSSL)
+#CONFIGURE_ARGS+=	--enable-openssl
+#PLIST_SUB+=		OPENSSL=""
+#USE_OPENSSL=		yes
+#.else
+#CONFIGURE_ARGS+=	--disable-openssl
+#PLIST_SUB+=		OPENSSL="@comment "
+#.endif
+
+.if defined(WITH_DBUS)
+CONFIGURE_ARGS+=	--enable-ecore-dbus
+PLIST_SUB+=		DBUS=""
+LIB_DEPENDS+=		dbus-1.2:${PORTSDIR}/devel/dbus
+.else
+CONFIGURE_ARGS+=	--disable-ecore-dbus
+PLIST_SUB+=		DBUS="@comment "
+.endif
+
+#.if defined(WITH_DIRECTFB)
+#CONFIGURE_ARGS+=	--enable-ecore-dfb
+#PLIST_SUB+=		DIRECTFB=""
+#LIB_DEPENDS+=		directfb-0.9.16:${PORTSDIR}/devel/directfb
+#.else
+#CONFIGURE_ARGS+=	--disable-ecore-dfb
+#PLIST_SUB+=		DIRECTFB="@comment "
+#.endif
+
+.if !defined(WITHOUT_EET)
+CONFIGURE_ARGS+=	--enable-ecore-config
+USE_EFL+=		eet
+PLIST_SUB+=		EET=""
+.else
+CONFIGURE_ARGS+=	--disable-ecore-config
+PLIST_SUB+=		EET="@comment "
+.endif
 
-.include <bsd.port.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/ecore/distinfo b/x11/ecore/distinfo
index 170182e8d1df..e7e0a4cadff5 100644
--- a/x11/ecore/distinfo
+++ b/x11/ecore/distinfo
@@ -1,3 +1,3 @@
-MD5 (ecore-0.9.9.032.tar.gz) = 275ceadfd5537383dd2f331e02f5ce72
-SHA256 (ecore-0.9.9.032.tar.gz) = cef6a90c1fd0d3d7224b8ca1d7c925fb6cd2520191de9deba10a6af749b41929
-SIZE (ecore-0.9.9.032.tar.gz) = 1209574
+MD5 (ecore-20060926.tar.bz2) = d714613d6c8d51e8c841c65d520e0047
+SHA256 (ecore-20060926.tar.bz2) = eb1f75c70146efa5470faf00d23b4da27dd43b9862fabcd6914c05de9c616e91
+SIZE (ecore-20060926.tar.bz2) = 4162746
diff --git a/x11/ecore/pkg-plist b/x11/ecore/pkg-plist
index bb7ac89e0672..3b4fbcc50e74 100644
--- a/x11/ecore/pkg-plist
+++ b/x11/ecore/pkg-plist
@@ -1,21 +1,24 @@
 bin/ecore-config
-bin/ecore_config
+%%EET%%bin/ecore_config
+bin/ecore_dbus_hal_test
+bin/ecore_dbus_receiver_test
 bin/ecore_dbus_test
-bin/ecore_evas_test
-bin/ecore_test
+%%EVAS%%bin/ecore_evas_test
+%%EVAS%%bin/ecore_test
 include/Ecore.h
 include/Ecore_Con.h
-include/Ecore_Config.h
-include/Ecore_DBus.h
+%%EET%%include/Ecore_Config.h
+%%DBUS%%include/Ecore_DBus.h
 include/Ecore_Data.h
-include/Ecore_Evas.h
+include/Ecore_Desktop.h
+%%EVAS%%include/Ecore_Evas.h
 include/Ecore_File.h
 include/Ecore_Ipc.h
 include/Ecore_Job.h
 include/Ecore_Txt.h
-include/Ecore_X.h
-include/Ecore_X_Atoms.h
-include/Ecore_X_Cursor.h
+%%X11%%include/Ecore_X.h
+%%X11%%include/Ecore_X_Atoms.h
+%%X11%%include/Ecore_X_Cursor.h
 lib/libecore.a
 lib/libecore.la
 lib/libecore.so
@@ -24,18 +27,22 @@ lib/libecore_con.a
 lib/libecore_con.la
 lib/libecore_con.so
 lib/libecore_con.so.1
-lib/libecore_config.a
-lib/libecore_config.la
-lib/libecore_config.so
-lib/libecore_config.so.1
-lib/libecore_dbus.a
-lib/libecore_dbus.la
-lib/libecore_dbus.so
-lib/libecore_dbus.so.1
-lib/libecore_evas.a
-lib/libecore_evas.la
-lib/libecore_evas.so
-lib/libecore_evas.so.1
+%%EET%%lib/libecore_config.a
+%%EET%%lib/libecore_config.la
+%%EET%%lib/libecore_config.so
+%%EET%%lib/libecore_config.so.1
+%%DBUS%%lib/libecore_dbus.a
+%%DBUS%%lib/libecore_dbus.la
+%%DBUS%%lib/libecore_dbus.so
+%%DBUS%%lib/libecore_dbus.so.1
+lib/libecore_desktop.a
+lib/libecore_desktop.la
+lib/libecore_desktop.so
+lib/libecore_desktop.so.1
+%%EVAS%%lib/libecore_evas.a
+%%EVAS%%lib/libecore_evas.la
+%%EVAS%%lib/libecore_evas.so
+%%EVAS%%lib/libecore_evas.so.1
 lib/libecore_file.a
 lib/libecore_file.la
 lib/libecore_file.so
@@ -53,9 +60,9 @@ lib/libecore_txt.la
 lib/libecore_txt.so
 lib/libecore_txt.so.1
 lib/libecore_x.a
-lib/libecore_x.la
-lib/libecore_x.so
-lib/libecore_x.so.1
+%%X11%%lib/libecore_x.la
+%%X11%%lib/libecore_x.so
+%%X11%%lib/libecore_x.so.1
 libdata/pkgconfig/ecore.pc
 share/aclocal/ecore.m4
 %%DATADIR%%/fonts/Vera.ttf
diff --git a/x11/elicit/Makefile b/x11/elicit/Makefile
index 9365be96e0d8..50a4147d6eea 100644
--- a/x11/elicit/Makefile
+++ b/x11/elicit/Makefile
@@ -7,31 +7,24 @@
 #
 
 PORTNAME=	elicit
-PORTVERSION=	20060719
+PORTVERSION=	20060926
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Screen zoomer/color picker for e17
 
-LIB_DEPENDS=	ecore.1:${PORTSDIR}/x11/ecore \
-		edb.1:${PORTSDIR}/databases/edb \
-		edje.5:${PORTSDIR}/graphics/edje \
-		eet.9:${PORTSDIR}/devel/eet \
-		esmart_trans_x11.0:${PORTSDIR}/graphics/esmart \
-		evas.1:${PORTSDIR}/graphics/evas \
-		Imlib2.3:${PORTSDIR}/graphics/imlib2
-
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	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=	ecore edb eet edje evas imlib2
+USE_EFL_ESMART=	trans_x11
 
 .include <bsd.port.pre.mk>
 .if ${ARCH} == "ia64"
 BROKEN=		edje is broken on ia64
 .endif
 
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
 .include <bsd.port.post.mk>
diff --git a/x11/elicit/distinfo b/x11/elicit/distinfo
index 277804dc3d91..cf757b166401 100644
--- a/x11/elicit/distinfo
+++ b/x11/elicit/distinfo
@@ -1,3 +1,3 @@
-MD5 (elicit-20060719.tar.bz2) = 23280f261a1f0942ea3cc9aefa1abf10
-SHA256 (elicit-20060719.tar.bz2) = 3a48898c4ae83ab7557eda3926ffb2276439480e012bedc2c4037fa3e654ebb0
-SIZE (elicit-20060719.tar.bz2) = 452336
+MD5 (elicit-20060926.tar.bz2) = fe8e88cb2a959e37afb66fd48c3eaaf8
+SHA256 (elicit-20060926.tar.bz2) = 6cc88935cca450ca6867150c89557909c1b44b4cb4fdb02f45f513d1eaf30647
+SIZE (elicit-20060926.tar.bz2) = 468200
diff --git a/x11/elicit/pkg-plist b/x11/elicit/pkg-plist
index 8779e647e711..e1dd2fc7d0c9 100644
--- a/x11/elicit/pkg-plist
+++ b/x11/elicit/pkg-plist
@@ -2,6 +2,6 @@ bin/elicit
 %%DATADIR%%/images/grid_cell.png
 %%DATADIR%%/themes/summer.edj
 %%DATADIR%%/themes/winter.edj
-@dirrmtry %%DATADIR%%/themes
-@dirrmtry %%DATADIR%%/images
-@dirrmtry %%DATADIR%%
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%
diff --git a/x11/enity/Makefile b/x11/enity/Makefile
new file mode 100644
index 000000000000..2f9248afb800
--- /dev/null
+++ b/x11/enity/Makefile
@@ -0,0 +1,27 @@
+# New ports collection makefile for:	enity
+# Date created:		2006-08-14
+# Whom:			Stanislav Sedov <ssedov@mbsd.msk.ru>
+#
+# $MBSDlabs$
+# $FreeBSD$
+#
+
+PORTNAME=	enity
+PORTVERSION=	20060926
+CATEGORIES=	x11
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	Create Etk dialogs using scripts
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_EFL=	etk
+GNU_CONFIGURE=	yes
+
+PLIST_FILES=	bin/enity
+
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/enity/distinfo b/x11/enity/distinfo
new file mode 100644
index 000000000000..7936ba5dd67f
--- /dev/null
+++ b/x11/enity/distinfo
@@ -0,0 +1,3 @@
+MD5 (enity-20060926.tar.bz2) = aa2ba2aabd23e2b7f215085af12a7623
+SHA256 (enity-20060926.tar.bz2) = 4236e09b3e43af589684e44b1f1eed35226d642f6f907363d3cdc70432c4215e
+SIZE (enity-20060926.tar.bz2) = 232524
diff --git a/x11/enity/files/patch-src_bin_enity.c b/x11/enity/files/patch-src_bin_enity.c
new file mode 100644
index 000000000000..0b8afbac4f25
--- /dev/null
+++ b/x11/enity/files/patch-src_bin_enity.c
@@ -0,0 +1,20 @@
+--- src/bin/enity.c.orig	Thu Oct  5 01:06:18 2006
++++ src/bin/enity.c	Thu Oct  5 01:07:02 2006
+@@ -376,7 +376,7 @@
+ 	     
+ 	     valist[j] = NULL;
+ 	     	     
+-	     row = etk_tree_append_valist(ETK_TREE(tree), (va_list)valist);
++/*	     row = etk_tree_append_valist(ETK_TREE(tree), (va_list)valist); */
+ 	     etk_tree_row_data_set(row, cols);
+ 	  }
+      }
+@@ -583,7 +583,7 @@
+      /* --list options */
+      { "checklist", ' ', NULL, _en_list_check_cb, NULL, EN_ARGUMENT_FLAG_OPTIONAL, "Use check boxes for first column" },
+      { "column", ' ', NULL, _en_list_column_cb, NULL, EN_ARGUMENT_FLAG_OPTIONAL|EN_ARGUMENT_FLAG_VALUE_REQUIRED|EN_ARGUMENT_FLAG_MULTIVALUE, "Set the column header" },
+-     { "list", ' ', NULL, _en_list_cb, NULL, EN_ARGUMENT_FLAG_OPTIONAL, "Display list dialog" },
++/*     { "list", ' ', NULL, _en_list_cb, NULL, EN_ARGUMENT_FLAG_OPTIONAL, "Display list dialog" }, */
+ 
+      /* --progress options */
+      { "progress", ' ', NULL, _en_progress_cb, NULL, EN_ARGUMENT_FLAG_OPTIONAL, "Display progress indication dialog" },
diff --git a/x11/enity/pkg-descr b/x11/enity/pkg-descr
new file mode 100644
index 000000000000..af6ca53a3e4f
--- /dev/null
+++ b/x11/enity/pkg-descr
@@ -0,0 +1,10 @@
+Enity allows users to create Etk dialogs using shell scripts or other
+scripting languages that can call programs. The basic idea is to ease
+the development of quick interfaces for input, configuration,
+installation, etc...
+
+The List feature is currently disabled due to unresolved problems in
+implementation.
+
+Author:	Hisham 'CodeWarrior' Mardambey <hisham.mardambey@gmail.com>
+WWW:	http://www.enlightenment.org/
diff --git a/x11/enterminus/Makefile b/x11/enterminus/Makefile
new file mode 100644
index 000000000000..3e5a63869cfd
--- /dev/null
+++ b/x11/enterminus/Makefile
@@ -0,0 +1,25 @@
+# New ports collection makefile for:	enterminus
+# Date created:		2006-08-14
+# Whom:			Stanislav Sedov <ssedov@mbsd.msk.ru>
+#
+# $MBSDlabs$
+# $FreeBSD$
+#
+
+PORTNAME=	enterminus
+PORTVERSION=	20060926
+CATEGORIES=	x11
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	An EFL based terminal
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_EFL=	evas ecore
+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/enterminus/distinfo b/x11/enterminus/distinfo
new file mode 100644
index 000000000000..d58480ff505d
--- /dev/null
+++ b/x11/enterminus/distinfo
@@ -0,0 +1,3 @@
+MD5 (enterminus-20060926.tar.bz2) = b0a96dc2f34cea46966515549450aedf
+SHA256 (enterminus-20060926.tar.bz2) = 195205d1687b3100c6f8a0441e8dea108893e5077519e12396f5fd24140d47ee
+SIZE (enterminus-20060926.tar.bz2) = 270790
diff --git a/x11/enterminus/files/patch-src_bin_pty.c b/x11/enterminus/files/patch-src_bin_pty.c
new file mode 100644
index 000000000000..263137f1b925
--- /dev/null
+++ b/x11/enterminus/files/patch-src_bin_pty.c
@@ -0,0 +1,11 @@
+--- src/bin/pty.c.orig	Mon Aug 14 18:25:18 2006
++++ src/bin/pty.c	Mon Aug 14 18:25:51 2006
+@@ -19,7 +19,7 @@
+    int fd;
+    char *ptydev;
+ 
+-   if((fd = getpt()) >= 0)
++   if((fd = posix_openpt(O_RDWR)) >= 0)
+      {
+ 	if(grantpt(fd) == 0 && unlockpt(fd) == 0)
+ 	  {
diff --git a/x11/enterminus/pkg-descr b/x11/enterminus/pkg-descr
new file mode 100644
index 000000000000..14d5aee37605
--- /dev/null
+++ b/x11/enterminus/pkg-descr
@@ -0,0 +1,4 @@
+An EFL Based Terminal.
+
+Author:	codewarrior (Hisham Mardam Bey) <codewarrior@users.sourceforge.net>
+WWW:	http://www.enlightenment.org/
diff --git a/x11/enterminus/pkg-plist b/x11/enterminus/pkg-plist
new file mode 100644
index 000000000000..96359a904dcb
--- /dev/null
+++ b/x11/enterminus/pkg-plist
@@ -0,0 +1,8 @@
+bin/enterminus
+bin/enterminus-config
+%%DATADIR%%/VeraMono.ttf
+%%DATADIR%%/black.png
+%%DATADIR%%/checkered_bg.png
+%%DATADIR%%/grey.png
+%%DATADIR%%/white.png
+@dirrm %%DATADIR%%
diff --git a/x11/examine/Makefile b/x11/examine/Makefile
index 1a234f5b3f79..4d468b648201 100644
--- a/x11/examine/Makefile
+++ b/x11/examine/Makefile
@@ -7,23 +7,24 @@
 #
 
 PORTNAME=	examine
-PORTVERSION=	20060719
+PORTVERSION=	20060926
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Interface for configuring EFL applications
 
 LIB_DEPENDS=	ecore.1:${PORTSDIR}/x11/ecore \
 		ewl.0:${PORTSDIR}/x11-toolkits/ewl
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	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=	ecore ewl
 
 PLIST_FILES=	bin/examine bin/exsh
 
-.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/examine/distinfo b/x11/examine/distinfo
index 947efd9aecaf..bc8b311eb3ab 100644
--- a/x11/examine/distinfo
+++ b/x11/examine/distinfo
@@ -1,3 +1,3 @@
-MD5 (examine-20060719.tar.bz2) = c5ee1e30e3754e511e0a14a2e135f8f8
-SHA256 (examine-20060719.tar.bz2) = 525c6ef925aed34db672fa3fc6fd2e5269ba1a5447fdc29775efcae663290beb
-SIZE (examine-20060719.tar.bz2) = 1252192
+MD5 (examine-20060926.tar.bz2) = e849fb33e7752673e4ee0153d3d32c07
+SHA256 (examine-20060926.tar.bz2) = 225d6e595a5bb600fa7801ec2b232aa6e05c9b3f23b380acbeb391d20c6fc6b1
+SIZE (examine-20060926.tar.bz2) = 1261349
author	stas <stas@FreeBSD.org>	2006-10-08 21:48:37 +0800
committer	stas <stas@FreeBSD.org>	2006-10-08 21:48:37 +0800
commit	173755349dc2dd22744f67ee65b533ef3b1c3649 (patch)
tree	fcddf9b33a006f3b495b40ac5641012787c2a99e /x11
parent	ed21c3e01f7d2d837804666f445b9249d985c327 (diff)
download	freebsd-ports-gnome-173755349dc2dd22744f67ee65b533ef3b1c3649.tar.gz freebsd-ports-gnome-173755349dc2dd22744f67ee65b533ef3b1c3649.tar.zst freebsd-ports-gnome-173755349dc2dd22744f67ee65b533ef3b1c3649.zip