author: Stanislav Sedov <stas@FreeBSD.org> 2008-03-11 21:13:53 +0000
committer: Stanislav Sedov <stas@FreeBSD.org> 2008-03-11 21:13:53 +0000
commit: 9a2e4c8b780fc607dc4b4adabefb354c84401a96 (patch)
tree: f59767aed29b447d3d80ab987e898598663c27e3
parent: 621c804e48a9fdddd6a00d78585fa8cb20c8460e (diff)
download: ports-9a2e4c8b780fc607dc4b4adabefb354c84401a96.tar.gz
ports-9a2e4c8b780fc607dc4b4adabefb354c84401a96.zip
391 files changed, 4830 insertions, 1780 deletions
diff --git a/Mk/bsd.efl.mk b/Mk/bsd.efl.mk
index b8d0f1098ee3..78a62e7c903a 100644
--- a/Mk/bsd.efl.mk
+++ b/Mk/bsd.efl.mk
@@ -4,7 +4,7 @@
 #
 # bsd.efl.mk - Support for Enlightenment Foundation Libraries (EFL)
 #
-# Author: Stanislav Sedov <ssedov@mbsd.msk.ru>
+# Author: Stanislav Sedov <stas@FreeBSD.org>
 # Inspired by bsd.sdl.mk by Edwin Groothuis <edwin@freebsd.org>
 #
 # You can specify EFL-related library dependency using "USE_EFL=" statement,
@@ -34,13 +34,13 @@
 # Feel free to send any comments and suggestion to maintainer.
 #
 
-EFL_Include_MAINTAINER=	ssedov@mbsd.msk.ru
+EFL_Include_MAINTAINER=	stas@FreeBSD.org
 
 #
 # Define all supported libraries
 #
-_USE_EFL_ALL=	ecore edb edje eet embryo emotion engrave enhance epeg \
-		epsilon etk etox evas evfs ewl exml imlib2
+_USE_EFL_ALL=	ecore edb edje eet efreet embryo emotion engrave enhance epeg \
+		epsilon etk etox evas evfs ewl exml imlib2 edbus
 
 # For each library supported we define the following variables:
 #	_%%LIB%%_CATEGORY	- category the port belongs to
@@ -52,19 +52,29 @@ _USE_EFL_ALL=	ecore edb edje eet embryo emotion engrave enhance epeg \
 #	_%%LIB%%_SLIB		- name of the shared library
 #
 
-_ecore_CATEGORY=	x11
-_ecore_DEPENDS=		evas
+_ecore_CATEGORY=	devel
+_ecore_PORTNAME=	ecore-main
 _ecore_PREFIX=		${LOCALBASE}
-_ecore_VERSION=		1
+_ecore_VERSION=		9
 
 _edb_CATEGORY=		databases
 _edb_PREFIX=		${LOCALBASE}
 _edb_VERSION=		1
 
+_edbus_CATEGORY=	devel
+_edbus_PORTNAME=	e_dbus
+_edbus_PREFIX=		${LOCALBASE}
+_edbus_VERSION=		1
+
 _eet_CATEGORY=		devel
 _eet_PREFIX=		${LOCALBASE}
 _eet_VERSION=		9
 
+_efreet_CATEGORY=	x11
+_efreet_DEPENDS=	ecore
+_efreet_PREFIX=		${LOCALBASE}
+_efreet_VERSION=	0
+
 _edje_CATEGORY=		graphics
 _edje_DEPENDS=		embryo eet imlib2 evas ecore
 _edje_PREFIX=		${LOCALBASE}
@@ -77,7 +87,7 @@ _embryo_VERSION=	9
 _emotion_CATEGORY=	multimedia
 _emotion_DEPENDS=	ecore edje eet embryo evas
 _emotion_PREFIX=	${LOCALBASE}
-_emotion_VERSION=	0
+_emotion_VERSION=	1
 
 _engrave_CATEGORY=	devel
 _engrave_DEPENDS=	ecore evas
@@ -96,7 +106,7 @@ _epeg_VERSION=		9
 _epsilon_CATEGORY=	graphics
 _epsilon_DEPENDS=	epeg edje imlib2 ecore
 _epsilon_PREFIX=	${LOCALBASE}
-_epsilon_VERSION=	0
+_epsilon_VERSION=	3
 
 _etk_CATEGORY=		x11-toolkits
 _etk_DEPENDS=		evas ecore edje
@@ -109,9 +119,9 @@ _etox_PREFIX=		${LOCALBASE}
 _etox_VERSION=		0
 
 _evas_CATEGORY=		graphics
-_evas_DEPENDS=		eet edb
+_evas_PORTNAME=		evas-core
 _evas_PREFIX=		${LOCALBASE}
-_evas_VERSION=		1
+_evas_VERSION=		9
 
 _evfs_CATEGORY=		devel
 _evfs_DEPENDS=		eet ecore
@@ -130,7 +140,7 @@ _exml_VERSION=		1
 
 _imlib2_CATEGORY=	graphics
 _imlib2_PREFIX=		${LOCALBASE}
-_imlib2_VERSION=	4
+_imlib2_VERSION=	5
 _imlib2_SLIB=		Imlib2
 
 #
@@ -143,6 +153,9 @@ _${LIB}_DEPENDS=	#empty
 . if !defined(_${LIB}_SLIB)
 _${LIB}_SLIB=${LIB}
 . endif
+. if !defined(_${LIB}_PORTNAME)
+_${LIB}_PORTNAME=${LIB}
+. endif
 .endfor
 
 #
@@ -157,7 +170,7 @@ _${LIB}_SLIB=${LIB}
 #
 
 # All components that are currently supported
-_EFL_ESMART_ALL=	container draggies file_dialog text_entry \
+_EFL_ESMART_ALL=	container draggies text_entry \
 			thumb trans_x11
 
 #
@@ -167,7 +180,7 @@ _EFL_ESMART_CATEGORY=	graphics
 _EFL_ESMART_PORTNAME=	esmart
 _EFL_ESMART_DEPENDS=	epsilon evas ecore imlib2 edje
 _EFL_ESMART_PREFIX=	${LOCALBASE}
-_EFL_ESMART_VERSION=	0
+_EFL_ESMART_VERSION=	9
 
 #
 # Assign values for variables which were not defined explicitly
@@ -194,6 +207,110 @@ _esmart_${COMP}_VERSION=	${_EFL_ESMART_VERSION}
 .endfor
 
 #
+# Evas engines and loaders support.
+# Values processed:
+# _evas_engine_COMP_CATEGORY	- Where the port for this object is located
+# _evas_engine_COMP_PORTNAME	- Object's port subdirectory
+# _evas_engine_COMP_DIR		- Evas object's subdir
+#
+
+# All components that are currently supported
+_EFL_EVAS_ENGINES_ALL= buffer opengl sdl x11 xrender
+_EFL_EVAS_LOADERS_ALL= edb eet gif jpeg png svg tiff xpm
+
+#
+# Generic evas engines definitions
+#
+_EFL_EVAS_CATEGORY=	graphics
+_EFL_EVAS_MODDIR=	${LOCALBASE}/lib/evas/modules/
+_EFL_EVAS_ENGINES_MODDIR=	${_EFL_EVAS_MODDIR}/engines/
+_EFL_EVAS_LOADERS_MODDIR=	${_EFL_EVAS_MODDIR}/loaders/
+
+#
+# Evas engine modules definitions
+#
+
+_evas_engine_buffer_DIR=	buffer
+_evas_engine_opengl_DIR=	gl_x11
+_evas_engine_sdl_DIR=		software_sdl
+_evas_engine_x11_DIR=		software_x11
+_evas_engine_xrender_DIR=	xrender_x11
+
+#
+# Assign values for variables which were not defined explicitly
+#
+.for COMP in ${_EFL_EVAS_ENGINES_ALL}
+. if !defined(_evas_engine_${COMP}_CATEGORY)
+_evas_engine_${COMP}_CATEGORY=	${_EFL_EVAS_CATEGORY}
+. endif
+. if !defined(_evas_engine_${COMP}_PORTNAME)
+_evas_engine_${COMP}_PORTNAME=	evas-engine-${COMP}
+. endif
+. if !defined(_evas_engine_${COMP}_DIR)
+_evas_engine_${COMP}_DIR=	${COMP}
+. endif
+.endfor
+
+.for COMP in ${_EFL_EVAS_LOADERS_ALL}
+. if !defined(_evas_loader_${COMP}_CATEGORY)
+_evas_loader_${COMP}_CATEGORY=	${_EFL_EVAS_CATEGORY}
+. endif
+. if !defined(_evas_loader_${COMP}_PORTNAME)
+_evas_loader_${COMP}_PORTNAME=	evas-loader-${COMP}
+. endif
+. if !defined(_evas_loader_${COMP}_DIR)
+_evas_loader_${COMP}_DIR=	${COMP}
+. endif
+.endfor
+
+#
+# Ecore modules support
+# Values processed:
+# _ecore_COMP_CATEGORY	- Where the port for this object is located
+# _ecore_COMP_PORTNAME	- Object's port subdirectory
+# _ecore_COMP_NAME	- Ecore library name
+#
+
+# All components that are currently supported
+_EFL_ECORE_ALL=	con config desktop evas file ipc job sdl txt x11 imf imf_evas
+
+#
+# Generic ecore definitions
+#
+_EFL_ECORE_CATEGORY=	devel
+_EFL_ECORE_MODDIR=	${LOCALBASE}/lib/
+
+#
+# Ecore modules definitions
+#
+
+_ecore_con_CATEGORY=		net
+_ecore_config_CATEGORY=		sysutils
+_ecore_desktop_CATEGORY=	x11
+_ecore_evas_CATEGORY=		graphics
+_ecore_sdl_CATEGORY=		graphics
+_ecore_txt_CATEGORY=		converters
+_ecore_imf_CATEGORY=		x11
+_ecore_imf_evas_CATEGORY=	x11
+_ecore_x11_CATEGORY=		x11
+_ecore_x11_NAME=		ecore_x
+
+#
+# Assign values for variables which were not defined explicitly
+#
+.for COMP in ${_EFL_ECORE_ALL}
+. if !defined(_ecore_${COMP}_CATEGORY)
+_ecore_${COMP}_CATEGORY=	${_EFL_ECORE_CATEGORY}
+. endif
+. if !defined(_ecore_${COMP}_PORTNAME)
+_ecore_${COMP}_PORTNAME=	ecore-${COMP}
+. endif
+. if !defined(_ecore_${COMP}_NAME)
+_ecore_${COMP}_NAME=	ecore_${COMP}
+. endif
+.endfor
+
+#
 # Handle WANT_EFL feature
 #
 .if !defined(AFTERPORTMK)
@@ -203,24 +320,41 @@ EFL_Include_pre=	bsd.efl.mk
 
 HAVE_EFL?=
 HAVE_EFL_ESMART?=
+HAVE_EFL_ECORE?=
 .if defined(WANT_EFL)
+#
+# General EFL components
+#
 . for LIB in ${_USE_EFL_ALL}
 .  if exists(${_${LIB}_PREFIX}/lib/lib${_${LIB}_SLIB}.so.${_${LIB}_VERSION})
 HAVE_EFL+=	${LIB}
 .  endif
 . endfor
+
+#
+# Esmart objects
+#
 . 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
+
+#
+# Ecore components
+#
+. for COMP in ${_EFL_ECORE_ALL}
+.  if exists(${_ecore_PREFIX}/lib/lib${_ecore_${COMP}_NAME}.so.${_ecore_VERSION})
+HAVE_EFL_ECORE+=	${COMP}
+.  endif
+. endfor
 .endif
 
 .endif #EFL_Include_pre
 .endif #AFTERPORTMK
 
 #
-# Handle USE_EFL & USE_ESMART feature
+# Handle USE_EFL, USE_EFL_ESMART, USE_EFL_EVAS_* and USE_EFL_ECORE features
 #
 .if !defined(BEFOREPORTMK)
 .if !defined(EFL_Include_post)
@@ -260,6 +394,89 @@ LIB_DEPENDS+=	${_esmart_${COMP}_SLIB}.${_esmart_${COMP}_VERSION}:${PORTSDIR}/${_
 
 .endif #USE_EFL_ESMART
 
+.if defined(USE_EFL_EVAS_ENGINES)
+
+USE_EFL+=	evas
+
+_USE_EFL_EVAS_ENGINES=	#empty
+. for COMP in ${USE_EFL_EVAS_ENGINES}
+.  if ${_EFL_EVAS_ENGINES_ALL:M${COMP}}==""
+IGNORE=	cannot install: unknown evas engine ${COMP}
+.  else
+_USE_EFL_EVAS_ENGINES+=	${COMP}
+.  endif
+. endfor
+
+# Get rid of duplicates
+_USE_EFL_EVAS_ENGINES_UQ=	#empty
+. for COMP in ${_USE_EFL_EVAS_ENGINES}
+.  if ${_USE_EFL_EVAS_ENGINES_UQ:M${COMP}}==""
+_USE_EFL_EVAS_ENGINES_UQ+=	${COMP}
+.  endif
+. endfor
+
+. for COMP in ${_USE_EFL_EVAS_ENGINES_UQ}
+BUILD_DEPENDS+=	${_EFL_EVAS_ENGINES_MODDIR}/${_evas_engine_${COMP}_DIR}/freebsd${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_engine_${COMP}_CATEGORY}/${_evas_engine_${COMP}_PORTNAME}
+RUN_DEPENDS+=	${_EFL_EVAS_ENGINES_MODDIR}/${_evas_engine_${COMP}_DIR}/freebsd${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_engine_${COMP}_CATEGORY}/${_evas_engine_${COMP}_PORTNAME}
+. endfor
+
+.endif #USE_EFL_EVAS_ENGINES
+
+.if defined(USE_EFL_EVAS_LOADERS)
+
+USE_EFL+=	evas
+
+_USE_EFL_EVAS_LOADERS=	#empty
+. for COMP in ${USE_EFL_EVAS_LOADERS}
+.  if ${_EFL_EVAS_LOADERS_ALL:M${COMP}}==""
+IGNORE=	cannot install: unknown evas loader ${COMP}
+.  else
+_USE_EFL_EVAS_LOADERS+=	${COMP}
+.  endif
+. endfor
+
+# Get rid of duplicates
+_USE_EFL_EVAS_LOADERS_UQ=	#empty
+. for COMP in ${_USE_EFL_EVAS_LOADERS}
+.  if ${_USE_EFL_EVAS_LOADERS_UQ:M${COMP}}==""
+_USE_EFL_EVAS_LOADERS_UQ+=	${COMP}
+.  endif
+. endfor
+
+. for COMP in ${_USE_EFL_EVAS_LOADERS_UQ}
+BUILD_DEPENDS+=	${_EFL_EVAS_LOADERS_MODDIR}/${_evas_loader_${COMP}_DIR}/freebsd${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_loader_${COMP}_CATEGORY}/${_evas_loader_${COMP}_PORTNAME}
+RUN_DEPENDS+=	${_EFL_EVAS_LOADERS_MODDIR}/${_evas_loader_${COMP}_DIR}/freebsd${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_loader_${COMP}_CATEGORY}/${_evas_loader_${COMP}_PORTNAME}
+. endfor
+
+.endif #USE_EFL_EVAS_LOADERS
+
+.if defined(USE_EFL_ECORE)
+
+USE_EFL+=	ecore
+
+_USE_EFL_ECORE=	#empty
+. for COMP in ${USE_EFL_ECORE}
+.  if ${_EFL_ECORE_ALL:M${COMP}}==""
+IGNORE=	cannot install: unknown ecore module ${COMP}
+.  else
+_USE_EFL_ECORE+=	${COMP}
+.  endif
+. endfor
+
+# Get rid of duplicates
+_USE_EFL_ECORE_UQ=	#empty
+. for COMP in ${_USE_EFL_ECORE}
+.  if ${_USE_EFL_ECORE_UQ:M${COMP}}==""
+_USE_EFL_ECORE_UQ+=	${COMP}
+.  endif
+. endfor
+
+. for COMP in ${_USE_EFL_ECORE_UQ}
+LIB_DEPENDS+=	${_ecore_${COMP}_NAME}.${_ecore_VERSION}:${PORTSDIR}/${_ecore_${COMP}_CATEGORY}/${_ecore_${COMP}_PORTNAME}
+. endfor
+
+.endif #USE_EFL_ECORE
+
 .if defined(USE_EFL)
 
 EFL_Include_post=	bsd.efl.mk
@@ -289,7 +506,7 @@ _USE_EFL_UQ+=	${LIB}
 # define dependencies
 #
 .for LIB in ${_USE_EFL_UQ}
-LIB_DEPENDS+=	${_${LIB}_SLIB}.${_${LIB}_VERSION}:${PORTSDIR}/${_${LIB}_CATEGORY}/${LIB}
+LIB_DEPENDS+=	${_${LIB}_SLIB}.${_${LIB}_VERSION}:${PORTSDIR}/${_${LIB}_CATEGORY}/${_${LIB}_PORTNAME}
 .endfor
 
 #
diff --git a/audio/emphasis/Makefile b/audio/emphasis/Makefile
index 540d0c96ac26..015848832bc2 100644
--- a/audio/emphasis/Makefile
+++ b/audio/emphasis/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	emphasis
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
@@ -16,13 +16,12 @@ MAINTAINER=	stas@FreeBSD.org
 COMMENT=	A simple MPD (Music Player Daemon) client written in C/Etk
 
 LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd
-BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
-BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget libxml2
 USE_EFL=	ecore enhance etk
+USE_EFL_ECORE=	config
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/emphasis/distinfo b/audio/emphasis/distinfo
index a57d045f4dc2..27490c738f02 100644
--- a/audio/emphasis/distinfo
+++ b/audio/emphasis/distinfo
@@ -1,3 +1,3 @@
-MD5 (emphasis-20070223.tar.bz2) = 0a3835c8b63c5ebd4185078c6e7d2eb0
-SHA256 (emphasis-20070223.tar.bz2) = e17e2564a02b19142599a8d9c4b66dcae5c10de6ba17fb1f2f767cec68bc7950
-SIZE (emphasis-20070223.tar.bz2) = 327039
+MD5 (emphasis-20080223.tar.bz2) = 51c06c196ceafd4a70d380ea7ea51aaf
+SHA256 (emphasis-20080223.tar.bz2) = d9fc8af7bd181b4dcbaf3cfa2b4d0dc87f940e10f350f15f3a52c3aedfd62a0d
+SIZE (emphasis-20080223.tar.bz2) = 411094
diff --git a/audio/emphasis/pkg-plist b/audio/emphasis/pkg-plist
index c990aa58c71e..ea992b00c7b2 100644
--- a/audio/emphasis/pkg-plist
+++ b/audio/emphasis/pkg-plist
@@ -10,5 +10,15 @@ bin/emphasis
 %%DATADIR%%/images/note.png
 %%DATADIR%%/images/sound_high.png
 %%DATADIR%%/images/sound_low.png
+share/icons/hicolor/48x48/apps/emphasis.png
+share/icons/hicolor/scalable/apps/emphasis.svg
+share/applications/emphasis.desktop
+@dirrmtry share/applications
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%
diff --git a/audio/ruby-xmms2-ecore/Makefile b/audio/ruby-xmms2-ecore/Makefile
index 14231af03652..74648670eb01 100644
--- a/audio/ruby-xmms2-ecore/Makefile
+++ b/audio/ruby-xmms2-ecore/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Ruby ecore mainloop bindings for XMMS2
 
 BUILD_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/xmmsclient_ext.so:${PORTSDIR}/audio/ruby-xmms2
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/xmmsclient_ext.so:${PORTSDIR}/audio/ruby-xmms2
-LIB_DEPENDS+=	ecore.1:${PORTSDIR}/x11/ecore
 
 MASTERDIR=	${.CURDIR}/../xmms2
 
 USE_RUBY=	yes
 USE_GNOME=	glib20
+USE_EFL=	ecore
 USE_LDCONFIG=	yes
 
 PLIST=		${.CURDIR}/pkg-plist
diff --git a/converters/Makefile b/converters/Makefile
index 51c52c9d54ab..7226ccd77d19 100644
--- a/converters/Makefile
+++ b/converters/Makefile
@@ -14,6 +14,7 @@
     SUBDIR += convmv
     SUBDIR += dosunix
     SUBDIR += dumpasn1
+    SUBDIR += ecore-txt
     SUBDIR += enca
     SUBDIR += fconv
     SUBDIR += fix-mime-charset
diff --git a/converters/ecore-txt/Makefile b/converters/ecore-txt/Makefile
new file mode 100644
index 000000000000..fbe08ccedc5e
--- /dev/null
+++ b/converters/ecore-txt/Makefile
@@ -0,0 +1,54 @@
+# New ports collection makefile for:	ecore-txt
+# Date created:				22 September 2007
+# Whom:					Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	txt
+PORTVERSION=	0.9.9.042
+PORTREVISION=	0
+CATEGORIES=	converters
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	ecore-
+DISTNAME=	ecore-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	Enlightenment core abstraction library (txt module)
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_LDCONFIG=	yes
+USE_GETOPT_LONG=yes
+USE_EFL=	ecore
+USE_ICONV=	yes
+BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_txt
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+CONFIGURE_ARGS=	--disable-ecore-con \
+		--disable-ecore-config \
+		--disable-ecore-desktop \
+		--disable-ecore-directfb \
+		--disable-ecore-evas \
+		--disable-ecore-file \
+		--disable-ecore-ipc \
+		--disable-ecore-job \
+		--disable-ecore-sdl \
+		--enable-ecore-txt \
+		--disable-ecore-x \
+                --disable-ecore-imf \
+		--disable-ecore-imf_evas
+
+post-patch:
+	@${REINPLACE_CMD} -E -e \
+		's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
+		${BUILD_WRKSRC}/Makefile.in
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/ecore-txt.pc \
+		${PREFIX}/libdata/pkgconfig/
+
+.include <bsd.port.mk>
diff --git a/converters/ecore-txt/distinfo b/converters/ecore-txt/distinfo
new file mode 100644
index 000000000000..4672f6a1c167
--- /dev/null
+++ b/converters/ecore-txt/distinfo
@@ -0,0 +1,3 @@
+MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
+SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
+SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
diff --git a/x11/ecore/pkg-descr b/converters/ecore-txt/pkg-descr
index 2559668d0e57..2559668d0e57 100644
--- a/x11/ecore/pkg-descr
+++ b/converters/ecore-txt/pkg-descr
diff --git a/converters/ecore-txt/pkg-plist b/converters/ecore-txt/pkg-plist
new file mode 100644
index 000000000000..7cba33fff946
--- /dev/null
+++ b/converters/ecore-txt/pkg-plist
@@ -0,0 +1,6 @@
+include/Ecore_Txt.h
+lib/libecore_txt.a
+lib/libecore_txt.la
+lib/libecore_txt.so
+lib/libecore_txt.so.9
+libdata/pkgconfig/ecore-txt.pc
diff --git a/databases/edb/Makefile b/databases/edb/Makefile
index 928b49c95ff0..7cc6b3209be2 100644
--- a/databases/edb/Makefile
+++ b/databases/edb/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	edb
-PORTVERSION=	20070223
+PORTVERSION=	1.0.5.042
 PORTREVISION=	0
-PORTEPOCH=	1
+PORTEPOCH=	2
 CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Enlightenment Database Library
diff --git a/databases/edb/distinfo b/databases/edb/distinfo
index fbcd3c55a1a5..13857d8f03ce 100644
--- a/databases/edb/distinfo
+++ b/databases/edb/distinfo
@@ -1,3 +1,3 @@
-MD5 (edb-20070223.tar.bz2) = 4b2afa98712b7818e7d310e4b138f9f8
-SHA256 (edb-20070223.tar.bz2) = bac58243d9c82c89180a8ca19c7f088e09f6880e1c98c65344a70a7d42d415e4
-SIZE (edb-20070223.tar.bz2) = 473643
+MD5 (edb-1.0.5.042.tar.bz2) = 4cd3e07507efc316f759468a98f0b5bf
+SHA256 (edb-1.0.5.042.tar.bz2) = a6e110c47d8979b86156eac2db8121bee5d8aa4927cb60ba612044709df538a2
+SIZE (edb-1.0.5.042.tar.bz2) = 492293
diff --git a/databases/edb/pkg-plist b/databases/edb/pkg-plist
index fd183c658a63..05a671a9ffbf 100644
--- a/databases/edb/pkg-plist
+++ b/databases/edb/pkg-plist
@@ -1,4 +1,3 @@
-bin/edb-config
 bin/edb_ed
 bin/edb_vt_ed
 include/Edb.h
diff --git a/deskutils/adesklets/Makefile b/deskutils/adesklets/Makefile
index d3b8c3833087..fbd5b32828bc 100644
--- a/deskutils/adesklets/Makefile
+++ b/deskutils/adesklets/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	adesklets
 PORTVERSION=	0.6.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	An interactive Imlib2 console for the X Window system
 
-LIB_DEPENDS=	Imlib2.4:${PORTSDIR}/graphics/imlib2
 RUN_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
 
 GNU_CONFIGURE=	yes
@@ -23,6 +22,7 @@ USE_PYTHON=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_XLIB=	yes
+USE_EFL=	imlib2
 WANT_PERL=	yes
 
 MAN1=		adesklets.1 \
diff --git a/deskutils/estickies/Makefile b/deskutils/estickies/Makefile
index 3ff309fa7fce..e076c6cd4243 100644
--- a/deskutils/estickies/Makefile
+++ b/deskutils/estickies/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	estickies
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	deskutils
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
diff --git a/deskutils/estickies/distinfo b/deskutils/estickies/distinfo
index a39a41618de4..d3002455edf5 100644
--- a/deskutils/estickies/distinfo
+++ b/deskutils/estickies/distinfo
@@ -1,3 +1,3 @@
-MD5 (estickies-20070223.tar.bz2) = deb4b3288542ae416849fef2aa97af61
-SHA256 (estickies-20070223.tar.bz2) = 402416378385a6dc90ed9ec38bbaee71dc8efa5dfaef362ed761834319889841
-SIZE (estickies-20070223.tar.bz2) = 302650
+MD5 (estickies-20080223.tar.bz2) = a4116da9ed059109c888b955225cfb35
+SHA256 (estickies-20080223.tar.bz2) = 661e97a0ca41481d9cde1555b500ba364baca247e6249a0b07e4fba401a6959c
+SIZE (estickies-20080223.tar.bz2) = 307386
diff --git a/deskutils/kompose/Makefile b/deskutils/kompose/Makefile
index 48798fe1873d..e2c50a64e429 100644
--- a/deskutils/kompose/Makefile
+++ b/deskutils/kompose/Makefile
@@ -7,20 +7,20 @@
 
 PORTNAME=	kompose
 PORTVERSION=	0.5.3
+PORTREVISION=	1
 CATEGORIES=	deskutils kde
 MASTER_SITES=	BERLIOS
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Full-screen task manager similar to Expose(tm)
 
-LIB_DEPENDS=	Imlib2.4:${PORTSDIR}/graphics/imlib2
-
 EXTRA_PATCHES=	${PORTSDIR}/x11/kde3/files/extrapatch-old_configure
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 USE_AUTOTOOLS=	libtool:15
+USE_EFL=	imlib2
 INSTALLS_ICONS=	yes
 
 DOCSDIR=	share/doc/HTML/en/${PORTNAME}
diff --git a/deskutils/pypanel/Makefile b/deskutils/pypanel/Makefile
index 832036c634b7..f98c275a5ca6 100644
--- a/deskutils/pypanel/Makefile
+++ b/deskutils/pypanel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pypanel
 PORTVERSION=	2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	pypanel
@@ -17,14 +17,14 @@ MAINTAINER=	u0@rootofallevil.net
 COMMENT=	Desktop panel written in Python
 
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
-		Xft.2:${PORTSDIR}/x11-fonts/libXft \
-		Imlib2.4:${PORTSDIR}/graphics/imlib2
+		Xft.2:${PORTSDIR}/x11-fonts/libXft
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Xlib/X.py:${PORTSDIR}/x11-toolkits/py-xlib
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Xlib/X.py:${PORTSDIR}/x11-toolkits/py-xlib
 
 USE_X_PREFIX=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+USE_EFL=	imlib2
 PYDISTUTILS_PKGNAME=	PyPanel
 
 PORTDOCS=	*
diff --git a/devel/Makefile b/devel/Makefile
index 2f0c58ac2767..a8bfe2f73b63 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -271,10 +271,16 @@
     SUBDIR += duplo
     SUBDIR += dwarfdump
     SUBDIR += e4graph
+    SUBDIR += e_dbus
     SUBDIR += ebnf2yacc
     SUBDIR += eboxy
     SUBDIR += ecb
     SUBDIR += ecgi
+    SUBDIR += ecore
+    SUBDIR += ecore-file
+    SUBDIR += ecore-ipc
+    SUBDIR += ecore-job
+    SUBDIR += ecore-main
     SUBDIR += ecos-tools
     SUBDIR += eet
     SUBDIR += egypt
diff --git a/devel/e_dbus/Makefile b/devel/e_dbus/Makefile
new file mode 100644
index 000000000000..7a5faef3c5bf
--- /dev/null
+++ b/devel/e_dbus/Makefile
@@ -0,0 +1,56 @@
+# New ports collection makefile for:	e_dbus
+# Date created:				23 February 2008
+# Whom:					Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	e_dbus
+PORTVERSION=	20080223
+CATEGORIES=	devel
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	EFL DBUS connectivity library
+
+LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack gnometarget pkgconfig
+USE_EFL=	ecore
+USE_LDCONFIG=	yes
+
+OPTIONS=	EHAL	"Build E HAL module"	on \
+		ENM	"Build E NM module"	on \
+		ENOT	"Build E notify module" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_EHAL)
+CONFIGURE_ARGS+=	--enable-ehal
+PLIST_SUB+=	EHAL=""
+.else
+CONFIGURE_ARGS+=	--disable-ehal
+PLIST_SUB+=	EHAL="@comment "
+.endif
+
+.if !defined(WITHOUT_ENM)
+CONFIGURE_ARGS+=	--enable-enm
+PLIST_SUB+=	ENM=""
+.else
+CONFIGURE_ARGS+=	--disable-enm
+PLIST_SUB+=	ENM="@comment "
+.endif
+
+.if !defined(WITHOUT_ENOT)
+CONFIGURE_ARGS+=	--enable-enotify
+PLIST_SUB+=	ENOT=""
+USE_EFL+=	evas
+.else
+CONFIGURE_ARGS+=	--disable-enotify
+PLIST_SUB+=	ENOT="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/e_dbus/distinfo b/devel/e_dbus/distinfo
new file mode 100644
index 000000000000..486c69fb2ee8
--- /dev/null
+++ b/devel/e_dbus/distinfo
@@ -0,0 +1,3 @@
+MD5 (e_dbus-20080223.tar.bz2) = d709ffed87f71253a62cda1484b0aa64
+SHA256 (e_dbus-20080223.tar.bz2) = f27382a51c16f7d10b3e2757c4b8c3a483b3afc137cafae4321252b3d4cf59c0
+SIZE (e_dbus-20080223.tar.bz2) = 252568
diff --git a/devel/e_dbus/pkg-descr b/devel/e_dbus/pkg-descr
new file mode 100644
index 000000000000..141e4ab49806
--- /dev/null
+++ b/devel/e_dbus/pkg-descr
@@ -0,0 +1,3 @@
+Enlightenment DBUS compatibility layer.
+
+WWW: http://www.enlightenment.org/
diff --git a/devel/e_dbus/pkg-plist b/devel/e_dbus/pkg-plist
new file mode 100644
index 000000000000..5699855209ab
--- /dev/null
+++ b/devel/e_dbus/pkg-plist
@@ -0,0 +1,31 @@
+%%EHAL%%bin/e_dbus_hal
+%%ENM%%bin/e_dbus_nm
+%%ENOT%%bin/e_dbus_notification_daemon
+%%ENOT%%bin/e_dbus_notify
+bin/e_dbus_test
+bin/e_dbus_test_client
+include/E_DBus.h
+%%EHAL%%include/E_Hal.h
+%%ENM%%include/E_Nm.h
+%%ENOT%%include/E_Notification_Daemon.h
+%%ENOT%%include/E_Notify.h
+lib/libedbus.a
+lib/libedbus.la
+lib/libedbus.so
+lib/libedbus.so.1
+%%EHAL%%lib/libehal.a
+%%EHAL%%lib/libehal.la
+%%EHAL%%lib/libehal.so
+%%EHAL%%lib/libehal.so.1
+%%ENM%%lib/libenm.a
+%%ENM%%lib/libenm.la
+%%ENM%%lib/libenm.so
+%%ENM%%lib/libenm.so.1
+%%ENOT%%lib/libenotify.a
+%%ENOT%%lib/libenotify.la
+%%ENOT%%lib/libenotify.so
+%%ENOT%%lib/libenotify.so.1
+libdata/pkgconfig/edbus.pc
+%%EHAL%%libdata/pkgconfig/ehal.pc
+%%ENM%%libdata/pkgconfig/enm.pc
+%%ENOT%%libdata/pkgconfig/enotify.pc
diff --git a/devel/ecore-file/Makefile b/devel/ecore-file/Makefile
new file mode 100644
index 000000000000..49dbff8abac7
--- /dev/null
+++ b/devel/ecore-file/Makefile
@@ -0,0 +1,64 @@
+# New ports collection makefile for:	ecore-file
+# Date created:				17 September 2007
+# Whom:					Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	file
+PORTVERSION=	0.9.9.042
+PORTREVISION=	0
+CATEGORIES=	devel
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	ecore-
+DISTNAME=	ecore-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	Enlightenment core abstraction library (file module)
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_LDCONFIG=	yes
+USE_GETOPT_LONG=yes
+USE_EFL=	ecore
+BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_file
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+CONFIGURE_ARGS=	--disable-ecore-con \
+		--disable-ecore-config \
+		--disable-ecore-desktop \
+		--disable-ecore-directfb \
+		--disable-ecore-evas \
+		--enable-ecore-file \
+		--disable-ecore-ipc \
+		--disable-ecore-job \
+		--disable-ecore-sdl \
+		--disable-ecore-txt \
+		--disable-ecore-x \
+		--disable-ecore-imf \
+		--disable-ecore-imf_evas
+
+OPTIONS=	CURL	"Enable Curl support"	on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_CURL)
+CONFIGURE_ARGS+=	--enable-curl
+LIB_DEPENDS+=		curl.4:${PORTSDIR}/ftp/curl
+.else
+CONFIGURE_ARGS+=	--disable-curl
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -E -e \
+		's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
+		${BUILD_WRKSRC}/Makefile.in
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/ecore-file.pc \
+		${PREFIX}/libdata/pkgconfig/
+
+.include <bsd.port.post.mk>
diff --git a/devel/ecore-file/distinfo b/devel/ecore-file/distinfo
new file mode 100644
index 000000000000..4672f6a1c167
--- /dev/null
+++ b/devel/ecore-file/distinfo
@@ -0,0 +1,3 @@
+MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
+SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
+SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
diff --git a/devel/ecore-file/pkg-descr b/devel/ecore-file/pkg-descr
new file mode 100644
index 000000000000..2559668d0e57
--- /dev/null
+++ b/devel/ecore-file/pkg-descr
@@ -0,0 +1,5 @@
+A core event abstracter layer and X abstraction layer that makes doing
+selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
+fast, optimised, and convenient.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Ecore/
diff --git a/devel/ecore-file/pkg-plist b/devel/ecore-file/pkg-plist
new file mode 100644
index 000000000000..f007fefe0c41
--- /dev/null
+++ b/devel/ecore-file/pkg-plist
@@ -0,0 +1,6 @@
+include/Ecore_File.h
+lib/libecore_file.a
+lib/libecore_file.la
+lib/libecore_file.so
+lib/libecore_file.so.9
+libdata/pkgconfig/ecore-file.pc
diff --git a/devel/ecore-ipc/Makefile b/devel/ecore-ipc/Makefile
new file mode 100644
index 000000000000..6a7b38940724
--- /dev/null
+++ b/devel/ecore-ipc/Makefile
@@ -0,0 +1,66 @@
+# New ports collection makefile for:	ecore-ipc
+# Date created:				17 September 2007
+# Whom:					Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	ipc
+PORTVERSION=	0.9.9.042
+PORTREVISION=	0
+CATEGORIES=	devel
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	ecore-
+DISTNAME=	ecore-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	Enlightenment core abstraction library (ipc module)
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_LDCONFIG=	yes
+USE_GETOPT_LONG=yes
+USE_EFL=	ecore
+USE_EFL_ECORE=	con
+BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_ipc
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+CONFIGURE_ARGS=	--enable-ecore-con \
+		--disable-ecore-config \
+		--disable-ecore-desktop \
+		--disable-ecore-directfb \
+		--disable-ecore-evas \
+		--disable-ecore-file \
+		--enable-ecore-ipc \
+		--disable-ecore-job \
+		--disable-ecore-sdl \
+		--disable-ecore-txt \
+		--disable-ecore-x \
+		--disable-ecore-imf \
+		--disable-ecore-imf_evas
+
+OPTIONS=	SSL	"Enable SSL support"	on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_SSL)
+CONFIGURE_ARGS+=	--enable-openssl
+.else
+CONFIGURE_ARGS+=	--disable-openssl
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore_con/\.libs,${LOCALBASE}/lib,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore_con/libecore_con\.la,-lecore_con,'\
+		${BUILD_WRKSRC}/Makefile.in
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/ecore-ipc.pc \
+		${PREFIX}/libdata/pkgconfig/
+
+.include <bsd.port.post.mk>
diff --git a/devel/ecore-ipc/distinfo b/devel/ecore-ipc/distinfo
new file mode 100644
index 000000000000..4672f6a1c167
--- /dev/null
+++ b/devel/ecore-ipc/distinfo
@@ -0,0 +1,3 @@
+MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
+SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
+SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
diff --git a/devel/ecore-ipc/files/patch-configure b/devel/ecore-ipc/files/patch-configure
new file mode 100644
index 000000000000..aa36db02c97f
--- /dev/null
+++ b/devel/ecore-ipc/files/patch-configure
@@ -0,0 +1,94 @@
+--- configure.orig	2008-02-23 19:32:59.000000000 +0300
++++ configure	2008-02-23 19:33:33.000000000 +0300
+@@ -20543,83 +20543,6 @@
+ if test "${enable_openssl+set}" = set; then
+   enableval=$enable_openssl;  want_openssl=$enableval
+ 
+-fi
+-
+-
+-if test "x$want_openssl" = "xyes"; then
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for SSL" >&5
+-echo $ECHO_N "checking for SSL... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+-    if test -n "$SSL_CFLAGS"; then
+-        pkg_cv_SSL_CFLAGS="$SSL_CFLAGS"
+-    else
+-        if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  pkg_cv_SSL_CFLAGS=`$PKG_CONFIG --cflags "openssl" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+-    fi
+-else
+-	pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+-    if test -n "$SSL_LIBS"; then
+-        pkg_cv_SSL_LIBS="$SSL_LIBS"
+-    else
+-        if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  pkg_cv_SSL_LIBS=`$PKG_CONFIG --libs "openssl" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+-    fi
+-else
+-	pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        SSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "openssl"`
+-        else
+-	        SSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl"`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$SSL_PKG_ERRORS" >&5
+-
+-	{ echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-                 have_openssl="no"
+-
+-elif test $pkg_failed = untried; then
+-	 have_openssl="no"
+-
+-else
+-	SSL_CFLAGS=$pkg_cv_SSL_CFLAGS
+-	SSL_LIBS=$pkg_cv_SSL_LIBS
+-        { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-
+-
+ cat >>confdefs.h <<\_ACEOF
+ #define USE_OPENSSL 1
+ _ACEOF
+@@ -20630,7 +20553,6 @@
+        have_openssl="yes"
+ 
+ fi
+-fi
+ 
+ want_curl="yes"
+ have_curl="no"
diff --git a/devel/ecore-ipc/pkg-descr b/devel/ecore-ipc/pkg-descr
new file mode 100644
index 000000000000..2559668d0e57
--- /dev/null
+++ b/devel/ecore-ipc/pkg-descr
@@ -0,0 +1,5 @@
+A core event abstracter layer and X abstraction layer that makes doing
+selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
+fast, optimised, and convenient.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Ecore/
diff --git a/devel/ecore-ipc/pkg-plist b/devel/ecore-ipc/pkg-plist
new file mode 100644
index 000000000000..3607cfe8c6b6
--- /dev/null
+++ b/devel/ecore-ipc/pkg-plist
@@ -0,0 +1,6 @@
+include/Ecore_Ipc.h
+lib/libecore_ipc.a
+lib/libecore_ipc.la
+lib/libecore_ipc.so
+lib/libecore_ipc.so.9
+libdata/pkgconfig/ecore-ipc.pc
diff --git a/devel/ecore-job/Makefile b/devel/ecore-job/Makefile
new file mode 100644
index 000000000000..411ad40bab16
--- /dev/null
+++ b/devel/ecore-job/Makefile
@@ -0,0 +1,53 @@
+# New ports collection makefile for:	ecore-job
+# Date created:				22 September 2007
+# Whom:					Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	job
+PORTVERSION=	0.9.9.042
+PORTREVISION=	0
+CATEGORIES=	converters
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	ecore-
+DISTNAME=	ecore-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	Enlightenment core abstraction library (job module)
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_LDCONFIG=	yes
+USE_GETOPT_LONG=yes
+USE_EFL=	ecore
+BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_job
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+CONFIGURE_ARGS=	--disable-ecore-con \
+		--disable-ecore-config \
+		--disable-ecore-desktop \
+		--disable-ecore-directfb \
+		--disable-ecore-evas \
+		--disable-ecore-file \
+		--disable-ecore-ipc \
+		--enable-ecore-job \
+		--disable-ecore-sdl \
+		--disable-ecore-txt \
+		--disable-ecore-x \
+		--disable-ecore-imf \
+		--disable-ecore-imf_evas
+
+post-patch:
+	@${REINPLACE_CMD} -E -e \
+		's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
+		${BUILD_WRKSRC}/Makefile.in
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/ecore-job.pc \
+		${PREFIX}/libdata/pkgconfig/
+
+.include <bsd.port.mk>
diff --git a/devel/ecore-job/distinfo b/devel/ecore-job/distinfo
new file mode 100644
index 000000000000..4672f6a1c167
--- /dev/null
+++ b/devel/ecore-job/distinfo
@@ -0,0 +1,3 @@
+MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
+SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
+SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
diff --git a/devel/ecore-job/pkg-descr b/devel/ecore-job/pkg-descr
new file mode 100644
index 000000000000..2559668d0e57
--- /dev/null
+++ b/devel/ecore-job/pkg-descr
@@ -0,0 +1,5 @@
+A core event abstracter layer and X abstraction layer that makes doing
+selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
+fast, optimised, and convenient.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Ecore/
diff --git a/devel/ecore-job/pkg-plist b/devel/ecore-job/pkg-plist
new file mode 100644
index 000000000000..cd3bec0a6ca3
--- /dev/null
+++ b/devel/ecore-job/pkg-plist
@@ -0,0 +1,6 @@
+include/Ecore_Job.h
+lib/libecore_job.a
+lib/libecore_job.la
+lib/libecore_job.so
+lib/libecore_job.so.9
+libdata/pkgconfig/ecore-job.pc
diff --git a/devel/ecore-main/Makefile b/devel/ecore-main/Makefile
new file mode 100644
index 000000000000..97cfb70b112a
--- /dev/null
+++ b/devel/ecore-main/Makefile
@@ -0,0 +1,40 @@
+# New ports collection makefile for:	ecore-main
+# Date created:				17 September 2007
+# Whom:					Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	main
+PORTVERSION=	0.9.9.042
+PORTREVISION=	0
+CATEGORIES=	devel
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	ecore-
+DISTNAME=	ecore-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	Enlightenment core abstraction library (main library)
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_LDCONFIG=	yes
+USE_GETOPT_LONG=yes
+
+CONFIGURE_ARGS=	--disable-ecore-con \
+		--disable-ecore-config \
+		--disable-ecore-desktop \
+		--disable-ecore-directfb \
+		--disable-ecore-evas \
+		--disable-ecore-file \
+		--disable-ecore-ipc \
+		--disable-ecore-job \
+		--disable-ecore-sdl \
+		--disable-ecore-txt \
+		--disable-ecore-x \
+		--disable-ecore-imf \
+		--disable-ecore-imf_evas
+
+.include <bsd.port.mk>
diff --git a/devel/ecore-main/distinfo b/devel/ecore-main/distinfo
new file mode 100644
index 000000000000..4672f6a1c167
--- /dev/null
+++ b/devel/ecore-main/distinfo
@@ -0,0 +1,3 @@
+MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
+SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
+SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
diff --git a/devel/ecore-main/pkg-descr b/devel/ecore-main/pkg-descr
new file mode 100644
index 000000000000..2559668d0e57
--- /dev/null
+++ b/devel/ecore-main/pkg-descr
@@ -0,0 +1,5 @@
+A core event abstracter layer and X abstraction layer that makes doing
+selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
+fast, optimised, and convenient.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Ecore/
diff --git a/devel/ecore-main/pkg-plist b/devel/ecore-main/pkg-plist
new file mode 100644
index 000000000000..69033dfea741
--- /dev/null
+++ b/devel/ecore-main/pkg-plist
@@ -0,0 +1,8 @@
+include/Ecore.h
+include/Ecore_Data.h
+include/Ecore_Str.h
+lib/libecore.a
+lib/libecore.la
+lib/libecore.so
+lib/libecore.so.9
+libdata/pkgconfig/ecore.pc
diff --git a/devel/ecore/Makefile b/devel/ecore/Makefile
new file mode 100644
index 000000000000..1b5dbf9e204d
--- /dev/null
+++ b/devel/ecore/Makefile
@@ -0,0 +1,52 @@
+# New ports collection makefile for:	ecore
+# Date created:		22 September 2007
+# Whom:			Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	ecore
+PORTVERSION=	0.9.9.042
+PORTREVISION=	0
+PORTEPOCH=	2
+CATEGORIES=	devel
+MASTER_SITES=	# none
+DISTFILES=	# none
+EXTRACT_ONLY=	# none
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	Enlightenment core abstraction library (meta port)
+
+NO_BUILD=	yes
+USE_EFL=	ecore
+
+ECORE_MODULES=	con config desktop evas file ipc job sdl txt x11 imf imf_evas
+ECORE_sdl_off=	yes
+
+.for NODE in ${ECORE_MODULES}
+OPTIONS+=	${NODE:U} "Install ${NODE} ecore module"
+. if !defined(ECORE_${NODE}_off)
+OPTIONS+=	on
+. else
+OPTIONS+=	off
+. endif
+.endfor
+
+.include <bsd.port.pre.mk>
+
+.for NODE in ${ECORE_MODULES}
+. if !defined(ECORE_${NODE}_off)
+.  if !defined(WITHOUT_${NODE:U})
+USE_EFL_ECORE+=	${NODE}
+.  endif
+. else
+.  if defined(WITH_${NODE:U})
+USE_EFL_ECORE+=	${NODE}
+.  endif
+. endif
+.endfor
+
+do-install:
+	${DO_NADA}
+
+.include <bsd.port.post.mk>
diff --git a/devel/ecore/pkg-descr b/devel/ecore/pkg-descr
new file mode 100644
index 000000000000..2559668d0e57
--- /dev/null
+++ b/devel/ecore/pkg-descr
@@ -0,0 +1,5 @@
+A core event abstracter layer and X abstraction layer that makes doing
+selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
+fast, optimised, and convenient.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Ecore/
diff --git a/devel/eet/Makefile b/devel/eet/Makefile
index cc99460ad506..2a5f2be3030b 100644
--- a/devel/eet/Makefile
+++ b/devel/eet/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	eet
-PORTVERSION=	20070223
+PORTVERSION=	0.9.10.042
 PORTREVISION=	0
-PORTEPOCH=	1
+PORTEPOCH=	2
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Enlightenment Data Handling Library
diff --git a/devel/eet/distinfo b/devel/eet/distinfo
index 2f2d36f810e4..d76b0f17d26a 100644
--- a/devel/eet/distinfo
+++ b/devel/eet/distinfo
@@ -1,3 +1,3 @@
-MD5 (eet-20070223.tar.bz2) = c8c83f8704d9caea8604456c1e154d0c
-SHA256 (eet-20070223.tar.bz2) = 6b3da808d3a3b9858fa196bd46d8e035f9ea965fb68c02436ca711e160621bf9
-SIZE (eet-20070223.tar.bz2) = 1279064
+MD5 (eet-0.9.10.042.tar.bz2) = af0f46c29dcdc4725f4de491b7350bbb
+SHA256 (eet-0.9.10.042.tar.bz2) = c96643666ca8c70c71884affc4f3dc8b4cdb7c745d5f2a9c9366ad76aac8a38a
+SIZE (eet-0.9.10.042.tar.bz2) = 1497375
diff --git a/devel/eet/pkg-plist b/devel/eet/pkg-plist
index 4f3b2a864ec0..b5e86bdaeaf9 100644
--- a/devel/eet/pkg-plist
+++ b/devel/eet/pkg-plist
@@ -1,4 +1,4 @@
-bin/eet-config
+bin/eet
 include/Eet.h
 lib/libeet.a
 lib/libeet.la
diff --git a/devel/engrave/Makefile b/devel/engrave/Makefile
index a7a1a0ab708a..83a3f90d4415 100644
--- a/devel/engrave/Makefile
+++ b/devel/engrave/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	engrave
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
@@ -18,6 +18,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget pkgconfig gnomehack
 USE_EFL=	ecore evas
+USE_EFL_ECORE=	evas
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/devel/engrave/distinfo b/devel/engrave/distinfo
index 8272f9d6c19f..9e7d6f81dddf 100644
--- a/devel/engrave/distinfo
+++ b/devel/engrave/distinfo
@@ -1,3 +1,3 @@
-MD5 (engrave-20070223.tar.bz2) = a447eb6fe13f68c3f0300390fa3bf255
-SHA256 (engrave-20070223.tar.bz2) = 1d7c1e3daec69e7ff449b38e0f9d04fa0a0112056bf94828b0f69788735c0c9f
-SIZE (engrave-20070223.tar.bz2) = 252725
+MD5 (engrave-20080223.tar.bz2) = 643ef3b7be302f07abb7b87060c7837f
+SHA256 (engrave-20080223.tar.bz2) = c126f3128a53dd9aa152e2364d6ce220f14742fa2f0902b0c4debe3633ac4c2f
+SIZE (engrave-20080223.tar.bz2) = 485659
diff --git a/devel/engrave/pkg-plist b/devel/engrave/pkg-plist
index 9f8ba905f3ec..578e0298bb68 100644
--- a/devel/engrave/pkg-plist
+++ b/devel/engrave/pkg-plist
@@ -1,8 +1,8 @@
-bin/engrave-config
 bin/engrave_canvas_test
 bin/engrave_test
 include/engrave/Engrave.h
 include/engrave/engrave_canvas.h
+include/engrave/engrave_color_class.h
 include/engrave/engrave_data.h
 include/engrave/engrave_enums.h
 include/engrave/engrave_file.h
@@ -22,4 +22,5 @@ lib/libengrave.a
 lib/libengrave.la
 lib/libengrave.so
 lib/libengrave.so.1
+libdata/pkgconfig/engrave.pc
 @dirrm include/engrave
diff --git a/devel/evfs/Makefile b/devel/evfs/Makefile
index 8ab9a8a88470..5c8e976cff98 100644
--- a/devel/evfs/Makefile
+++ b/devel/evfs/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	evfs
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
@@ -19,7 +19,8 @@ GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget libxml2
-USE_EFL=	ecore eet
+USE_EFL=	ecore eet efreet evas
+USE_EFL_ECORE=	desktop ipc
 USE_LDCONFIG=	yes
 USE_SQLITE=	3
 
diff --git a/devel/evfs/distinfo b/devel/evfs/distinfo
index 4faf956f1961..3a0e4cfc32d3 100644
--- a/devel/evfs/distinfo
+++ b/devel/evfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (evfs-20070223.tar.bz2) = 3e8435d41ce695b709260bc949fae5f4
-SHA256 (evfs-20070223.tar.bz2) = d7bdabebcdf67d346df26d7ed38cf104fe3cd933eb3a4b418f261f676ee04518
-SIZE (evfs-20070223.tar.bz2) = 305383
+MD5 (evfs-20080223.tar.bz2) = 17af54ac25c9911f429178fd81d098f3
+SHA256 (evfs-20080223.tar.bz2) = 1724b0b632dd56f7ca3aa4cb5606180fcd1a3a17e6a1e4be4fc6691c9d3ff958
+SIZE (evfs-20080223.tar.bz2) = 319214
diff --git a/devel/evfs/pkg-plist b/devel/evfs/pkg-plist
index 656ad17ebbd1..827b5366aaf8 100644
--- a/devel/evfs/pkg-plist
+++ b/devel/evfs/pkg-plist
@@ -1,9 +1,10 @@
 bin/evfs
-bin/evfs-config
 bin/evfscat
 bin/evfscopy
 bin/evfsdemo
+bin/evfsworker
 include/evfs/evfs.h
+include/evfs/evfs_auth.h
 include/evfs/evfs_cleanup.h
 include/evfs/evfs_client.h
 include/evfs/evfs_command.h
@@ -38,9 +39,6 @@ lib/evfs/plugins/file/gzip.so
 lib/evfs/plugins/file/posix.a
 lib/evfs/plugins/file/posix.la
 lib/evfs/plugins/file/posix.so
-lib/evfs/plugins/file/trash.a
-lib/evfs/plugins/file/trash.la
-lib/evfs/plugins/file/trash.so
 %%SAMBA%%lib/evfs/plugins/file/samba.a
 %%SAMBA%%lib/evfs/plugins/file/samba.la
 %%SAMBA%%lib/evfs/plugins/file/samba.so
@@ -50,28 +48,35 @@ lib/evfs/plugins/file/sftp.so
 lib/evfs/plugins/file/tar.a
 lib/evfs/plugins/file/tar.la
 lib/evfs/plugins/file/tar.so
+lib/evfs/plugins/file/trash.a
+lib/evfs/plugins/file/trash.la
+lib/evfs/plugins/file/trash.so
 lib/evfs/plugins/file/vfolder.a
 lib/evfs/plugins/file/vfolder.la
 lib/evfs/plugins/file/vfolder.so
-lib/evfs/plugins/vfolder/group.a
-lib/evfs/plugins/vfolder/group.la
-lib/evfs/plugins/vfolder/group.so
-lib/evfs/plugins/vfolder/trash.a
-lib/evfs/plugins/vfolder/trash.la
-lib/evfs/plugins/vfolder/trash.so
 %%TAGLIB%%lib/evfs/plugins/meta/audio_tagger.a
 %%TAGLIB%%lib/evfs/plugins/meta/audio_tagger.la
 %%TAGLIB%%lib/evfs/plugins/meta/audio_tagger.so
 %%XTRACT%%lib/evfs/plugins/meta/extractor_tagger.a
 %%XTRACT%%lib/evfs/plugins/meta/extractor_tagger.la
 %%XTRACT%%lib/evfs/plugins/meta/extractor_tagger.so
+lib/evfs/plugins/vfolder/efolder.a
+lib/evfs/plugins/vfolder/efolder.la
+lib/evfs/plugins/vfolder/efolder.so
+lib/evfs/plugins/vfolder/group.a
+lib/evfs/plugins/vfolder/group.la
+lib/evfs/plugins/vfolder/group.so
+lib/evfs/plugins/vfolder/trash.a
+lib/evfs/plugins/vfolder/trash.la
+lib/evfs/plugins/vfolder/trash.so
 lib/libevfs.a
 lib/libevfs.la
 lib/libevfs.so
 lib/libevfs.so.0
+libdata/pkgconfig/evfs.pc
+@dirrm lib/evfs/plugins/vfolder
 @dirrm lib/evfs/plugins/meta
 @dirrm lib/evfs/plugins/file
-@dirrm lib/evfs/plugins/vfolder
 @dirrm lib/evfs/plugins
 @dirrm lib/evfs
 @dirrm include/evfs
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index 0572b10f6994..ff0bb7b318c3 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libast
 PORTVERSION=	0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://critical.ch/distfiles/ \
 		http://www.eterm.org/download/
@@ -15,12 +15,12 @@ MASTER_SITES=	http://critical.ch/distfiles/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library of assorted spiffy things
 
-LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre \
-		Imlib2.4:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
 USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack
+USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/ruby-ecore/Makefile b/devel/ruby-ecore/Makefile
index 46d3a98781ae..95ed9dc5d393 100644
--- a/devel/ruby-ecore/Makefile
+++ b/devel/ruby-ecore/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	ecore
-PORTVERSION=	20061008
-PORTREVISION=	1
+PORTVERSION=	20080302
+PORTREVISION=	0
 CATEGORIES=	devel ruby
-MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-ecore-${PORTVERSION}
 
@@ -22,14 +22,12 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake \
 USE_BZIP2=	yes
 USE_RUBY=	yes
 USE_EFL=	ecore
+USE_EFL_ECORE=	x11 con job evas
 
 RUBY_SA=	${RUBY_SITEARCHLIBDIR}
 
 .include <bsd.port.pre.mk>
 
-post-patch:
-	@${REINPLACE_CMD} "s#%%X11BASE%%#${X11BASE}#g" ${WRKSRC}/Rakefile
-
 do-build:
 	@(cd ${WRKSRC}; ${SETENV} ECORE_PREFIX=${LOCALBASE} \
 		${LOCALBASE}/bin/rake)
diff --git a/devel/ruby-ecore/distinfo b/devel/ruby-ecore/distinfo
index 66380ad14d36..9b72a2f4a6bb 100644
--- a/devel/ruby-ecore/distinfo
+++ b/devel/ruby-ecore/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby-ecore-20061008.tar.bz2) = a54661c6c9ff982a80f231fb5456fa37
-SHA256 (ruby-ecore-20061008.tar.bz2) = de3477d05c25cba51345b8dca9564e751262452cd9fe775fc9b0583336d8e24b
-SIZE (ruby-ecore-20061008.tar.bz2) = 24053
+MD5 (ruby-ecore-20080302.tar.bz2) = 7df2d66a2140ab18455ce0f1467db265
+SHA256 (ruby-ecore-20080302.tar.bz2) = 6a04b4fb31fd81481319be9a7f583fb64cb252b3471501d96f7d79bb973cc3e9
+SIZE (ruby-ecore-20080302.tar.bz2) = 27641
diff --git a/devel/ruby-ecore/files/patch-Rakefile b/devel/ruby-ecore/files/patch-Rakefile
deleted file mode 100644
index d5c309404789..000000000000
--- a/devel/ruby-ecore/files/patch-Rakefile
+++ /dev/null
@@ -1,17 +0,0 @@
---- Rakefile.orig	Sun Oct  8 11:05:35 2006
-+++ Rakefile	Sun Oct  8 11:06:20 2006
-@@ -18,12 +18,12 @@
- 
- ext_libs.each do |lib|
- 	file lib.so => lib.objects do |t|
--		sh "cc #{lib.ldflags} #{t.prerequisites.join(" ")} -o #{t.name}"
-+		sh "cc -L%%X11BASE%%/lib #{lib.ldflags} #{t.prerequisites.join(" ")} -o #{t.name}"
- 	end
- 
- 	lib.objects.each do |object|
- 		file object => object.sub(/\.[^.]+$/, ".c") do |t|
--			sh "cc #{lib.cflags} #{t.prerequisites.first} " +
-+			sh "cc -I%%X11BASE%%/include #{lib.cflags} #{t.prerequisites.first} " +
- 			   "-c -o #{t.name}"
- 		end
- 	end
diff --git a/editors/texmacs/Makefile b/editors/texmacs/Makefile
index 6a69b87e346e..56dae0762a63 100644
--- a/editors/texmacs/Makefile
+++ b/editors/texmacs/Makefile
@@ -43,7 +43,7 @@ MAN1=		texmacs.1 fig2ps.1
 MANCOMPRESSED=	yes
 
 .if !defined(WITHOUT_IMLIB2)
-LIB_DEPENDS+=	Imlib2.4:${PORTSDIR}/graphics/imlib2
+USE_EFL=	imlib2
 CONFIGURE_ARGS+=	--with-imlib2
 .endif
 
diff --git a/graphics/Makefile b/graphics/Makefile
index 65be6b1b8994..016d1fd5b75c 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -98,6 +98,8 @@
     SUBDIR += duhdraw
     SUBDIR += dynamechs
     SUBDIR += ecg2png
+    SUBDIR += ecore-evas
+    SUBDIR += ecore-sdl
     SUBDIR += edje
     SUBDIR += edje_viewer
     SUBDIR += electriceyes
@@ -114,6 +116,20 @@
     SUBDIR += esmart
     SUBDIR += eterm-bg
     SUBDIR += evas
+    SUBDIR += evas-core
+    SUBDIR += evas-engine-buffer
+    SUBDIR += evas-engine-opengl
+    SUBDIR += evas-engine-sdl
+    SUBDIR += evas-engine-x11
+    SUBDIR += evas-engine-xrender
+    SUBDIR += evas-loader-edb
+    SUBDIR += evas-loader-eet
+    SUBDIR += evas-loader-gif
+    SUBDIR += evas-loader-jpeg
+    SUBDIR += evas-loader-png
+    SUBDIR += evas-loader-svg
+    SUBDIR += evas-loader-tiff
+    SUBDIR += evas-loader-xpm
     SUBDIR += evince
     SUBDIR += evolvotron
     SUBDIR += exact-image
diff --git a/graphics/ecore-evas/Makefile b/graphics/ecore-evas/Makefile
new file mode 100644
index 000000000000..f0d33aaf6945
--- /dev/null
+++ b/graphics/ecore-evas/Makefile
@@ -0,0 +1,103 @@
+# New ports collection makefile for:	ecore-evas
+# Date created:				17 September 2007
+# Whom:					Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	evas
+PORTVERSION=	0.9.9.042
+PORTREVISION=	0
+CATEGORIES=	devel
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	ecore-
+DISTNAME=	ecore-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	Enlightenment core abstraction library (evas module)
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_LDCONFIG=	yes
+USE_GETOPT_LONG=yes
+USE_EFL=	ecore evas
+BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_evas
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+CONFIGURE_ARGS=	--disable-ecore-con \
+		--disable-ecore-config \
+		--disable-ecore-desktop \
+		--disable-ecore-directfb \
+		--enable-ecore-evas \
+		--disable-ecore-file \
+		--disable-ecore-ipc \
+		--disable-ecore-job \
+		--disable-ecore-sdl \
+		--disable-ecore-txt \
+		--disable-ecore-x \
+		--disable-ecore-imf \
+		--disable-ecore-imf_evas
+
+OPTIONS=	X11	"Enable Evas X11 support"	on \
+		GL	"Enable Evas GL support"	on \
+		XRENDER	"Enable Evas Xrender support"	on \
+		BUFFER	"Enable Evas Buffer support"	on \
+		SDL	"Enable Evas SDL support"	off
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_GL)
+CONFIGURE_ARGS+=	--enable-ecore-evas-gl
+USE_EFL_EVAS_ENGINES+=	opengl
+USE_X=			yes
+.else
+CONFIGURE_ARGS+=	--disable-ecore-evas-gl
+.endif
+
+.if !defined(WITHOUT_XRENDER)
+CONFIGURE_ARGS+=	--enable-ecore-evas-xrender
+USE_EFL_EVAS_ENGINES+=	xrender
+USE_X=			yes
+.else
+CONFIGURE_ARGS+=	--disable-ecore-evas-xrender
+.endif
+
+.if !defined(WITHOUT_X11) || defined(USE_X)
+CONFIGURE_ARGS+=	--enable-ecore-x
+USE_EFL_ECORE+=		x11
+USE_EFL_EVAS_ENGINES+=	x11
+.else
+CONFIGURE_ARGS+=	--disable-ecore-x
+.endif
+
+.if !defined(WITHOUT_BUFFER)
+CONFIGURE_ARGS+=	--enable-ecore-evas-buffer
+USE_EFL_EVAS_ENGINES+=	buffer
+.else
+CONFIGURE_ARGS+=	--disable-ecore-evas-buffer
+.endif
+
+.if !defined(WITHOUT_SDL)
+CONFIGURE_ARGS+=	--enable-ecore-evas-sdl
+USE_EFL_EVAS_ENGINES+=	sdl
+.else
+CONFIGURE_ARGS+=	--disable-ecore-evas-sdl
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore_x/\.libs,${LOCALBASE}/lib,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore_sdl/\.libs,${LOCALBASE}/lib,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore_x/libecore_x\.la,-lecore_x,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore_sdl/libecore_sdl\.la,-lecore_sdl,'\
+		${BUILD_WRKSRC}/Makefile.in
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/ecore-evas.pc \
+		${PREFIX}/libdata/pkgconfig/
+
+.include <bsd.port.post.mk>
diff --git a/graphics/ecore-evas/distinfo b/graphics/ecore-evas/distinfo
new file mode 100644
index 000000000000..4672f6a1c167
--- /dev/null
+++ b/graphics/ecore-evas/distinfo
@@ -0,0 +1,3 @@
+MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
+SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
+SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
diff --git a/graphics/ecore-evas/pkg-descr b/graphics/ecore-evas/pkg-descr
new file mode 100644
index 000000000000..2559668d0e57
--- /dev/null
+++ b/graphics/ecore-evas/pkg-descr
@@ -0,0 +1,5 @@
+A core event abstracter layer and X abstraction layer that makes doing
+selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
+fast, optimised, and convenient.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Ecore/
diff --git a/graphics/ecore-evas/pkg-plist b/graphics/ecore-evas/pkg-plist
new file mode 100644
index 000000000000..b57e551bce8b
--- /dev/null
+++ b/graphics/ecore-evas/pkg-plist
@@ -0,0 +1,6 @@
+include/Ecore_Evas.h
+lib/libecore_evas.a
+lib/libecore_evas.la
+lib/libecore_evas.so
+lib/libecore_evas.so.9
+libdata/pkgconfig/ecore-evas.pc
diff --git a/graphics/ecore-sdl/Makefile b/graphics/ecore-sdl/Makefile
new file mode 100644
index 000000000000..e23f3e4e2c57
--- /dev/null
+++ b/graphics/ecore-sdl/Makefile
@@ -0,0 +1,54 @@
+# New ports collection makefile for:	ecore-sdl
+# Date created:				22 September 2007
+# Whom:					Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	sdl
+PORTVERSION=	0.9.9.042
+PORTREVISION=	0
+CATEGORIES=	graphics
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	ecore-
+DISTNAME=	ecore-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	Enlightenment core abstraction library (sdl module)
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_LDCONFIG=	yes
+USE_GETOPT_LONG=yes
+USE_EFL=	ecore
+USE_SDL=	sdl
+BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_sdl
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+CONFIGURE_ARGS=	--disable-ecore-con \
+		--disable-ecore-config \
+		--disable-ecore-desktop \
+		--disable-ecore-directfb \
+		--disable-ecore-evas \
+		--disable-ecore-file \
+		--disable-ecore-ipc \
+		--disable-ecore-job \
+		--enable-ecore-sdl \
+		--disable-ecore-txt \
+		--disable-ecore-x \
+		--disable-ecore-imf \
+		--disable-ecore-imf_evas
+
+post-patch:
+	@${REINPLACE_CMD} -E -e \
+		's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
+		${BUILD_WRKSRC}/Makefile.in
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/ecore-sdl.pc \
+		${PREFIX}/libdata/pkgconfig/
+
+.include <bsd.port.mk>
diff --git a/graphics/ecore-sdl/distinfo b/graphics/ecore-sdl/distinfo
new file mode 100644
index 000000000000..4672f6a1c167
--- /dev/null
+++ b/graphics/ecore-sdl/distinfo
@@ -0,0 +1,3 @@
+MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
+SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
+SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
diff --git a/graphics/ecore-sdl/pkg-descr b/graphics/ecore-sdl/pkg-descr
new file mode 100644
index 000000000000..2559668d0e57
--- /dev/null
+++ b/graphics/ecore-sdl/pkg-descr
@@ -0,0 +1,5 @@
+A core event abstracter layer and X abstraction layer that makes doing
+selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
+fast, optimised, and convenient.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Ecore/
diff --git a/graphics/ecore-sdl/pkg-plist b/graphics/ecore-sdl/pkg-plist
new file mode 100644
index 000000000000..5a7aaa3868c3
--- /dev/null
+++ b/graphics/ecore-sdl/pkg-plist
@@ -0,0 +1,6 @@
+include/Ecore_Sdl.h
+lib/libecore_sdl.a
+lib/libecore_sdl.la
+lib/libecore_sdl.so
+lib/libecore_sdl.so.9
+libdata/pkgconfig/ecore-sdl.pc
diff --git a/graphics/edje/Makefile b/graphics/edje/Makefile
index a6342bfdba7f..b6a082315a9f 100644
--- a/graphics/edje/Makefile
+++ b/graphics/edje/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	edje
-PORTVERSION=	20070223
-PORTREVISION=	2
-PORTEPOCH=	1
+PORTVERSION=	0.5.0.042
+PORTREVISION=	0
+PORTEPOCH=	2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Edje is a complex graphical design and layout engine
@@ -20,8 +21,12 @@ USE_BZIP2=	yes
 USE_GCC=	3.4+
 USE_GNOME=	gnomehack pkgconfig gnometarget
 USE_EFL=	embryo eet evas ecore imlib2
+USE_EFL_ECORE=	evas job
+USE_EVAS_LOADERS=	edb eet jpeg png
 USE_LDCONFIG=	yes
 
+CONFIGURE_ARGS+=	--without-vim
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "ia64"
diff --git a/graphics/edje/distinfo b/graphics/edje/distinfo
index 89a1f9451636..ae788d7305fa 100644
--- a/graphics/edje/distinfo
+++ b/graphics/edje/distinfo
@@ -1,3 +1,3 @@
-MD5 (edje-20070223.tar.bz2) = 58cb7589902f03ea6b56bbddb1114f48
-SHA256 (edje-20070223.tar.bz2) = cb5005e8b2e5b7cf88dea639d406cdec9c2ff21bf2c2b8285283073810b51caf
-SIZE (edje-20070223.tar.bz2) = 1356646
+MD5 (edje-0.5.0.042.tar.bz2) = fc95528409351acea7a48862331eaffd
+SHA256 (edje-0.5.0.042.tar.bz2) = 352f1a9d600e85cddd9e5dbf6becad87f4be49a15b7e87f46e011c9d48e50af2
+SIZE (edje-0.5.0.042.tar.bz2) = 2819823
diff --git a/graphics/edje/pkg-plist b/graphics/edje/pkg-plist
index 22a69c5a7e36..d2264d98c8b9 100644
--- a/graphics/edje/pkg-plist
+++ b/graphics/edje/pkg-plist
@@ -1,4 +1,3 @@
-bin/edje-config
 bin/edje_cc
 bin/edje_decc
 bin/edje_recc
@@ -9,19 +8,5 @@ lib/libedje.so
 lib/libedje.so.5
 libdata/pkgconfig/edje.pc
 %%DATADIR%%/include/edje.inc
-@dirrmtry %%DATADIR%%/include
-@dirrmtry %%DATADIR%%/data/test/images
-@dirrmtry %%DATADIR%%/data/test/fonts
-@dirrmtry %%DATADIR%%/data/test
-@dirrmtry %%DATADIR%%/data/template/programs
-@dirrmtry %%DATADIR%%/data/template/parts
-@dirrmtry %%DATADIR%%/data/template/macros
-@dirrmtry %%DATADIR%%/data/template/images
-@dirrmtry %%DATADIR%%/data/template/hashes
-@dirrmtry %%DATADIR%%/data/template/fonts
-@dirrmtry %%DATADIR%%/data/template/embryo
-@dirrmtry %%DATADIR%%/data/template
-@dirrmtry %%DATADIR%%/data/src
-@dirrmtry %%DATADIR%%/data/images
-@dirrmtry %%DATADIR%%/data
-@dirrmtry %%DATADIR%%
+@dirrm %%DATADIR%%/include
+@dirrm %%DATADIR%%
diff --git a/graphics/edje_viewer/Makefile b/graphics/edje_viewer/Makefile
index 57e86d5c8893..e603a8d02c2b 100644
--- a/graphics/edje_viewer/Makefile
+++ b/graphics/edje_viewer/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	edje_viewer
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
@@ -19,6 +19,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
 USE_EFL=	evas ecore edje etk
+USE_EFL_ECORE=	config
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/edje_viewer/distinfo b/graphics/edje_viewer/distinfo
index 348b2f9fa6a2..eccbb851c5c1 100644
--- a/graphics/edje_viewer/distinfo
+++ b/graphics/edje_viewer/distinfo
@@ -1,3 +1,3 @@
-MD5 (edje_viewer-20070223.tar.bz2) = ca78913cccab72cc667d77f4be95ff04
-SHA256 (edje_viewer-20070223.tar.bz2) = c9fd85b81a19ad9ac20f6f5a6554837d2255efde8cbac2c5030742f8ffa0d049
-SIZE (edje_viewer-20070223.tar.bz2) = 262613
+MD5 (edje_viewer-20080223.tar.bz2) = 7bce25a1a71d51a97533813695999da4
+SHA256 (edje_viewer-20080223.tar.bz2) = 0c293a7d71ad2492114959351c9a3920c2d470f82ce7d60a2665edf2a581b1ca
+SIZE (edje_viewer-20080223.tar.bz2) = 265289
diff --git a/graphics/entice/Makefile b/graphics/entice/Makefile
index 89d938638aed..20341a855cbb 100644
--- a/graphics/entice/Makefile
+++ b/graphics/entice/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	entice
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20070915
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
@@ -15,18 +15,15 @@ MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An image viewer written using libraries for Enlightenment 0.17
 
-LIB_DEPENDS=	esmart_thumb.0:${PORTSDIR}/graphics/esmart
-
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnometarget pkgconfig
 USE_EFL=	imlib2 evas edb ecore edje epsilon
-USE_EFL_ESMART=	thumb
-
-.include <bsd.port.pre.mk>
+USE_EFL_ECORE=	ipc
+USE_EFL_ESMART=	thumb container draggies trans_x11
 
-.if ${ARCH}==ia64
-BROKEN=		does not install on ${ARCH}
-.endif
+DEPRECATED=	Broken and unmaintained
+EXPIRATION_DATE=	2008-03-20
+BROKEN=		don't work with current EFL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/entice/distinfo b/graphics/entice/distinfo
index 63517e7e19d8..2eec9e0a256f 100644
--- a/graphics/entice/distinfo
+++ b/graphics/entice/distinfo
@@ -1,3 +1,3 @@
-MD5 (entice-20070223.tar.bz2) = 3f0ba702de5679830ab09f00779e3331
-SHA256 (entice-20070223.tar.bz2) = d55495af7d2b66a3404184b84ec42e3d63c168416f40a9f7a564c9cd39c269f6
-SIZE (entice-20070223.tar.bz2) = 792196
+MD5 (entice-20070915.tar.bz2) = c9616b0f2c6e366ea72b4cf0bd8168a5
+SHA256 (entice-20070915.tar.bz2) = 4fc080bb01771dd6c339244f475ef5e36acdf70f86e46b9112fbd69bd0c7d614
+SIZE (entice-20070915.tar.bz2) = 790084
diff --git a/graphics/entice/pkg-plist b/graphics/entice/pkg-plist
index 8353f1b0fd08..0f438148331a 100644
--- a/graphics/entice/pkg-plist
+++ b/graphics/entice/pkg-plist
@@ -1,17 +1,5 @@
 bin/entice
-%%DATADIR%%/fonts/Vera.ttf
-%%DATADIR%%/fonts/VeraBI.ttf
-%%DATADIR%%/fonts/VeraBd.ttf
-%%DATADIR%%/fonts/VeraIt.ttf
-%%DATADIR%%/fonts/VeraMoBI.ttf
-%%DATADIR%%/fonts/VeraMoBd.ttf
-%%DATADIR%%/fonts/VeraMoIt.ttf
-%%DATADIR%%/fonts/VeraMono.ttf
-%%DATADIR%%/fonts/VeraSe.ttf
-%%DATADIR%%/fonts/VeraSeBd.ttf
-%%DATADIR%%/fonts/nationff.ttf
-%%DATADIR%%/themes/artifakt.eet
-%%DATADIR%%/themes/default.eet
+%%DATADIR%%/themes/artifakt.edj
+%%DATADIR%%/themes/default.edj
 @dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%/fonts
 @dirrm %%DATADIR%%
diff --git a/graphics/epeg/Makefile b/graphics/epeg/Makefile
index f1058d66ac07..aa1096e4ef31 100644
--- a/graphics/epeg/Makefile
+++ b/graphics/epeg/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	epeg
-PORTVERSION=	20070223
+PORTVERSION=	0.9.1.042
 PORTREVISION=	0
-PORTEPOCH=	1
+PORTEPOCH=	2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
 
 MAINTAINER=	stas@FreeBSD.org
-COMMENT=	An IMMENSELY FAST JPEG thumbnailer library API
+COMMENT=	An immensely fast JPEG thumbnailing library
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
diff --git a/graphics/epeg/distinfo b/graphics/epeg/distinfo
index 079569c41b92..91ede3084589 100644
--- a/graphics/epeg/distinfo
+++ b/graphics/epeg/distinfo
@@ -1,3 +1,3 @@
-MD5 (epeg-20070223.tar.bz2) = adbb92d557cda3bbe1478f8c89ee71df
-SHA256 (epeg-20070223.tar.bz2) = b7b9eca6144ab9ab399134f2ca97fdef93933bd03f469cca562b0354bb2909a9
-SIZE (epeg-20070223.tar.bz2) = 1262325
+MD5 (epeg-0.9.1.042.tar.bz2) = b6eada50c40f46810530fe85a67f558d
+SHA256 (epeg-0.9.1.042.tar.bz2) = e36ae9a19036db4742b05aef022418da1977ecda4b28b5cd40e42bec9f765759
+SIZE (epeg-0.9.1.042.tar.bz2) = 214226
diff --git a/graphics/epeg/pkg-plist b/graphics/epeg/pkg-plist
index 0d9dc2614b69..4fc22be40b4d 100644
--- a/graphics/epeg/pkg-plist
+++ b/graphics/epeg/pkg-plist
@@ -1,5 +1,4 @@
 bin/epeg
-bin/epeg-config
 include/Epeg.h
 lib/libepeg.a
 lib/libepeg.la
diff --git a/graphics/epsilon/Makefile b/graphics/epsilon/Makefile
index 7e4a000fec9b..67451e37fd26 100644
--- a/graphics/epsilon/Makefile
+++ b/graphics/epsilon/Makefile
@@ -6,19 +6,21 @@
 #
 
 PORTNAME=	epsilon
-PORTVERSION=	20070223
-PORTREVISION=	1
-PORTEPOCH=	1
+PORTVERSION=	0.3.0.012
+PORTREVISION=	0
+PORTEPOCH=	2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
 
 MAINTAINER=	stas@FreeBSD.org
-COMMENT=	A small, display independent, and quick thumbnailing library
+COMMENT=	A small, display independent and quick thumbnailing library
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget
-USE_EFL=	edje imlib2
+USE_EFL=	edje imlib2 ecore
+USE_EFL_ECORE=	file ipc
 USE_LDCONFIG=	yes
 
 OPTIONS=	PNG	"Enable PNG thumbnailer" on \
diff --git a/graphics/epsilon/distinfo b/graphics/epsilon/distinfo
index f701015354c4..57e695d410ce 100644
--- a/graphics/epsilon/distinfo
+++ b/graphics/epsilon/distinfo
@@ -1,3 +1,3 @@
-MD5 (epsilon-20070223.tar.bz2) = 6e7574727b3581c23f07b55fff215972
-SHA256 (epsilon-20070223.tar.bz2) = 6209539781617c59205266b121346db247c6c2af80a0f2036d78aa38d859896c
-SIZE (epsilon-20070223.tar.bz2) = 286825
+MD5 (epsilon-0.3.0.012.tar.bz2) = 915e8f29d1de2ec676bbfe3baefe5cdf
+SHA256 (epsilon-0.3.0.012.tar.bz2) = 2c2f794484140a98496be303c25c410bda437614755a7122ba86c292e2122e98
+SIZE (epsilon-0.3.0.012.tar.bz2) = 263800
diff --git a/graphics/epsilon/pkg-plist b/graphics/epsilon/pkg-plist
index d6500f9108ff..5341f548bc13 100644
--- a/graphics/epsilon/pkg-plist
+++ b/graphics/epsilon/pkg-plist
@@ -1,8 +1,8 @@
 bin/epsilon
-bin/epsilon-config
 bin/epsilon_thumb_test
 bin/epsilon_thumbd
 include/Epsilon.h
+include/Epsilon_Plugin.h
 include/Epsilon_Request.h
 %%XINE%%lib/epsilon/plugins/xine_thumbnailer.a
 %%XINE%%lib/epsilon/plugins/xine_thumbnailer.la
@@ -10,7 +10,7 @@ include/Epsilon_Request.h
 lib/libepsilon.a
 lib/libepsilon.la
 lib/libepsilon.so
-lib/libepsilon.so.0
+lib/libepsilon.so.3
 libdata/pkgconfig/epsilon.pc
 @dirrm lib/epsilon/plugins
 @dirrm lib/epsilon
diff --git a/graphics/esmart/Makefile b/graphics/esmart/Makefile
index 5bdf599430e7..2e94c6367301 100644
--- a/graphics/esmart/Makefile
+++ b/graphics/esmart/Makefile
@@ -6,20 +6,24 @@
 #
 
 PORTNAME=	esmart
-PORTVERSION=	20070223
-PORTREVISION=	1
-PORTEPOCH=	1
+PORTVERSION=	0.9.0.042
+PORTREVISION=	0
+PORTEPOCH=	2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Evas smart objects development libraries
 
+
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libltdl:15
+USE_AUTOTOOLS=	libltdl
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
-USE_EFL=	ecore evas epsilon edje
+USE_EFL=	ecore evas epsilon edje imlib2
+USE_EFL_ECORE=	x11 evas
+USE_EFL_EVAS_LOADERS=	png jpeg
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/esmart/distinfo b/graphics/esmart/distinfo
index 9b61df6dbba1..ea9a42ca751d 100644
--- a/graphics/esmart/distinfo
+++ b/graphics/esmart/distinfo
@@ -1,3 +1,3 @@
-MD5 (esmart-20070223.tar.bz2) = a1cb39975fc802d76add1c7689eecae9
-SHA256 (esmart-20070223.tar.bz2) = 4fb398fc2b5b7cf1ee6ffbe2c6c4f16c597ec7a8a16b0c3fd21810880195c40f
-SIZE (esmart-20070223.tar.bz2) = 291879
+MD5 (esmart-0.9.0.042.tar.bz2) = 62c1d73d2610da148b260efc36b1d03a
+SHA256 (esmart-0.9.0.042.tar.bz2) = 5455af7d34840d8ada8b13891903f3390aaf0bab0a4ea9ce808e907adad1424d
+SIZE (esmart-0.9.0.042.tar.bz2) = 295507
diff --git a/graphics/esmart/files/patch-src_bin_esmart_file_dialog_test.c b/graphics/esmart/files/patch-src_bin_esmart_file_dialog_test.c
deleted file mode 100644
index 21cf6a47410e..000000000000
--- a/graphics/esmart/files/patch-src_bin_esmart_file_dialog_test.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/bin/esmart_file_dialog_test.c.orig	Tue May  3 13:32:05 2005
-+++ src/bin/esmart_file_dialog_test.c	Tue Oct 18 17:31:25 2005
-@@ -8,6 +8,7 @@
-  * $ esmart_file_dialog_test /path/to/my_custom/theme.eet 
-  * to test a custom theme you've written for it
-  */
-+#include <stdio.h>
- #include <Ecore.h>
- #include <Edje.h>
- #include <Ecore_Evas.h>
diff --git a/graphics/esmart/pkg-plist b/graphics/esmart/pkg-plist
index 6c6f65d2b919..33942cc75a0d 100644
--- a/graphics/esmart/pkg-plist
+++ b/graphics/esmart/pkg-plist
@@ -1,12 +1,11 @@
-bin/esmart-config
-bin/esmart_file_dialog_test
+bin/esmart_text_entry_test
 bin/esmart_test
 include/Esmart/Esmart_Container.h
 include/Esmart/Esmart_Draggies.h
-include/Esmart/Esmart_File_Dialog.h
 include/Esmart/Esmart_Text_Entry.h
 include/Esmart/Esmart_Thumb.h
 include/Esmart/Esmart_Trans_X11.h
+include/Esmart/Esmart_Resize.h
 lib/esmart/layout/default.a
 lib/esmart/layout/default.la
 lib/esmart/layout/default.so
@@ -19,29 +18,40 @@ lib/esmart/layout/entice.so
 lib/libesmart_container.a
 lib/libesmart_container.la
 lib/libesmart_container.so
-lib/libesmart_container.so.0
+lib/libesmart_container.so.9
 lib/libesmart_draggies.a
 lib/libesmart_draggies.la
 lib/libesmart_draggies.so
-lib/libesmart_draggies.so.0
-lib/libesmart_file_dialog.a
-lib/libesmart_file_dialog.la
-lib/libesmart_file_dialog.so
-lib/libesmart_file_dialog.so.0
+lib/libesmart_draggies.so.9
+lib/libesmart_resize.a
+lib/libesmart_resize.la
+lib/libesmart_resize.so
+lib/libesmart_resize.so.9
 lib/libesmart_text_entry.a
 lib/libesmart_text_entry.la
 lib/libesmart_text_entry.so
-lib/libesmart_text_entry.so.0
+lib/libesmart_text_entry.so.9
 lib/libesmart_thumb.a
 lib/libesmart_thumb.la
 lib/libesmart_thumb.so
-lib/libesmart_thumb.so.0
+lib/libesmart_thumb.so.9
 lib/libesmart_trans_x11.a
 lib/libesmart_trans_x11.la
 lib/libesmart_trans_x11.so
-lib/libesmart_trans_x11.so.0
-libdata/pkgconfig/esmart.pc
+lib/libesmart_trans_x11.so.9
+libdata/pkgconfig/esmart_container.pc
+libdata/pkgconfig/esmart_draggies.pc
+libdata/pkgconfig/esmart_file_dialog.pc
+libdata/pkgconfig/esmart_resize.pc
+libdata/pkgconfig/esmart_text_entry.pc
+libdata/pkgconfig/esmart_textarea.pc
+libdata/pkgconfig/esmart_thumb.pc
+libdata/pkgconfig/esmart_trans_x11.pc
 %%DATADIR%%/esmart.png
+%%DATADIR%%/entry_cursor.png
+%%DATADIR%%/text_view_bg.png
+%%DATADIR%%/esmart_text_entry_test.edj
+%%DATADIR%%/text_view_over.png
 @dirrm %%DATADIR%%
 @dirrm lib/esmart/layout
 @dirrm lib/esmart
diff --git a/graphics/evas-core/Makefile b/graphics/evas-core/Makefile
new file mode 100644
index 000000000000..5690e2788cda
--- /dev/null
+++ b/graphics/evas-core/Makefile
@@ -0,0 +1,65 @@
+# New ports collection makefile for:	evas-core
+# Date created:		15 September 2007
+# Whom:			Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	core
+PORTVERSION=	0.9.9.042
+CATEGORIES=	graphics
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	evas-
+DISTNAME=	evas-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	A hardware accelerated canvas API (core library)
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_FREETYPE2=	yes
+USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+
+CONFIGURE_ARGS=	--disable-software-x11 \
+		--disable-software-16-x11 \
+		--disable-software-xcb \
+		--disable-directfb \
+		--disable-sdl \
+		--disable-buffer \
+		--disable-software-qtopia \
+		--disable-gl-x11 \
+		--disable-cairo-x11 \
+		--disable-xrender-x11 \
+		--disable-xrender-xcb \
+		--disable-glitz-x11 \
+		--disable-image-loader-gif \
+		--disable-image-loader-png \
+		--disable-image-loader-jpeg \
+		--disable-image-loader-eet \
+		--disable-image-loader-edb \
+		--disable-image-loader-tiff \
+		--disable-image-loader-xpm \
+		--disable-image-loader-svg
+
+OPTIONS=	FONTCONFIG	"Enable fontconfig support" on \
+		EET		"Enable EET font loader" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_FONTCONFIG)
+CONFIGURE_ARGS+=	--enable-fontconfig
+LIB_DEPENDS+=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
+.else
+CONFIGURE_ARGS+=	--disable-fontconfig
+.endif
+
+.if !defined(WITHOUT_EET)
+CONFIGURE_ARGS+=	--enable-font-loader-eet
+USE_EFL+=	eet
+.else
+CONFIGURE_ARGS+=	--disable-font-loader-eet
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/graphics/evas-core/distinfo b/graphics/evas-core/distinfo
new file mode 100644
index 000000000000..5e8e2bc542ac
--- /dev/null
+++ b/graphics/evas-core/distinfo
@@ -0,0 +1,3 @@
+MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
+SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
+SIZE (evas-0.9.9.042.tar.bz2) = 7373199
diff --git a/graphics/evas-core/files/patch-src_lib_canvas_evas_main.c b/graphics/evas-core/files/patch-src_lib_canvas_evas_main.c
new file mode 100644
index 000000000000..27b068acdb84
--- /dev/null
+++ b/graphics/evas-core/files/patch-src_lib_canvas_evas_main.c
@@ -0,0 +1,61 @@
+--- src/lib/canvas/evas_main.c.orig	2007-10-08 23:06:27.000000000 +0400
++++ src/lib/canvas/evas_main.c	2008-02-23 18:03:58.000000000 +0300
+@@ -702,58 +702,23 @@
+ {
+    Evas_List *methods = NULL;
+ 
+-   /* FIXME: get from modules - this is currently coded-in */
+-#ifdef BUILD_ENGINE_SOFTWARE_DDRAW
+    methods = evas_list_append(methods, strdup("software_ddraw"));
+-#endif
+-#ifdef BUILD_ENGINE_SOFTWARE_16_DDRAW
+    methods = evas_list_append(methods, strdup("software_16_ddraw"));
+-#endif
+-#ifdef BUILD_ENGINE_DIRECT3D
+    methods = evas_list_append(methods, strdup("direct3d"));
+-#endif
+-#ifdef BUILD_ENGINE_SOFTWARE_X11
+    methods = evas_list_append(methods, strdup("software_x11"));
+-#endif
+-#ifdef BUILD_ENGINE_XRENDER_X11
+    methods = evas_list_append(methods, strdup("xrender_x11"));
+-#endif
+-#ifdef BUILD_ENGINE_SOFTWARE_XCB
+    methods = evas_list_append(methods, strdup("software_xcb"));
+-#endif
+-#ifdef BUILD_ENGINE_XRENDER_XCB
+    methods = evas_list_append(methods, strdup("xrender_xcb"));
+-#endif
+-#ifdef BUILD_ENGINE_SOFTWARE_16_X11
+    methods = evas_list_append(methods, strdup("software_16_x11"));
+-#endif
+-#ifdef BUILD_ENGINE_GL_X11
+    methods = evas_list_append(methods, strdup("gl_x11"));
+-#endif
+-#ifdef BUILD_ENGINE_GL_GLEW
+    methods = evas_list_append(methods, strdup("gl_glew"));
+-#endif
+-#ifdef BUILD_ENGINE_CAIRO_X11
+    methods = evas_list_append(methods, strdup("cairo_x11"));
+-#endif
+-#ifdef BUILD_ENGINE_DIRECTFB
+    methods = evas_list_append(methods, strdup("directfb"));
+-#endif
+-#ifdef BUILD_ENGINE_FB
+    methods = evas_list_append(methods, strdup("fb"));
+-#endif
+-#ifdef BUILD_ENGINE_BUFFER
+    methods = evas_list_append(methods, strdup("buffer"));
+-#endif
+-#ifdef BUILD_ENGINE_SOFTWARE_WIN32_GDI
+    methods = evas_list_append(methods, strdup("software_win32_gdi"));
+-#endif
+-#ifdef BUILD_ENGINE_SOFTWARE_QTOPIA
+    methods = evas_list_append(methods, strdup("software_qtopia"));
+-#endif
+-#ifdef BUILD_ENGINE_SDL
+    methods = evas_list_append(methods, strdup("software_sdl"));
+-#endif
+ 
+    return methods;
+ }
diff --git a/graphics/evas-core/pkg-descr b/graphics/evas-core/pkg-descr
new file mode 100644
index 000000000000..e525449b6c61
--- /dev/null
+++ b/graphics/evas-core/pkg-descr
@@ -0,0 +1,6 @@
+A hardware-accelerated canvas API for X-Windows that can draw anti-aliased
+text, smooth super and sub-sampled images, alpha-blend, as well as drop down to
+using normal X11 primitives such as pixmaps, lines and rectangles for speed if
+your CPU or graphics hardware is too slow.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Evas/
diff --git a/graphics/evas-core/pkg-plist b/graphics/evas-core/pkg-plist
new file mode 100644
index 000000000000..721e67856696
--- /dev/null
+++ b/graphics/evas-core/pkg-plist
@@ -0,0 +1,14 @@
+include/Evas.h
+lib/libevas.a
+lib/libevas.la
+lib/libevas.so
+lib/libevas.so.9
+lib/evas/modules/engines/software_generic/%%E17_ARCH%%/module.a
+lib/evas/modules/engines/software_generic/%%E17_ARCH%%/module.la
+lib/evas/modules/engines/software_generic/%%E17_ARCH%%/module.so
+libdata/pkgconfig/evas.pc
+@dirrm lib/evas/modules/engines/software_generic/%%E17_ARCH%%
+@dirrm lib/evas/modules/engines/software_generic
+@dirrm lib/evas/modules/engines
+@dirrm lib/evas/modules
+@dirrm lib/evas
diff --git a/graphics/evas-engine-buffer/Makefile b/graphics/evas-engine-buffer/Makefile
new file mode 100644
index 000000000000..eb925adb77c8
--- /dev/null
+++ b/graphics/evas-engine-buffer/Makefile
@@ -0,0 +1,59 @@
+# New ports collection makefile for:	evas-engine-buffer
+# Date created:		15 September 2007
+# Whom:			Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	engine-buffer
+PORTVERSION=	0.9.9.042
+CATEGORIES=	graphics
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	evas-
+DISTNAME=	evas-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	A hardware accelerated canvas API (buffer engine)
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_FREETYPE2=	yes
+USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_EFL=	evas
+BUILD_WRKSRC=	${WRKSRC}/src/modules/engines/buffer
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+CONFIGURE_ARGS=	--disable-software-x11 \
+		--disable-software-16-x11 \
+		--disable-software-xcb \
+		--disable-directfb \
+		--disable-sdl \
+		--enable-buffer \
+		--disable-software-qtopia \
+		--disable-gl-x11 \
+		--disable-cairo-x11 \
+		--disable-xrender-x11 \
+		--disable-xrender-xcb \
+		--disable-glitz-x11 \
+		--disable-image-loader-gif \
+		--disable-image-loader-png \
+		--disable-image-loader-jpeg \
+		--disable-image-loader-eet \
+		--disable-image-loader-edb \
+		--disable-image-loader-tiff \
+		--disable-image-loader-xpm \
+		--disable-image-loader-svg
+
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e 's,\$$\(top_builddir\)/src/lib/\.libs,${LOCALBASE}/lib,' \
+		-e 's,\$$\(top_builddir\)/src/lib/libevas\.la,-levas,' \
+		${BUILD_WRKSRC}/Makefile.in
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/evas-software-buffer.pc \
+		${PREFIX}/libdata/pkgconfig/
+
+.include <bsd.port.mk>
diff --git a/graphics/evas-engine-buffer/distinfo b/graphics/evas-engine-buffer/distinfo
new file mode 100644
index 000000000000..5e8e2bc542ac
--- /dev/null
+++ b/graphics/evas-engine-buffer/distinfo
@@ -0,0 +1,3 @@
+MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
+SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
+SIZE (evas-0.9.9.042.tar.bz2) = 7373199
diff --git a/graphics/evas-engine-buffer/pkg-descr b/graphics/evas-engine-buffer/pkg-descr
new file mode 100644
index 000000000000..e525449b6c61
--- /dev/null
+++ b/graphics/evas-engine-buffer/pkg-descr
@@ -0,0 +1,6 @@
+A hardware-accelerated canvas API for X-Windows that can draw anti-aliased
+text, smooth super and sub-sampled images, alpha-blend, as well as drop down to
+using normal X11 primitives such as pixmaps, lines and rectangles for speed if
+your CPU or graphics hardware is too slow.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Evas/
diff --git a/graphics/evas-engine-buffer/pkg-plist b/graphics/evas-engine-buffer/pkg-plist
new file mode 100644
index 000000000000..51cff9a56868
--- /dev/null
+++ b/graphics/evas-engine-buffer/pkg-plist
@@ -0,0 +1,10 @@
+include/Evas_Engine_Buffer.h
+lib/evas/modules/engines/buffer/%%E17_ARCH%%/module.a
+lib/evas/modules/engines/buffer/%%E17_ARCH%%/module.la
+lib/evas/modules/engines/buffer/%%E17_ARCH%%/module.so
+libdata/pkgconfig/evas-software-buffer.pc
+@dirrm lib/evas/modules/engines/buffer/%%E17_ARCH%%
+@dirrm lib/evas/modules/engines/buffer
+@dirrmtry lib/evas/modules/engines
+@dirrmtry lib/evas/modules
+@dirrmtry lib/evas
diff --git a/graphics/evas-engine-opengl/Makefile b/graphics/evas-engine-opengl/Makefile
new file mode 100644
index 000000000000..262e345961a6
--- /dev/null
+++ b/graphics/evas-engine-opengl/Makefile
@@ -0,0 +1,66 @@
+# New ports collection makefile for:	evas-engine-opengl
+# Date created:		15 September 2007
+# Whom:			Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	engine-opengl
+PORTVERSION=	0.9.9.042
+CATEGORIES=	graphics
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	evas-
+DISTNAME=	evas-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	A hardware accelerated canvas API (OpenGL engine)
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_FREETYPE2=	yes
+USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_EFL=	evas
+USE_XORG=	x11 xext
+USE_GL=		gl glu
+BUILD_WRKSRC=	${WRKSRC}/src/modules/engines/gl_x11
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+CONFIGURE_ARGS=	--disable-software-x11 \
+		--disable-software-16-x11 \
+		--disable-software-xcb \
+		--disable-directfb \
+		--disable-sdl \
+		--disable-buffer \
+		--disable-software-qtopia \
+		--enable-gl-x11 \
+		--disable-cairo-x11 \
+		--disable-xrender-x11 \
+		--disable-xrender-xcb \
+		--disable-glitz-x11 \
+		--disable-image-loader-gif \
+		--disable-image-loader-png \
+		--disable-image-loader-jpeg \
+		--disable-image-loader-eet \
+		--disable-image-loader-edb \
+		--disable-image-loader-tiff \
+		--disable-image-loader-xpm \
+		--disable-image-loader-svg
+
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e 's,\$$\(top_builddir\)/src/lib/\.libs,${LOCALBASE}/lib,' \
+		-e 's,\$$\(top_builddir\)/src/lib/libevas\.la,-levas,' \
+		${BUILD_WRKSRC}/Makefile.in \
+		${WRKSRC}/src/modules/engines/gl_common/Makefile.in
+
+pre-build:
+	@(cd ${WRKSRC}/src/modules/engines/gl_common; ${SETENV} ${MAKE_ENV} \
+		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/evas-opengl-x11.pc \
+		${PREFIX}/libdata/pkgconfig/
+
+.include <bsd.port.mk>
diff --git a/graphics/evas-engine-opengl/distinfo b/graphics/evas-engine-opengl/distinfo
new file mode 100644
index 000000000000..5e8e2bc542ac
--- /dev/null
+++ b/graphics/evas-engine-opengl/distinfo
@@ -0,0 +1,3 @@
+MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
+SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
+SIZE (evas-0.9.9.042.tar.bz2) = 7373199
diff --git a/graphics/evas-engine-opengl/pkg-descr b/graphics/evas-engine-opengl/pkg-descr
new file mode 100644
index 000000000000..e525449b6c61
--- /dev/null
+++ b/graphics/evas-engine-opengl/pkg-descr
@@ -0,0 +1,6 @@
+A hardware-accelerated canvas API for X-Windows that can draw anti-aliased
+text, smooth super and sub-sampled images, alpha-blend, as well as drop down to
+using normal X11 primitives such as pixmaps, lines and rectangles for speed if
+your CPU or graphics hardware is too slow.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Evas/
diff --git a/graphics/evas-engine-opengl/pkg-plist b/graphics/evas-engine-opengl/pkg-plist
new file mode 100644
index 000000000000..9280f3414b1e
--- /dev/null
+++ b/graphics/evas-engine-opengl/pkg-plist
@@ -0,0 +1,10 @@
+include/Evas_Engine_GL_X11.h
+lib/evas/modules/engines/gl_x11/%%E17_ARCH%%/module.a
+lib/evas/modules/engines/gl_x11/%%E17_ARCH%%/module.la
+lib/evas/modules/engines/gl_x11/%%E17_ARCH%%/module.so
+libdata/pkgconfig/evas-opengl-x11.pc
+@dirrm lib/evas/modules/engines/gl_x11/%%E17_ARCH%%
+@dirrm lib/evas/modules/engines/gl_x11
+@dirrmtry lib/evas/modules/engines
+@dirrmtry lib/evas/modules
+@dirrmtry lib/evas
diff --git a/graphics/evas-engine-sdl/Makefile b/graphics/evas-engine-sdl/Makefile
new file mode 100644
index 000000000000..8b20ff8d253e
--- /dev/null
+++ b/graphics/evas-engine-sdl/Makefile
@@ -0,0 +1,60 @@
+# New ports collection makefile for:	evas-engine-sdl
+# Date created:		15 September 2007
+# Whom:			Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	engine-sdl
+PORTVERSION=	0.9.9.042
+CATEGORIES=	graphics
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	evas-
+DISTNAME=	evas-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	A hardware accelerated canvas API (SDL engine)
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_FREETYPE2=	yes
+USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_EFL=	evas
+USE_SDL=	sdl
+BUILD_WRKSRC=	${WRKSRC}/src/modules/engines/software_sdl
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+CONFIGURE_ARGS=	--disable-software-x11 \
+		--disable-software-16-x11 \
+		--disable-software-xcb \
+		--disable-directfb \
+		--enable-sdl \
+		--disable-buffer \
+		--disable-software-qtopia \
+		--disable-gl-x11 \
+		--disable-cairo-x11 \
+		--disable-xrender-x11 \
+		--disable-xrender-xcb \
+		--disable-glitz-x11 \
+		--disable-image-loader-gif \
+		--disable-image-loader-png \
+		--disable-image-loader-jpeg \
+		--disable-image-loader-eet \
+		--disable-image-loader-edb \
+		--disable-image-loader-tiff \
+		--disable-image-loader-xpm \
+		--disable-image-loader-svg
+
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e 's,\$$\(top_builddir\)/src/lib/\.libs,${LOCALBASE}/lib,' \
+		-e 's,\$$\(top_builddir\)/src/lib/libevas\.la,-levas,' \
+		${BUILD_WRKSRC}/Makefile.in
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/evas-software-sdl.pc \
+		${PREFIX}/libdata/pkgconfig/
+
+.include <bsd.port.mk>
diff --git a/graphics/evas-engine-sdl/distinfo b/graphics/evas-engine-sdl/distinfo
new file mode 100644
index 000000000000..5e8e2bc542ac
--- /dev/null
+++ b/graphics/evas-engine-sdl/distinfo
@@ -0,0 +1,3 @@
+MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
+SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
+SIZE (evas-0.9.9.042.tar.bz2) = 7373199
diff --git a/graphics/evas-engine-sdl/pkg-descr b/graphics/evas-engine-sdl/pkg-descr
new file mode 100644
index 000000000000..e525449b6c61
--- /dev/null
+++ b/graphics/evas-engine-sdl/pkg-descr
@@ -0,0 +1,6 @@
+A hardware-accelerated canvas API for X-Windows that can draw anti-aliased
+text, smooth super and sub-sampled images, alpha-blend, as well as drop down to
+using normal X11 primitives such as pixmaps, lines and rectangles for speed if
+your CPU or graphics hardware is too slow.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Evas/
diff --git a/graphics/evas-engine-sdl/pkg-plist b/graphics/evas-engine-sdl/pkg-plist
new file mode 100644
index 000000000000..d4e48bc99e8b
--- /dev/null
+++ b/graphics/evas-engine-sdl/pkg-plist
@@ -0,0 +1,10 @@
+include/Evas_Engine_SDL.h
+lib/evas/modules/engines/software_sdl/%%E17_ARCH%%/module.a
+lib/evas/modules/engines/software_sdl/%%E17_ARCH%%/module.la
+lib/evas/modules/engines/software_sdl/%%E17_ARCH%%/module.so
+libdata/pkgconfig/evas-software-sdl.pc
+@dirrm lib/evas/modules/engines/software_sdl/%%E17_ARCH%%
+@dirrm lib/evas/modules/engines/software_sdl
+@dirrmtry lib/evas/modules/engines
+@dirrmtry lib/evas/modules
+@dirrmtry lib/evas
diff --git a/graphics/evas-engine-x11/Makefile b/graphics/evas-engine-x11/Makefile
new file mode 100644
index 000000000000..8e9d45411569
--- /dev/null
+++ b/graphics/evas-engine-x11/Makefile
@@ -0,0 +1,60 @@
+# New ports collection makefile for:	evas-engine-x11
+# Date created:		15 September 2007
+# Whom:			Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	engine-x11
+PORTVERSION=	0.9.9.042
+CATEGORIES=	graphics
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	evas-
+DISTNAME=	evas-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	A hardware accelerated canvas API (X11 engine)
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_FREETYPE2=	yes
+USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_EFL=	evas
+USE_XORG=	x11 xext
+BUILD_WRKSRC=	${WRKSRC}/src/modules/engines/software_x11
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+CONFIGURE_ARGS=	--enable-software-x11 \
+		--disable-software-16-x11 \
+		--disable-software-xcb \
+		--disable-directfb \
+		--disable-sdl \
+		--disable-buffer \
+		--disable-software-qtopia \
+		--disable-gl-x11 \
+		--disable-cairo-x11 \
+		--disable-xrender-x11 \
+		--disable-xrender-xcb \
+		--disable-glitz-x11 \
+		--disable-image-loader-gif \
+		--disable-image-loader-png \
+		--disable-image-loader-jpeg \
+		--disable-image-loader-eet \
+		--disable-image-loader-edb \
+		--disable-image-loader-tiff \
+		--disable-image-loader-xpm \
+		--disable-image-loader-svg
+
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e 's,\$$\(top_builddir\)/src/lib/\.libs,${LOCALBASE}/lib,' \
+		-e 's,\$$\(top_builddir\)/src/lib/libevas\.la,-levas,' \
+		${BUILD_WRKSRC}/Makefile.in
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/evas-software-x11.pc \
+		${PREFIX}/libdata/pkgconfig/
+
+.include <bsd.port.mk>
diff --git a/graphics/evas-engine-x11/distinfo b/graphics/evas-engine-x11/distinfo
new file mode 100644
index 000000000000..5e8e2bc542ac
--- /dev/null
+++ b/graphics/evas-engine-x11/distinfo
@@ -0,0 +1,3 @@
+MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
+SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
+SIZE (evas-0.9.9.042.tar.bz2) = 7373199
diff --git a/graphics/evas-engine-x11/pkg-descr b/graphics/evas-engine-x11/pkg-descr
new file mode 100644
index 000000000000..e525449b6c61
--- /dev/null
+++ b/graphics/evas-engine-x11/pkg-descr
@@ -0,0 +1,6 @@
+A hardware-accelerated canvas API for X-Windows that can draw anti-aliased
+text, smooth super and sub-sampled images, alpha-blend, as well as drop down to
+using normal X11 primitives such as pixmaps, lines and rectangles for speed if
+your CPU or graphics hardware is too slow.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Evas/
diff --git a/graphics/evas-engine-x11/pkg-plist b/graphics/evas-engine-x11/pkg-plist
new file mode 100644
index 000000000000..24851a75542c
--- /dev/null
+++ b/graphics/evas-engine-x11/pkg-plist
@@ -0,0 +1,10 @@
+include/Evas_Engine_Software_X11.h
+lib/evas/modules/engines/software_x11/%%E17_ARCH%%/module.a
+lib/evas/modules/engines/software_x11/%%E17_ARCH%%/module.la
+lib/evas/modules/engines/software_x11/%%E17_ARCH%%/module.so
+libdata/pkgconfig/evas-software-x11.pc
+@dirrm lib/evas/modules/engines/software_x11/%%E17_ARCH%%
+@dirrm lib/evas/modules/engines/software_x11
+@dirrmtry lib/evas/modules/engines
+@dirrmtry lib/evas/modules
+@dirrmtry lib/evas
diff --git a/graphics/evas-engine-xrender/Makefile b/graphics/evas-engine-xrender/Makefile
new file mode 100644
index 000000000000..c8388cc9cac7
--- /dev/null
+++ b/graphics/evas-engine-xrender/Makefile
@@ -0,0 +1,60 @@
+# New ports collection makefile for:	evas-engine-xrender
+# Date created:		15 September 2007
+# Whom:			Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	engine-xrender
+PORTVERSION=	0.9.9.042
+CATEGORIES=	graphics
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	evas-
+DISTNAME=	evas-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	A hardware accelerated canvas API (XRender engine)
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_FREETYPE2=	yes
+USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_EFL=	evas
+USE_XORG=	x11 xrender xext
+BUILD_WRKSRC=	${WRKSRC}/src/modules/engines/xrender_x11
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+CONFIGURE_ARGS=	--disable-software-x11 \
+		--disable-software-16-x11 \
+		--disable-software-xcb \
+		--disable-directfb \
+		--disable-sdl \
+		--disable-buffer \
+		--disable-software-qtopia \
+		--disable-gl-x11 \
+		--disable-cairo-x11 \
+		--enable-xrender-x11 \
+		--disable-xrender-xcb \
+		--disable-glitz-x11 \
+		--disable-image-loader-gif \
+		--disable-image-loader-png \
+		--disable-image-loader-jpeg \
+		--disable-image-loader-eet \
+		--disable-image-loader-edb \
+		--disable-image-loader-tiff \
+		--disable-image-loader-xpm \
+		--disable-image-loader-svg
+
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e 's,\$$\(top_builddir\)/src/lib/\.libs,${LOCALBASE}/lib,' \
+		-e 's,\$$\(top_builddir\)/src/lib/libevas\.la,-levas,' \
+		${BUILD_WRKSRC}/Makefile.in
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/evas-xrender-x11.pc \
+		${PREFIX}/libdata/pkgconfig/
+
+.include <bsd.port.mk>
diff --git a/graphics/evas-engine-xrender/distinfo b/graphics/evas-engine-xrender/distinfo
new file mode 100644
index 000000000000..5e8e2bc542ac
--- /dev/null
+++ b/graphics/evas-engine-xrender/distinfo
@@ -0,0 +1,3 @@
+MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
+SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
+SIZE (evas-0.9.9.042.tar.bz2) = 7373199
diff --git a/graphics/evas-engine-xrender/pkg-descr b/graphics/evas-engine-xrender/pkg-descr
new file mode 100644
index 000000000000..e525449b6c61
--- /dev/null
+++ b/graphics/evas-engine-xrender/pkg-descr
@@ -0,0 +1,6 @@
+A hardware-accelerated canvas API for X-Windows that can draw anti-aliased
+text, smooth super and sub-sampled images, alpha-blend, as well as drop down to
+using normal X11 primitives such as pixmaps, lines and rectangles for speed if
+your CPU or graphics hardware is too slow.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Evas/
diff --git a/graphics/evas-engine-xrender/pkg-plist b/graphics/evas-engine-xrender/pkg-plist
new file mode 100644
index 000000000000..367f934f5d4b
--- /dev/null
+++ b/graphics/evas-engine-xrender/pkg-plist
@@ -0,0 +1,10 @@
+include/Evas_Engine_XRender_X11.h
+lib/evas/modules/engines/xrender_x11/%%E17_ARCH%%/module.a
+lib/evas/modules/engines/xrender_x11/%%E17_ARCH%%/module.la
+lib/evas/modules/engines/xrender_x11/%%E17_ARCH%%/module.so
+libdata/pkgconfig/evas-xrender-x11.pc
+@dirrm lib/evas/modules/engines/xrender_x11/%%E17_ARCH%%
+@dirrm lib/evas/modules/engines/xrender_x11
+@dirrmtry lib/evas/modules/engines
+@dirrmtry lib/evas/modules
+@dirrmtry lib/evas
diff --git a/graphics/evas-loader-edb/Makefile b/graphics/evas-loader-edb/Makefile
new file mode 100644
index 000000000000..71e31b25bf21
--- /dev/null
+++ b/graphics/evas-loader-edb/Makefile
@@ -0,0 +1,62 @@
+# New ports collection makefile for:	evas-loader-edb
+# Date created:		15 September 2007
+# Whom:			Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	loader-edb
+PORTVERSION=	0.9.9.042
+CATEGORIES=	graphics
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	evas-
+DISTNAME=	evas-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	A hardware accelerated canvas API (edb engine)
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_FREETYPE2=	yes
+USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_EFL=	evas edb
+
+MAKEDIRS=	${WRKSRC}/src/modules/loaders/edb \
+		${WRKSRC}/src/modules/savers/edb
+
+CONFIGURE_ARGS=	--disable-software-x11 \
+		--disable-software-16-x11 \
+		--disable-software-xcb \
+		--disable-directfb \
+		--disable-sdl \
+		--disable-buffer \
+		--disable-software-qtopia \
+		--disable-gl-x11 \
+		--disable-cairo-x11 \
+		--disable-xrender-x11 \
+		--disable-xrender-xcb \
+		--disable-glitz-x11 \
+		--disable-image-loader-gif \
+		--disable-image-loader-png \
+		--disable-image-loader-jpeg \
+		--disable-image-loader-eet \
+		--enable-image-loader-edb \
+		--disable-image-loader-tiff \
+		--disable-image-loader-xpm \
+		--disable-image-loader-svg
+
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e 's,\$$\(top_builddir\)/src/lib/\.libs,${LOCALBASE}/lib,' \
+		-e 's,\$$\(top_builddir\)/src/lib/libevas\.la,-levas,' \
+		${MAKEDIRS:S,$,/Makefile.in,}
+
+do-build:
+	@(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
+
+do-install:
+	@(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
+
+.include <bsd.port.mk>
diff --git a/graphics/evas-loader-edb/distinfo b/graphics/evas-loader-edb/distinfo
new file mode 100644
index 000000000000..5e8e2bc542ac
--- /dev/null
+++ b/graphics/evas-loader-edb/distinfo
@@ -0,0 +1,3 @@
+MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
+SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
+SIZE (evas-0.9.9.042.tar.bz2) = 7373199
diff --git a/graphics/evas-loader-edb/pkg-descr b/graphics/evas-loader-edb/pkg-descr
new file mode 100644
index 000000000000..e525449b6c61
--- /dev/null
+++ b/graphics/evas-loader-edb/pkg-descr
@@ -0,0 +1,6 @@
+A hardware-accelerated canvas API for X-Windows that can draw anti-aliased
+text, smooth super and sub-sampled images, alpha-blend, as well as drop down to
+using normal X11 primitives such as pixmaps, lines and rectangles for speed if
+your CPU or graphics hardware is too slow.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Evas/
diff --git a/graphics/evas-loader-edb/pkg-plist b/graphics/evas-loader-edb/pkg-plist
new file mode 100644
index 000000000000..5720df50c884
--- /dev/null
+++ b/graphics/evas-loader-edb/pkg-plist
@@ -0,0 +1,14 @@
+lib/evas/modules/loaders/edb/%%E17_ARCH%%/module.a
+lib/evas/modules/loaders/edb/%%E17_ARCH%%/module.la
+lib/evas/modules/loaders/edb/%%E17_ARCH%%/module.so
+lib/evas/modules/savers/edb/%%E17_ARCH%%/module.a
+lib/evas/modules/savers/edb/%%E17_ARCH%%/module.la
+lib/evas/modules/savers/edb/%%E17_ARCH%%/module.so
+@dirrm lib/evas/modules/loaders/edb/%%E17_ARCH%%
+@dirrm lib/evas/modules/loaders/edb
+@dirrm lib/evas/modules/savers/edb/%%E17_ARCH%%
+@dirrm lib/evas/modules/savers/edb
+@dirrmtry lib/evas/modules/savers
+@dirrmtry lib/evas/modules/loaders
+@dirrmtry lib/evas/modules
+@dirrmtry lib/evas
diff --git a/graphics/evas-loader-eet/Makefile b/graphics/evas-loader-eet/Makefile
new file mode 100644
index 000000000000..d0da170c7a35
--- /dev/null
+++ b/graphics/evas-loader-eet/Makefile
@@ -0,0 +1,62 @@
+# New ports collection makefile for:	evas-loader-eet
+# Date created:		15 September 2007
+# Whom:			Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	loader-eet
+PORTVERSION=	0.9.9.042
+CATEGORIES=	graphics
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	evas-
+DISTNAME=	evas-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	A hardware accelerated canvas API (EET engine)
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_FREETYPE2=	yes
+USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_EFL=	evas eet
+
+MAKEDIRS=	${WRKSRC}/src/modules/loaders/eet \
+		${WRKSRC}/src/modules/savers/eet
+
+CONFIGURE_ARGS=	--disable-software-x11 \
+		--disable-software-16-x11 \
+		--disable-software-xcb \
+		--disable-directfb \
+		--disable-sdl \
+		--disable-buffer \
+		--disable-software-qtopia \
+		--disable-gl-x11 \
+		--disable-cairo-x11 \
+		--disable-xrender-x11 \
+		--disable-xrender-xcb \
+		--disable-glitz-x11 \
+		--disable-image-loader-gif \
+		--disable-image-loader-png \
+		--disable-image-loader-jpeg \
+		--enable-image-loader-eet \
+		--disable-image-loader-edb \
+		--disable-image-loader-tiff \
+		--disable-image-loader-xpm \
+		--disable-image-loader-svg
+
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e 's,\$$\(top_builddir\)/src/lib/\.libs,${LOCALBASE}/lib,' \
+		-e 's,\$$\(top_builddir\)/src/lib/libevas\.la,-levas,' \
+		${MAKEDIRS:S,$,/Makefile.in,}
+
+do-build:
+	@(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
+
+do-install:
+	@(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
+
+.include <bsd.port.mk>
diff --git a/graphics/evas-loader-eet/distinfo b/graphics/evas-loader-eet/distinfo
new file mode 100644
index 000000000000..5e8e2bc542ac
--- /dev/null
+++ b/graphics/evas-loader-eet/distinfo
@@ -0,0 +1,3 @@
+MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
+SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
+SIZE (evas-0.9.9.042.tar.bz2) = 7373199
diff --git a/graphics/evas-loader-eet/pkg-descr b/graphics/evas-loader-eet/pkg-descr
new file mode 100644
index 000000000000..e525449b6c61
--- /dev/null
+++ b/graphics/evas-loader-eet/pkg-descr
@@ -0,0 +1,6 @@
+A hardware-accelerated canvas API for X-Windows that can draw anti-aliased
+text, smooth super and sub-sampled images, alpha-blend, as well as drop down to
+using normal X11 primitives such as pixmaps, lines and rectangles for speed if
+your CPU or graphics hardware is too slow.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Evas/
diff --git a/graphics/evas-loader-eet/pkg-plist b/graphics/evas-loader-eet/pkg-plist
new file mode 100644
index 000000000000..71d8ae1eddc3
--- /dev/null
+++ b/graphics/evas-loader-eet/pkg-plist
@@ -0,0 +1,14 @@
+lib/evas/modules/loaders/eet/%%E17_ARCH%%/module.a
+lib/evas/modules/loaders/eet/%%E17_ARCH%%/module.la
+lib/evas/modules/loaders/eet/%%E17_ARCH%%/module.so
+lib/evas/modules/savers/eet/%%E17_ARCH%%/module.a
+lib/evas/modules/savers/eet/%%E17_ARCH%%/module.la
+lib/evas/modules/savers/eet/%%E17_ARCH%%/module.so
+@dirrm lib/evas/modules/loaders/eet/%%E17_ARCH%%
+@dirrm lib/evas/modules/loaders/eet
+@dirrm lib/evas/modules/savers/eet/%%E17_ARCH%%
+@dirrm lib/evas/modules/savers/eet
+@dirrmtry lib/evas/modules/savers
+@dirrmtry lib/evas/modules/loaders
+@dirrmtry lib/evas/modules
+@dirrmtry lib/evas
diff --git a/graphics/evas-loader-gif/Makefile b/graphics/evas-loader-gif/Makefile
new file mode 100644
index 000000000000..2f979c862f54
--- /dev/null
+++ b/graphics/evas-loader-gif/Makefile
@@ -0,0 +1,63 @@
+# New ports collection makefile for:	evas-loader-gif
+# Date created:		15 September 2007
+# Whom:			Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	loader-gif
+PORTVERSION=	0.9.9.042
+CATEGORIES=	graphics
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	evas-
+DISTNAME=	evas-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	A hardware accelerated canvas API (GIF engine)
+
+LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_FREETYPE2=	yes
+USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_EFL=	evas
+
+MAKEDIRS=	${WRKSRC}/src/modules/loaders/gif
+
+CONFIGURE_ARGS=	--disable-software-x11 \
+		--disable-software-16-x11 \
+		--disable-software-xcb \
+		--disable-directfb \
+		--disable-sdl \
+		--disable-buffer \
+		--disable-software-qtopia \
+		--disable-gl-x11 \
+		--disable-cairo-x11 \
+		--disable-xrender-x11 \
+		--disable-xrender-xcb \
+		--disable-glitz-x11 \
+		--enable-image-loader-gif \
+		--disable-image-loader-png \
+		--disable-image-loader-jpeg \
+		--disable-image-loader-eet \
+		--disable-image-loader-edb \
+		--disable-image-loader-tiff \
+		--disable-image-loader-xpm \
+		--disable-image-loader-svg
+
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e 's,\$$\(top_builddir\)/src/lib/\.libs,${LOCALBASE}/lib,' \
+		-e 's,\$$\(top_builddir\)/src/lib/libevas\.la,-levas,' \
+		${MAKEDIRS:S,$,/Makefile.in,}
+
+do-build:
+	@(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
+
+do-install:
+	@(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
+
+.include <bsd.port.mk>
diff --git a/graphics/evas-loader-gif/distinfo b/graphics/evas-loader-gif/distinfo
new file mode 100644
index 000000000000..5e8e2bc542ac
--- /dev/null
+++ b/graphics/evas-loader-gif/distinfo
@@ -0,0 +1,3 @@
+MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
+SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
+SIZE (evas-0.9.9.042.tar.bz2) = 7373199
diff --git a/graphics/evas-loader-gif/pkg-descr b/graphics/evas-loader-gif/pkg-descr
new file mode 100644
index 000000000000..e525449b6c61
--- /dev/null
+++ b/graphics/evas-loader-gif/pkg-descr
@@ -0,0 +1,6 @@
+A hardware-accelerated canvas API for X-Windows that can draw anti-aliased
+text, smooth super and sub-sampled images, alpha-blend, as well as drop down to
+using normal X11 primitives such as pixmaps, lines and rectangles for speed if
+your CPU or graphics hardware is too slow.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Evas/
diff --git a/graphics/evas-loader-gif/pkg-plist b/graphics/evas-loader-gif/pkg-plist
new file mode 100644
index 000000000000..3c7863fd7ac2
--- /dev/null
+++ b/graphics/evas-loader-gif/pkg-plist
@@ -0,0 +1,8 @@
+lib/evas/modules/loaders/gif/%%E17_ARCH%%/module.a
+lib/evas/modules/loaders/gif/%%E17_ARCH%%/module.la
+lib/evas/modules/loaders/gif/%%E17_ARCH%%/module.so
+@dirrm lib/evas/modules/loaders/gif/%%E17_ARCH%%
+@dirrm lib/evas/modules/loaders/gif
+@dirrmtry lib/evas/modules/loaders
+@dirrmtry lib/evas/modules
+@dirrmtry lib/evas
diff --git a/graphics/evas-loader-jpeg/Makefile b/graphics/evas-loader-jpeg/Makefile
new file mode 100644
index 000000000000..9ad8889610ad
--- /dev/null
+++ b/graphics/evas-loader-jpeg/Makefile
@@ -0,0 +1,64 @@
+# New ports collection makefile for:	evas-loader-jpeg
+# Date created:		15 September 2007
+# Whom:			Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	loader-jpeg
+PORTVERSION=	0.9.9.042
+CATEGORIES=	graphics
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	evas-
+DISTNAME=	evas-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	A hardware accelerated canvas API (JPEG engine)
+
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_FREETYPE2=	yes
+USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_EFL=	evas
+
+MAKEDIRS=	${WRKSRC}/src/modules/loaders/jpeg \
+		${WRKSRC}/src/modules/savers/jpeg
+
+CONFIGURE_ARGS=	--disable-software-x11 \
+		--disable-software-16-x11 \
+		--disable-software-xcb \
+		--disable-directfb \
+		--disable-sdl \
+		--disable-buffer \
+		--disable-software-qtopia \
+		--disable-gl-x11 \
+		--disable-cairo-x11 \
+		--disable-xrender-x11 \
+		--disable-xrender-xcb \
+		--disable-glitz-x11 \
+		--disable-image-loader-gif \
+		--disable-image-loader-png \
+		--enable-image-loader-jpeg \
+		--disable-image-loader-eet \
+		--disable-image-loader-edb \
+		--disable-image-loader-tiff \
+		--disable-image-loader-xpm \
+		--disable-image-loader-svg
+
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e 's,\$$\(top_builddir\)/src/lib/\.libs,${LOCALBASE}/lib,' \
+		-e 's,\$$\(top_builddir\)/src/lib/libevas\.la,-levas,' \
+		${MAKEDIRS:S,$,/Makefile.in,}
+
+do-build:
+	@(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
+
+do-install:
+	@(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
+
+.include <bsd.port.mk>
diff --git a/graphics/evas-loader-jpeg/distinfo b/graphics/evas-loader-jpeg/distinfo
new file mode 100644
index 000000000000..5e8e2bc542ac
--- /dev/null
+++ b/graphics/evas-loader-jpeg/distinfo
@@ -0,0 +1,3 @@
+MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
+SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
+SIZE (evas-0.9.9.042.tar.bz2) = 7373199
diff --git a/graphics/evas-loader-jpeg/pkg-descr b/graphics/evas-loader-jpeg/pkg-descr
new file mode 100644
index 000000000000..e525449b6c61
--- /dev/null
+++ b/graphics/evas-loader-jpeg/pkg-descr
@@ -0,0 +1,6 @@
+A hardware-accelerated canvas API for X-Windows that can draw anti-aliased
+text, smooth super and sub-sampled images, alpha-blend, as well as drop down to
+using normal X11 primitives such as pixmaps, lines and rectangles for speed if
+your CPU or graphics hardware is too slow.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Evas/
diff --git a/graphics/evas-loader-jpeg/pkg-plist b/graphics/evas-loader-jpeg/pkg-plist
new file mode 100644
index 000000000000..34e0bea43f96
--- /dev/null
+++ b/graphics/evas-loader-jpeg/pkg-plist
@@ -0,0 +1,14 @@
+lib/evas/modules/loaders/jpeg/%%E17_ARCH%%/module.a
+lib/evas/modules/loaders/jpeg/%%E17_ARCH%%/module.la
+lib/evas/modules/loaders/jpeg/%%E17_ARCH%%/module.so
+lib/evas/modules/savers/jpeg/%%E17_ARCH%%/module.a
+lib/evas/modules/savers/jpeg/%%E17_ARCH%%/module.la
+lib/evas/modules/savers/jpeg/%%E17_ARCH%%/module.so
+@dirrm lib/evas/modules/loaders/jpeg/%%E17_ARCH%%
+@dirrm lib/evas/modules/loaders/jpeg
+@dirrm lib/evas/modules/savers/jpeg/%%E17_ARCH%%
+@dirrm lib/evas/modules/savers/jpeg
+@dirrmtry lib/evas/modules/savers
+@dirrmtry lib/evas/modules/loaders
+@dirrmtry lib/evas/modules
+@dirrmtry lib/evas
diff --git a/graphics/evas-loader-png/Makefile b/graphics/evas-loader-png/Makefile
new file mode 100644
index 000000000000..58aa820b60e1
--- /dev/null
+++ b/graphics/evas-loader-png/Makefile
@@ -0,0 +1,64 @@
+# New ports collection makefile for:	evas-loader-png
+# Date created:		15 September 2007
+# Whom:			Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	loader-png
+PORTVERSION=	0.9.9.042
+CATEGORIES=	graphics
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	evas-
+DISTNAME=	evas-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	A hardware accelerated canvas API (PNG engine)
+
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_FREETYPE2=	yes
+USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_EFL=	evas
+
+MAKEDIRS=	${WRKSRC}/src/modules/loaders/png \
+		${WRKSRC}/src/modules/savers/png
+
+CONFIGURE_ARGS=	--disable-software-x11 \
+		--disable-software-16-x11 \
+		--disable-software-xcb \
+		--disable-directfb \
+		--disable-sdl \
+		--disable-buffer \
+		--disable-software-qtopia \
+		--disable-gl-x11 \
+		--disable-cairo-x11 \
+		--disable-xrender-x11 \
+		--disable-xrender-xcb \
+		--disable-glitz-x11 \
+		--disable-image-loader-gif \
+		--enable-image-loader-png \
+		--disable-image-loader-jpeg \
+		--disable-image-loader-eet \
+		--disable-image-loader-edb \
+		--disable-image-loader-tiff \
+		--disable-image-loader-xpm \
+		--disable-image-loader-svg
+
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e 's,\$$\(top_builddir\)/src/lib/\.libs,${LOCALBASE}/lib,' \
+		-e 's,\$$\(top_builddir\)/src/lib/libevas\.la,-levas,' \
+		${MAKEDIRS:S,$,/Makefile.in,}
+
+do-build:
+	@(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
+
+do-install:
+	@(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
+
+.include <bsd.port.mk>
diff --git a/graphics/evas-loader-png/distinfo b/graphics/evas-loader-png/distinfo
new file mode 100644
index 000000000000..5e8e2bc542ac
--- /dev/null
+++ b/graphics/evas-loader-png/distinfo
@@ -0,0 +1,3 @@
+MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
+SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
+SIZE (evas-0.9.9.042.tar.bz2) = 7373199
diff --git a/graphics/evas-loader-png/pkg-descr b/graphics/evas-loader-png/pkg-descr
new file mode 100644
index 000000000000..e525449b6c61
--- /dev/null
+++ b/graphics/evas-loader-png/pkg-descr
@@ -0,0 +1,6 @@
+A hardware-accelerated canvas API for X-Windows that can draw anti-aliased
+text, smooth super and sub-sampled images, alpha-blend, as well as drop down to
+using normal X11 primitives such as pixmaps, lines and rectangles for speed if
+your CPU or graphics hardware is too slow.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Evas/
diff --git a/graphics/evas-loader-png/pkg-plist b/graphics/evas-loader-png/pkg-plist
new file mode 100644
index 000000000000..32dc2697ac80
--- /dev/null
+++ b/graphics/evas-loader-png/pkg-plist
@@ -0,0 +1,14 @@
+lib/evas/modules/loaders/png/%%E17_ARCH%%/module.a
+lib/evas/modules/loaders/png/%%E17_ARCH%%/module.la
+lib/evas/modules/loaders/png/%%E17_ARCH%%/module.so
+lib/evas/modules/savers/png/%%E17_ARCH%%/module.a
+lib/evas/modules/savers/png/%%E17_ARCH%%/module.la
+lib/evas/modules/savers/png/%%E17_ARCH%%/module.so
+@dirrm lib/evas/modules/loaders/png/%%E17_ARCH%%
+@dirrm lib/evas/modules/loaders/png
+@dirrm lib/evas/modules/savers/png/%%E17_ARCH%%
+@dirrm lib/evas/modules/savers/png
+@dirrmtry lib/evas/modules/savers
+@dirrmtry lib/evas/modules/loaders
+@dirrmtry lib/evas/modules
+@dirrmtry lib/evas
diff --git a/graphics/evas-loader-svg/Makefile b/graphics/evas-loader-svg/Makefile
new file mode 100644
index 000000000000..4361cc34d597
--- /dev/null
+++ b/graphics/evas-loader-svg/Makefile
@@ -0,0 +1,63 @@
+# New ports collection makefile for:	evas-loader-svg
+# Date created:		15 September 2007
+# Whom:			Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	loader-svg
+PORTVERSION=	0.9.9.042
+CATEGORIES=	graphics
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	evas-
+DISTNAME=	evas-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	A hardware accelerated canvas API (SVG engine)
+
+LIB_DEPENDS=	svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_FREETYPE2=	yes
+USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget librsvg2
+USE_EFL=	evas
+
+MAKEDIRS=	${WRKSRC}/src/modules/loaders/svg
+
+CONFIGURE_ARGS=	--disable-software-x11 \
+		--disable-software-16-x11 \
+		--disable-software-xcb \
+		--disable-directfb \
+		--disable-sdl \
+		--disable-buffer \
+		--disable-software-qtopia \
+		--disable-gl-x11 \
+		--disable-cairo-x11 \
+		--disable-xrender-x11 \
+		--disable-xrender-xcb \
+		--disable-glitz-x11 \
+		--disable-image-loader-gif \
+		--disable-image-loader-png \
+		--disable-image-loader-jpeg \
+		--disable-image-loader-eet \
+		--disable-image-loader-edb \
+		--disable-image-loader-tiff \
+		--disable-image-loader-xpm \
+		--enable-image-loader-svg
+
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e 's,\$$\(top_builddir\)/src/lib/\.libs,${LOCALBASE}/lib,' \
+		-e 's,\$$\(top_builddir\)/src/lib/libevas\.la,-levas,' \
+		${MAKEDIRS:S,$,/Makefile.in,}
+
+do-build:
+	@(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
+
+do-install:
+	@(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
+
+.include <bsd.port.mk>
diff --git a/graphics/evas-loader-svg/distinfo b/graphics/evas-loader-svg/distinfo
new file mode 100644
index 000000000000..5e8e2bc542ac
--- /dev/null
+++ b/graphics/evas-loader-svg/distinfo
@@ -0,0 +1,3 @@
+MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
+SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
+SIZE (evas-0.9.9.042.tar.bz2) = 7373199
diff --git a/graphics/evas-loader-svg/pkg-descr b/graphics/evas-loader-svg/pkg-descr
new file mode 100644
index 000000000000..e525449b6c61
--- /dev/null
+++ b/graphics/evas-loader-svg/pkg-descr
@@ -0,0 +1,6 @@
+A hardware-accelerated canvas API for X-Windows that can draw anti-aliased
+text, smooth super and sub-sampled images, alpha-blend, as well as drop down to
+using normal X11 primitives such as pixmaps, lines and rectangles for speed if
+your CPU or graphics hardware is too slow.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Evas/
diff --git a/graphics/evas-loader-svg/pkg-plist b/graphics/evas-loader-svg/pkg-plist
new file mode 100644
index 000000000000..1c02d558442a
--- /dev/null
+++ b/graphics/evas-loader-svg/pkg-plist
@@ -0,0 +1,8 @@
+lib/evas/modules/loaders/svg/%%E17_ARCH%%/module.a
+lib/evas/modules/loaders/svg/%%E17_ARCH%%/module.la
+lib/evas/modules/loaders/svg/%%E17_ARCH%%/module.so
+@dirrm lib/evas/modules/loaders/svg/%%E17_ARCH%%
+@dirrm lib/evas/modules/loaders/svg
+@dirrmtry lib/evas/modules/loaders
+@dirrmtry lib/evas/modules
+@dirrmtry lib/evas
diff --git a/graphics/evas-loader-tiff/Makefile b/graphics/evas-loader-tiff/Makefile
new file mode 100644
index 000000000000..18d697d3a89a
--- /dev/null
+++ b/graphics/evas-loader-tiff/Makefile
@@ -0,0 +1,64 @@
+# New ports collection makefile for:	evas-loader-tiff
+# Date created:		15 September 2007
+# Whom:			Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	loader-tiff
+PORTVERSION=	0.9.9.042
+CATEGORIES=	graphics
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	evas-
+DISTNAME=	evas-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	A hardware accelerated canvas API (TIFF engine)
+
+LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_FREETYPE2=	yes
+USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_EFL=	evas
+
+MAKEDIRS=	${WRKSRC}/src/modules/loaders/tiff \
+		${WRKSRC}/src/modules/savers/tiff
+
+CONFIGURE_ARGS=	--disable-software-x11 \
+		--disable-software-16-x11 \
+		--disable-software-xcb \
+		--disable-directfb \
+		--disable-sdl \
+		--disable-buffer \
+		--disable-software-qtopia \
+		--disable-gl-x11 \
+		--disable-cairo-x11 \
+		--disable-xrender-x11 \
+		--disable-xrender-xcb \
+		--disable-glitz-x11 \
+		--disable-image-loader-gif \
+		--disable-image-loader-png \
+		--disable-image-loader-jpeg \
+		--disable-image-loader-eet \
+		--disable-image-loader-edb \
+		--enable-image-loader-tiff \
+		--disable-image-loader-xpm \
+		--disable-image-loader-svg
+
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e 's,\$$\(top_builddir\)/src/lib/\.libs,${LOCALBASE}/lib,' \
+		-e 's,\$$\(top_builddir\)/src/lib/libevas\.la,-levas,' \
+		${MAKEDIRS:S,$,/Makefile.in,}
+
+do-build:
+	@(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
+
+do-install:
+	@(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
+
+.include <bsd.port.mk>
diff --git a/graphics/evas-loader-tiff/distinfo b/graphics/evas-loader-tiff/distinfo
new file mode 100644
index 000000000000..5e8e2bc542ac
--- /dev/null
+++ b/graphics/evas-loader-tiff/distinfo
@@ -0,0 +1,3 @@
+MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
+SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
+SIZE (evas-0.9.9.042.tar.bz2) = 7373199
diff --git a/graphics/evas-loader-tiff/pkg-descr b/graphics/evas-loader-tiff/pkg-descr
new file mode 100644
index 000000000000..e525449b6c61
--- /dev/null
+++ b/graphics/evas-loader-tiff/pkg-descr
@@ -0,0 +1,6 @@
+A hardware-accelerated canvas API for X-Windows that can draw anti-aliased
+text, smooth super and sub-sampled images, alpha-blend, as well as drop down to
+using normal X11 primitives such as pixmaps, lines and rectangles for speed if
+your CPU or graphics hardware is too slow.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Evas/
diff --git a/graphics/evas-loader-tiff/pkg-plist b/graphics/evas-loader-tiff/pkg-plist
new file mode 100644
index 000000000000..b3b7226b0df4
--- /dev/null
+++ b/graphics/evas-loader-tiff/pkg-plist
@@ -0,0 +1,14 @@
+lib/evas/modules/loaders/tiff/%%E17_ARCH%%/module.a
+lib/evas/modules/loaders/tiff/%%E17_ARCH%%/module.la
+lib/evas/modules/loaders/tiff/%%E17_ARCH%%/module.so
+lib/evas/modules/savers/tiff/%%E17_ARCH%%/module.a
+lib/evas/modules/savers/tiff/%%E17_ARCH%%/module.la
+lib/evas/modules/savers/tiff/%%E17_ARCH%%/module.so
+@dirrm lib/evas/modules/loaders/tiff/%%E17_ARCH%%
+@dirrm lib/evas/modules/loaders/tiff
+@dirrm lib/evas/modules/savers/tiff/%%E17_ARCH%%
+@dirrm lib/evas/modules/savers/tiff
+@dirrmtry lib/evas/modules/savers
+@dirrmtry lib/evas/modules/loaders
+@dirrmtry lib/evas/modules
+@dirrmtry lib/evas
diff --git a/graphics/evas-loader-xpm/Makefile b/graphics/evas-loader-xpm/Makefile
new file mode 100644
index 000000000000..e5a731c666a0
--- /dev/null
+++ b/graphics/evas-loader-xpm/Makefile
@@ -0,0 +1,62 @@
+# New ports collection makefile for:	evas-loader-xpm
+# Date created:		15 September 2007
+# Whom:			Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	loader-xpm
+PORTVERSION=	0.9.9.042
+CATEGORIES=	graphics
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	evas-
+DISTNAME=	evas-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	A hardware accelerated canvas API (XPM engine)
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_FREETYPE2=	yes
+USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_XORG=	xpm
+USE_EFL=	evas
+
+MAKEDIRS=	${WRKSRC}/src/modules/loaders/xpm
+
+CONFIGURE_ARGS=	--disable-software-x11 \
+		--disable-software-16-x11 \
+		--disable-software-xcb \
+		--disable-directfb \
+		--disable-sdl \
+		--disable-buffer \
+		--disable-software-qtopia \
+		--disable-gl-x11 \
+		--disable-cairo-x11 \
+		--disable-xrender-x11 \
+		--disable-xrender-xcb \
+		--disable-glitz-x11 \
+		--disable-image-loader-gif \
+		--disable-image-loader-png \
+		--disable-image-loader-jpeg \
+		--disable-image-loader-eet \
+		--disable-image-loader-edb \
+		--disable-image-loader-tiff \
+		--enable-image-loader-xpm \
+		--disable-image-loader-svg
+
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e 's,\$$\(top_builddir\)/src/lib/\.libs,${LOCALBASE}/lib,' \
+		-e 's,\$$\(top_builddir\)/src/lib/libevas\.la,-levas,' \
+		${MAKEDIRS:S,$,/Makefile.in,}
+
+do-build:
+	@(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
+
+do-install:
+	@(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
+
+.include <bsd.port.mk>
diff --git a/graphics/evas-loader-xpm/distinfo b/graphics/evas-loader-xpm/distinfo
new file mode 100644
index 000000000000..5e8e2bc542ac
--- /dev/null
+++ b/graphics/evas-loader-xpm/distinfo
@@ -0,0 +1,3 @@
+MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
+SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
+SIZE (evas-0.9.9.042.tar.bz2) = 7373199
diff --git a/graphics/evas-loader-xpm/pkg-descr b/graphics/evas-loader-xpm/pkg-descr
new file mode 100644
index 000000000000..e525449b6c61
--- /dev/null
+++ b/graphics/evas-loader-xpm/pkg-descr
@@ -0,0 +1,6 @@
+A hardware-accelerated canvas API for X-Windows that can draw anti-aliased
+text, smooth super and sub-sampled images, alpha-blend, as well as drop down to
+using normal X11 primitives such as pixmaps, lines and rectangles for speed if
+your CPU or graphics hardware is too slow.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Evas/
diff --git a/graphics/evas-loader-xpm/pkg-plist b/graphics/evas-loader-xpm/pkg-plist
new file mode 100644
index 000000000000..45841362f182
--- /dev/null
+++ b/graphics/evas-loader-xpm/pkg-plist
@@ -0,0 +1,8 @@
+lib/evas/modules/loaders/xpm/%%E17_ARCH%%/module.a
+lib/evas/modules/loaders/xpm/%%E17_ARCH%%/module.la
+lib/evas/modules/loaders/xpm/%%E17_ARCH%%/module.so
+@dirrm lib/evas/modules/loaders/xpm/%%E17_ARCH%%
+@dirrm lib/evas/modules/loaders/xpm
+@dirrmtry lib/evas/modules/loaders
+@dirrmtry lib/evas/modules
+@dirrmtry lib/evas
diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile
index 66066548b9d8..52d86ef2581c 100644
--- a/graphics/evas/Makefile
+++ b/graphics/evas/Makefile
@@ -6,174 +6,46 @@
 #
 
 PORTNAME=	evas
-PORTVERSION=	20070223
-PORTREVISION=	2
-PORTEPOCH=	1
+PORTVERSION=	0.9.9.042
+PORTREVISION=	0
+PORTEPOCH=	2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITES=	# none
+DISTFILES=	# none
+EXTRACT_ONLY=	# none
 
 MAINTAINER=	stas@FreeBSD.org
-COMMENT=	A hardware-accelerated canvas API for X-Windows
+COMMENT=	A hardware accelerated canvas API (meta-port)
 
-USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
-USE_FREETYPE2=	yes
-USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig gnometarget
+NO_BUILD=	yes
+USE_EFL=	evas
 
-OPTIONS=	GL		"Enable OpenGL rendering backend" off \
-		SOFTX11		"Enable software X11 rendering backend" on \
-		XRENDER		"Enable XRender X11 rendering backend" on \
-		BUFFER		"Enable buffer rendering backend" on \
-		DIRECTFB	"Enable DirectFB rendering backend" off \
-		FONTCONFIG	"Use fontconfig to find fonts" on \
-		GIF		"Enable GIF image loader" on \
-		PNG		"Enable PNG image loader" on \
-		JPEG		"Enable JPEG image loader" on \
-		EET		"Enable EET image loader" on \
-		EDB		"Enable EDB image loader" on \
-		TIFF		"Enable TIFF image loader" on \
-		XPM		"Enable XPM image loader" on \
-		SVG		"Enable SVG image loader" on \
-		EETFONT		"Enable EET font loader" on
+EVAS_ENGINES=	buffer opengl sdl x11 xrender
+EVAS_LOADERS=	edb eet gif jpeg png svg tiff xpm
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_GL)
-CONFIGURE_ARGS+=	--enable-gl-x11
-PLIST_SUB+=	WITH_GL=""
-USE_GL=		yes
-.else
-PLIST_SUB+=	WITH_GL="@comment "
-.endif
-
-.if defined(WITH_DIRECTFB)
-CONFIGURE_ARGS+=	--enable-directfb
-PLIST_SUB+=	DIRECTFB=""
-LIB_DEPENDS+=	directfb-0.9.16:${PORTSDIR}/devel/directfb
-.else
-CONFIGURE_ARGS+=	--disable-directfb
-PLIST_SUB+=	DIRECTFB="@comment "
-.endif
-
-.if !defined(WITHOUT_FONTCONFIG)
-CONFIGURE_ARGS+=	--enable-fontconfig
-PLIST_SUB+=	FONTCONFIG=""
-LIB_DEPENDS+=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
-.else
-CONFIGURE_ARGS+=	--disable-fontconfig
-PLIST_SUB+=	FONTCONFIG="@comment "
-.endif
-
-.if !defined(WITHOUT_SOFTX11)
-CONFIGURE_ARGS+=	--enable-software-x11
-PLIST_SUB+=	SOFTX11=""
-USE_XLIB=	yes
-.else
-CONFIGURE_ARGS+=	--disable-software-x11
-PLIST_SUB+=	SOFTX11="@comment "
-.endif
-
-.if !defined(WITHOUT_XRENDER)
-CONFIGURE_ARGS+=	--enable-xrender-x11
-PLIST_SUB+=	XRENDER=""
-USE_XLIB=	yes
-.else
-CONFIGURE_ARGS+=	--disable-xrender-x11
-PLIST_SUB+=	XRENDER="@comment "
-.endif
+.for NODE in ${EVAS_ENGINES}
+OPTIONS+=	${NODE:U} "Install ${NODE} evas engine" on
+.endfor
 
-.if !defined(WITHOUT_BUFFER)
-CONFIGURE_ARGS+=	--enable-buffer
-PLIST_SUB+=	BUFFER=""
-.else
-CONFIGURE_ARGS+=	--disable-buffer
-PLIST_SUB+=	BUFFER="@comment "
-.endif
+.for NODE in ${EVAS_LOADERS}
+OPTIONS+=	${NODE:U} "Install ${NODE} evas loader" on
+.endfor
 
-.if !defined(WITHOUT_GIF)
-CONFIGURE_ARGS+=	--enable-image-loader-gif
-PLIST_SUB+=	GIF=""
-LIB_DEPENDS+=	ungif.5:${PORTSDIR}/graphics/libungif
-.else
-CONFIGURE_ARGS+=	--disable-image-loader-gif
-PLIST_SUB+=	GIF="@comment "
-.endif
-
-.if !defined(WITHOUT_PNG)
-CONFIGURE_ARGS+=	--enable-image-loader-png
-PLIST_SUB+=	PNG=""
-LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
-.else
-CONFIGURE_ARGS+=	--disable-image-loader-png
-PLIST_SUB+=	PNG="@comment "
-.endif
-
-.if !defined(WITHOUT_JPEG)
-CONFIGURE_ARGS+=	--enable-image-loader-jpeg
-PLIST_SUB+=	JPEG=""
-LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
-CFLAGS+=	-I${X11BASE}/include
-LDFLAGS+=	-L${X11BASE}/lib
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
-.else
-CONFIGURE_ARGS+=	--disable-image-loader-jpeg
-PLIST_SUB+=	JPEG="@comment "
-.endif
-
-.if !defined(WITHOUT_EET)
-CONFIGURE_ARGS+=	--enable-image-loader-eet
-PLIST_SUB+=	EET=""
-USE_EFL+=	eet
-.else
-CONFIGURE_ARGS+=	--disable-image-loader-eet
-PLIST_SUB+=	EET="@comment "
-.endif
-
-.if !defined(WITHOUT_EETFONT)
-CONFIGURE_ARGS+=	--enable-font-loader-eet
-PLIST_SUB+=	EETFONT=""
-USE_EFL+=	eet
-.else
-CONFIGURE_ARGS+=	--disable-font-loader-eet
-PLIST_SUB+=	EETFONT="@comment "
-.endif
-
-.if !defined(WITHOUT_EDB)
-CONFIGURE_ARGS+=	--enable-image-loader-edb
-PLIST_SUB+=	EDB=""
-USE_EFL+=	edb
-.else
-CONFIGURE_ARGS+=	--disable-image-loader-edb
-PLIST_SUB+=	EDB="@comment "
-.endif
+.include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_TIFF)
-CONFIGURE_ARGS+=	--enable-image-loader-tiff
-LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
-PLIST_SUB+=	TIFF=""
-.else
-CONFIGURE_ARGS+=	--disable-image-loader-tiff
-PLIST_SUB+=	TIFF="@comment "
-.endif
+.for NODE in ${EVAS_ENGINES}
+. if !defined(WITHOUT_${NODE:U})
+USE_EFL_EVAS_ENGINES+=	${NODE}
+. endif
+.endfor
 
-.if !defined(WITHOUT_XPM)
-CONFIGURE_ARGS+=	--enable-image-loader-xpm
-USE_XPM=	yes
-PLIST_SUB+=	XPM=""
-.else
-CONFIGURE_ARGS+=	--disable-image-loader-xpm
-PLIST_SUB+=	XPM="@comment "
-.endif
+.for NODE in ${EVAS_LOADERS}
+. if !defined(WITHOUT_${NODE:U})
+USE_EFL_EVAS_LOADERS+=	${NODE}
+. endif
+.endfor
 
-.if !defined(WITHOUT_SVG)
-CONFIGURE_ARGS+=	--enable-image-loader-svg
-USE_GNOME+=	librsvg2
-LIB_DEPENDS+=	svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo
-PLIST_SUB+=	SVG=""
-.else
-CONFIGURE_ARGS+=	--disable-image-loader-svg
-PLIST_SUB+=	SVG="@comment "
-.endif
+do-install:
+	${DO_NADA}
 
 .include <bsd.port.post.mk>
diff --git a/graphics/evas/distinfo b/graphics/evas/distinfo
deleted file mode 100644
index b310ded67a6f..000000000000
--- a/graphics/evas/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (evas-20070223.tar.bz2) = 11baa88bdda77d846db0c7d090d9ec75
-SHA256 (evas-20070223.tar.bz2) = 0bd21a807092af4c5e21132cd41a2159d08b0e099dcf947fec094fdecc3d07dc
-SIZE (evas-20070223.tar.bz2) = 3683644
diff --git a/graphics/evas/pkg-plist b/graphics/evas/pkg-plist
deleted file mode 100644
index 6f2d1f81eb06..000000000000
--- a/graphics/evas/pkg-plist
+++ /dev/null
@@ -1,112 +0,0 @@
-bin/evas-config
-include/Evas.h
-%%BUFFER%%include/Evas_Engine_Buffer.h
-%%DIRECTFB%%include/Evas_Engine_DirectFB.h
-%%WITH_GL%%include/Evas_Engine_GL_X11.h
-%%SOFTX11%%include/Evas_Engine_Software_X11.h
-%%XRENDER%%include/Evas_Engine_XRender_X11.h
-%%BUFFER%%lib/evas/modules/engines/buffer/%%E17_ARCH%%/module.a
-%%BUFFER%%lib/evas/modules/engines/buffer/%%E17_ARCH%%/module.la
-%%BUFFER%%lib/evas/modules/engines/buffer/%%E17_ARCH%%/module.so
-%%DIRECTFB%%lib/evas/modules/engines/directfb/%%E17_ARCH%%/module.a
-%%DIRECTFB%%lib/evas/modules/engines/directfb/%%E17_ARCH%%/module.la
-%%DIRECTFB%%lib/evas/modules/engines/directfb/%%E17_ARCH%%/module.so
-%%WITH_GL%%lib/evas/modules/engines/gl_x11/%%E17_ARCH%%/module.a
-%%WITH_GL%%lib/evas/modules/engines/gl_x11/%%E17_ARCH%%/module.la
-%%WITH_GL%%lib/evas/modules/engines/gl_x11/%%E17_ARCH%%/module.so
-lib/evas/modules/engines/software_generic/%%E17_ARCH%%/module.a
-lib/evas/modules/engines/software_generic/%%E17_ARCH%%/module.la
-lib/evas/modules/engines/software_generic/%%E17_ARCH%%/module.so
-%%SOFTX11%%lib/evas/modules/engines/software_x11/%%E17_ARCH%%/module.a
-%%SOFTX11%%lib/evas/modules/engines/software_x11/%%E17_ARCH%%/module.la
-%%SOFTX11%%lib/evas/modules/engines/software_x11/%%E17_ARCH%%/module.so
-%%XRENDER%%lib/evas/modules/engines/xrender_x11/%%E17_ARCH%%/module.a
-%%XRENDER%%lib/evas/modules/engines/xrender_x11/%%E17_ARCH%%/module.la
-%%XRENDER%%lib/evas/modules/engines/xrender_x11/%%E17_ARCH%%/module.so
-%%EDB%%lib/evas/modules/loaders/edb/%%E17_ARCH%%/module.a
-%%EDB%%lib/evas/modules/loaders/edb/%%E17_ARCH%%/module.la
-%%EDB%%lib/evas/modules/loaders/edb/%%E17_ARCH%%/module.so
-%%EET%%lib/evas/modules/loaders/eet/%%E17_ARCH%%/module.a
-%%EET%%lib/evas/modules/loaders/eet/%%E17_ARCH%%/module.la
-%%EET%%lib/evas/modules/loaders/eet/%%E17_ARCH%%/module.so
-%%GIF%%lib/evas/modules/loaders/gif/%%E17_ARCH%%/module.a
-%%GIF%%lib/evas/modules/loaders/gif/%%E17_ARCH%%/module.la
-%%GIF%%lib/evas/modules/loaders/gif/%%E17_ARCH%%/module.so
-%%JPEG%%lib/evas/modules/loaders/jpeg/%%E17_ARCH%%/module.a
-%%JPEG%%lib/evas/modules/loaders/jpeg/%%E17_ARCH%%/module.la
-%%JPEG%%lib/evas/modules/loaders/jpeg/%%E17_ARCH%%/module.so
-%%PNG%%lib/evas/modules/loaders/png/%%E17_ARCH%%/module.a
-%%PNG%%lib/evas/modules/loaders/png/%%E17_ARCH%%/module.la
-%%PNG%%lib/evas/modules/loaders/png/%%E17_ARCH%%/module.so
-%%SVG%%lib/evas/modules/loaders/svg/%%E17_ARCH%%/module.a
-%%SVG%%lib/evas/modules/loaders/svg/%%E17_ARCH%%/module.la
-%%SVG%%lib/evas/modules/loaders/svg/%%E17_ARCH%%/module.so
-%%TIFF%%lib/evas/modules/loaders/tiff/%%E17_ARCH%%/module.a
-%%TIFF%%lib/evas/modules/loaders/tiff/%%E17_ARCH%%/module.la
-%%TIFF%%lib/evas/modules/loaders/tiff/%%E17_ARCH%%/module.so
-%%XPM%%lib/evas/modules/loaders/xpm/%%E17_ARCH%%/module.a
-%%XPM%%lib/evas/modules/loaders/xpm/%%E17_ARCH%%/module.la
-%%XPM%%lib/evas/modules/loaders/xpm/%%E17_ARCH%%/module.so
-%%EDB%%lib/evas/modules/savers/edb/%%E17_ARCH%%/module.a
-%%EDB%%lib/evas/modules/savers/edb/%%E17_ARCH%%/module.la
-%%EDB%%lib/evas/modules/savers/edb/%%E17_ARCH%%/module.so
-%%EET%%lib/evas/modules/savers/eet/%%E17_ARCH%%/module.a
-%%EET%%lib/evas/modules/savers/eet/%%E17_ARCH%%/module.la
-%%EET%%lib/evas/modules/savers/eet/%%E17_ARCH%%/module.so
-%%JPEG%%lib/evas/modules/savers/jpeg/%%E17_ARCH%%/module.a
-%%JPEG%%lib/evas/modules/savers/jpeg/%%E17_ARCH%%/module.la
-%%JPEG%%lib/evas/modules/savers/jpeg/%%E17_ARCH%%/module.so
-%%PNG%%lib/evas/modules/savers/png/%%E17_ARCH%%/module.a
-%%PNG%%lib/evas/modules/savers/png/%%E17_ARCH%%/module.la
-%%PNG%%lib/evas/modules/savers/png/%%E17_ARCH%%/module.so
-%%TIFF%%lib/evas/modules/savers/tiff/%%E17_ARCH%%/module.a
-%%TIFF%%lib/evas/modules/savers/tiff/%%E17_ARCH%%/module.la
-%%TIFF%%lib/evas/modules/savers/tiff/%%E17_ARCH%%/module.so
-lib/libevas.a
-lib/libevas.la
-lib/libevas.so
-lib/libevas.so.1
-libdata/pkgconfig/evas.pc
-%%TIFF%%@dirrm lib/evas/modules/savers/tiff/%%E17_ARCH%%
-%%TIFF%%@dirrm lib/evas/modules/savers/tiff
-%%PNG%%@dirrm lib/evas/modules/savers/png/%%E17_ARCH%%
-%%PNG%%@dirrm lib/evas/modules/savers/png
-%%JPEG%%@dirrm lib/evas/modules/savers/jpeg/%%E17_ARCH%%
-%%JPEG%%@dirrm lib/evas/modules/savers/jpeg
-%%EET%%@dirrm lib/evas/modules/savers/eet/%%E17_ARCH%%
-%%EET%%@dirrm lib/evas/modules/savers/eet
-%%EDB%%@dirrm lib/evas/modules/savers/edb/%%E17_ARCH%%
-%%EDB%%@dirrm lib/evas/modules/savers/edb
-@dirrm lib/evas/modules/savers
-%%XPM%%@dirrm lib/evas/modules/loaders/xpm/%%E17_ARCH%%
-%%XPM%%@dirrm lib/evas/modules/loaders/xpm
-%%TIFF%%@dirrm lib/evas/modules/loaders/tiff/%%E17_ARCH%%
-%%TIFF%%@dirrm lib/evas/modules/loaders/tiff
-%%SVG%%@dirrm lib/evas/modules/loaders/svg/%%E17_ARCH%%
-%%SVG%%@dirrm lib/evas/modules/loaders/svg
-%%PNG%%@dirrm lib/evas/modules/loaders/png/%%E17_ARCH%%
-%%PNG%%@dirrm lib/evas/modules/loaders/png
-%%JPEG%%@dirrm lib/evas/modules/loaders/jpeg/%%E17_ARCH%%
-%%JPEG%%@dirrm lib/evas/modules/loaders/jpeg
-%%GIF%%@dirrm lib/evas/modules/loaders/gif/%%E17_ARCH%%
-%%GIF%%@dirrm lib/evas/modules/loaders/gif
-%%EET%%@dirrm lib/evas/modules/loaders/eet/%%E17_ARCH%%
-%%EET%%@dirrm lib/evas/modules/loaders/eet
-%%EDB%%@dirrm lib/evas/modules/loaders/edb/%%E17_ARCH%%
-%%EDB%%@dirrm lib/evas/modules/loaders/edb
-@dirrm lib/evas/modules/loaders
-%%XRENDER%%@dirrm lib/evas/modules/engines/xrender_x11/%%E17_ARCH%%
-%%XRENDER%%@dirrm lib/evas/modules/engines/xrender_x11
-%%SOFTX11%%@dirrm lib/evas/modules/engines/software_x11/%%E17_ARCH%%
-%%SOFTX11%%@dirrm lib/evas/modules/engines/software_x11
-@dirrm lib/evas/modules/engines/software_generic/%%E17_ARCH%%
-@dirrm lib/evas/modules/engines/software_generic
-%%WITH_GL%%@dirrm lib/evas/modules/engines/gl_x11/%%E17_ARCH%%
-%%WITH_GL%%@dirrm lib/evas/modules/engines/gl_x11
-%%DIRECTFB%%@dirrm lib/evas/modules/engines/directfb/%%E17_ARCH%%
-%%DIRECTFB%%@dirrm lib/evas/modules/engines/directfb
-%%BUFFER%%@dirrm lib/evas/modules/engines/buffer/%%E17_ARCH%%
-%%BUFFER%%@dirrm lib/evas/modules/engines/buffer
-@dirrm lib/evas/modules/engines
-@dirrm lib/evas/modules
-@dirrm lib/evas
diff --git a/graphics/exhibit/Makefile b/graphics/exhibit/Makefile
index 203582ee1a20..bf14723598c1 100644
--- a/graphics/exhibit/Makefile
+++ b/graphics/exhibit/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	exhibit
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
@@ -18,7 +18,8 @@ COMMENT=	An ETK-based image viewer
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
-USE_EFL=	evas eet ecore edje etk epsilon
+USE_EFL=	evas eet ecore edje etk epsilon efreet
+USE_EFL_ECORE=	evas file
 WANT_EFL=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/graphics/exhibit/distinfo b/graphics/exhibit/distinfo
index 046f3138f8ea..24095ec46575 100644
--- a/graphics/exhibit/distinfo
+++ b/graphics/exhibit/distinfo
@@ -1,3 +1,3 @@
-MD5 (exhibit-20070223.tar.bz2) = e64b74615c31437b3cebc50677b11048
-SHA256 (exhibit-20070223.tar.bz2) = 9096329f4fdfd32d140d54eafd71c8c42cceb8774cc3b348d17c60f9595d1867
-SIZE (exhibit-20070223.tar.bz2) = 275461
+MD5 (exhibit-20080223.tar.bz2) = 2b9531441ed0b211c8f4a678b437fec9
+SHA256 (exhibit-20080223.tar.bz2) = 3856109af71e3d98ddf836b2185fdde1b559cc232fdff53d0f80692449fb5a47
+SIZE (exhibit-20080223.tar.bz2) = 380799
diff --git a/graphics/geist/Makefile b/graphics/geist/Makefile
index 2666494730a4..7353eab4ef21 100644
--- a/graphics/geist/Makefile
+++ b/graphics/geist/Makefile
@@ -7,20 +7,20 @@
 
 PORTNAME=	geist
 PORTVERSION=	0.0.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	http://linuxbrit.co.uk/downloads/
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	An object-based image creation/layout application
 
-LIB_DEPENDS=	Imlib2.4:${PORTSDIR}/graphics/imlib2 \
-		xml2.5:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 
 XML_CONFIG?=	${LOCALBASE}/bin/xml2-config
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
+USE_EFL=	imlib2
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		LIBS="-L${X11BASE}/lib" \
 		XML_CONFIG="${XML_CONFIG}"
diff --git a/graphics/giblib/Makefile b/graphics/giblib/Makefile
index 0f0ab059e652..a74d2a614a04 100644
--- a/graphics/giblib/Makefile
+++ b/graphics/giblib/Makefile
@@ -7,18 +7,17 @@
 
 PORTNAME=	giblib
 PORTVERSION=	1.2.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics devel
 MASTER_SITES=	http://linuxbrit.co.uk/downloads/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A utility library that includes a wrapper for imlib2
 
-LIB_DEPENDS=	Imlib2.4:${PORTSDIR}/graphics/imlib2
-
 USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
+USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/graphics/hsetroot/Makefile b/graphics/hsetroot/Makefile
index b04e2fd3330a..69d08d334430 100644
--- a/graphics/hsetroot/Makefile
+++ b/graphics/hsetroot/Makefile
@@ -7,17 +7,16 @@
 
 PORTNAME=	hsetroot
 PORTVERSION=	1.0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://thegraveyard.org/files/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utility to compose wallpapers for X
 
-LIB_DEPENDS=	Imlib2.4:${PORTSDIR}/graphics/imlib2
-
 PLIST_FILES=	bin/hsetroot
 USE_X_PREFIX=	YES
+USE_EFL=	imlib2
 
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index b6e80fcf8daa..d1279b994368 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	imlib2
-PORTVERSION=	20070223
-PORTREVISION=	1
-PORTEPOCH=	1
+PORTVERSION=	1.4.1.000
+PORTREVISION=	0
+PORTEPOCH=	2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
 
 MAINTAINER=	stas@FreeBSD.org
-COMMENT=	The next generation graphic library for enlightenment package
+COMMENT=	The next generation graphics library for Enlightenment
 
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index 2b610209b6cb..2faacbf8c264 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1,3 +1,3 @@
-MD5 (imlib2-20070223.tar.bz2) = 4da363aaaa1cd6b96bff741ac62cac29
-SHA256 (imlib2-20070223.tar.bz2) = f35e8ec8f291accb931ccc0470708898fc725f82a1de7d80f300f715f6995c53
-SIZE (imlib2-20070223.tar.bz2) = 845387
+MD5 (imlib2-1.4.1.000.tar.bz2) = cbb3180c80f12db01decd2ad4ae3a94a
+SHA256 (imlib2-1.4.1.000.tar.bz2) = bfd6871c19ca26b23116b5418962844b0db179bccbb0465176464780d483be79
+SIZE (imlib2-1.4.1.000.tar.bz2) = 861125
diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist
index 46eeebc0e5de..1398068d4b68 100644
--- a/graphics/imlib2/pkg-plist
+++ b/graphics/imlib2/pkg-plist
@@ -59,7 +59,7 @@ lib/imlib2/loaders/zlib.so
 lib/libImlib2.a
 lib/libImlib2.la
 lib/libImlib2.so
-lib/libImlib2.so.4
+lib/libImlib2.so.5
 libdata/pkgconfig/imlib2.pc
 %%DATADIR%%/data/fonts/cinema.ttf
 %%DATADIR%%/data/fonts/grunge.ttf
diff --git a/graphics/imlib2_loaders/Makefile b/graphics/imlib2_loaders/Makefile
index 60328ca1a201..09d9299962fb 100644
--- a/graphics/imlib2_loaders/Makefile
+++ b/graphics/imlib2_loaders/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	imlib2_loaders
-PORTVERSION=	20070223
-PORTREVISION=	1
-PORTEPOCH=	1
+PORTVERSION=	1.4.1.000
+PORTREVISION=	0
+PORTEPOCH=	2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Extra image loader plugins for Imlib 2
diff --git a/graphics/imlib2_loaders/distinfo b/graphics/imlib2_loaders/distinfo
index c619d0adf08a..88b6fed43ac1 100644
--- a/graphics/imlib2_loaders/distinfo
+++ b/graphics/imlib2_loaders/distinfo
@@ -1,3 +1,3 @@
-MD5 (imlib2_loaders-20070223.tar.bz2) = 44f88b81042b4cd205505a20058c89f4
-SHA256 (imlib2_loaders-20070223.tar.bz2) = f8476002583e4277840010fef3e56071849ec85b4f5b24e860fabf01e3f69c8d
-SIZE (imlib2_loaders-20070223.tar.bz2) = 240441
+MD5 (imlib2_loaders-1.4.1.000.tar.bz2) = 4b04b6b11e0e7ae8494fdc554a880429
+SHA256 (imlib2_loaders-1.4.1.000.tar.bz2) = b95c4e29328b1d2210ad51c516959aa50a94787ba115277ed9c9b695b6542381
+SIZE (imlib2_loaders-1.4.1.000.tar.bz2) = 256470
diff --git a/graphics/kipi-plugins-kde4/Makefile b/graphics/kipi-plugins-kde4/Makefile
index c8a798c4de34..7756700e31b7 100644
--- a/graphics/kipi-plugins-kde4/Makefile
+++ b/graphics/kipi-plugins-kde4/Makefile
@@ -191,7 +191,7 @@ PLIST_SUB+=	SIMPLEVIEWEREXPORT:="@comment "
 .if !defined(WITHOUT_SLIDESHOW)
 PLIST_SUB+=	SLIDESHOW:=""
 SUBDIRS+=	slideshow
-LIB_DEPENDS+=	Imlib2.4:${PORTSDIR}/graphics/imlib2
+USE_EFL+=	imlib2
 .else
 PLIST_SUB+=	SLIDESHOW:="@comment "
 .endif
diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
index c8a798c4de34..7756700e31b7 100644
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@@ -191,7 +191,7 @@ PLIST_SUB+=	SIMPLEVIEWEREXPORT:="@comment "
 .if !defined(WITHOUT_SLIDESHOW)
 PLIST_SUB+=	SLIDESHOW:=""
 SUBDIRS+=	slideshow
-LIB_DEPENDS+=	Imlib2.4:${PORTSDIR}/graphics/imlib2
+USE_EFL+=	imlib2
 .else
 PLIST_SUB+=	SLIDESHOW:="@comment "
 .endif
diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile
index 1352f238d449..d0ec8efcaa24 100644
--- a/graphics/libcaca/Makefile
+++ b/graphics/libcaca/Makefile
@@ -37,7 +37,7 @@ USE_XLIB=	yes
 .if defined(WITHOUT_IMLIB2)
 CONFIGURE_ARGS+=--disable-imlib2
 .else
-LIB_DEPENDS+=	Imlib2.4:${PORTSDIR}/graphics/imlib2
+USE_EFL+=	imlib2
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/graphics/p5-Image-Imlib2/Makefile b/graphics/p5-Image-Imlib2/Makefile
index f1d10274d364..48abbe1c2c1e 100644
--- a/graphics/p5-Image-Imlib2/Makefile
+++ b/graphics/p5-Image-Imlib2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Image-Imlib2
 PORTVERSION=	2.00
+PORTREVISION=	3
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Image
@@ -15,10 +16,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to the Imlib2 image library
 
-LIB_DEPENDS=	Imlib2.4:${PORTSDIR}/graphics/imlib2
 BUILD_DEPENDS+=	${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
 
 PERL_MODBUILD=	yes
+USE_EFL=	imlib2
 
 MAN3=		Image::Imlib2.3
 
diff --git a/graphics/p5-Imlib2/Makefile b/graphics/p5-Imlib2/Makefile
index 9007ba7555c6..390e5b4675d4 100644
--- a/graphics/p5-Imlib2/Makefile
+++ b/graphics/p5-Imlib2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Imlib2
 PORTVERSION=	1.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.muhri.net/
 PKGNAMEPREFIX=	p5-
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}-Perl-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl bindings for Imlib2
 
-LIB_DEPENDS=	Imlib2.4:${PORTSDIR}/graphics/imlib2
+USE_EFL=	imlib2
 
 PERL_CONFIGURE=	yes
 
diff --git a/graphics/pecl-imlib2/Makefile b/graphics/pecl-imlib2/Makefile
index 72542339dd1a..6468f30e21b2 100644
--- a/graphics/pecl-imlib2/Makefile
+++ b/graphics/pecl-imlib2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	imlib2
 PORTVERSION=	0.1.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
@@ -17,10 +17,9 @@ DIST_SUBDIR=	PECL
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	A PECL extension if imlib2
 
-LIB_DEPENDS=	Imlib2:${PORTSDIR}/graphics/imlib2
-
 USE_PHP=	yes
 USE_PHPEXT=	yes
+USE_EFL=	imlib2
 
 # libImlib2 may or may not depend on X, however,
 # imlib2 extension doesn't need X related functions in libImlib2
diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile
index 75cf89c668cc..51edc39acd9d 100644
--- a/graphics/qcomicbook/Makefile
+++ b/graphics/qcomicbook/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qcomicbook
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://linux.bydg.org/~yogin/qcomicbook/
 
@@ -20,6 +21,7 @@ USE_QT_VER=	4
 QT_COMPONENTS=	gui moc
 USE_GNOME=	gnometarget
 USE_GMAKE=	yes
+USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	QtGui_CFLAGS="${QtGui_CFLAGS}"
 
diff --git a/graphics/ruby-edje/Makefile b/graphics/ruby-edje/Makefile
index ff8206b3dc7a..a7467aabdf88 100644
--- a/graphics/ruby-edje/Makefile
+++ b/graphics/ruby-edje/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	edje
-PORTVERSION=	20061008
-PORTREVISION=	1
+PORTVERSION=	20080302
+PORTREVISION=	0
 CATEGORIES=	graphics ruby
-MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-edje-${PORTVERSION}
 
@@ -27,9 +27,6 @@ RUBY_SA=	${RUBY_SITEARCHLIBDIR}
 
 .include <bsd.port.pre.mk>
 
-post-patch:
-	@${REINPLACE_CMD} "s#%%X11BASE%%#${X11BASE}#g" ${WRKSRC}/Rakefile
-
 do-build:
 	@(cd ${WRKSRC}; ${SETENV} EDJE_PREFIX=${LOCALBASE} \
 		${LOCALBASE}/bin/rake)
diff --git a/graphics/ruby-edje/distinfo b/graphics/ruby-edje/distinfo
index 5afe8038c43c..5fdd88651169 100644
--- a/graphics/ruby-edje/distinfo
+++ b/graphics/ruby-edje/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby-edje-20061008.tar.bz2) = 3fef78c3bd655b9836c5b8906b3ec643
-SHA256 (ruby-edje-20061008.tar.bz2) = b1a9aba5d36a88024e2bc889aeceb7798522b3c25f2cc8ab7e497a4e2c8369b6
-SIZE (ruby-edje-20061008.tar.bz2) = 15623
+MD5 (ruby-edje-20080302.tar.bz2) = a16b73f388391554e8b1227131e0d483
+SHA256 (ruby-edje-20080302.tar.bz2) = 66e73f858cae67e361e140c63f5aa709a4a6c8a3e5783379bd82799cb672ecdf
+SIZE (ruby-edje-20080302.tar.bz2) = 19114
diff --git a/graphics/ruby-edje/files/patch-Rakefile b/graphics/ruby-edje/files/patch-Rakefile
deleted file mode 100644
index deb297174636..000000000000
--- a/graphics/ruby-edje/files/patch-Rakefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- Rakefile.orig	Tue May 16 11:23:21 2006
-+++ Rakefile	Sat Jun 24 22:14:48 2006
-@@ -16,13 +16,13 @@
- task :default => [ext_lib.so]
- 
- file ext_lib.so => ext_lib.objects do |t|
--	sh "cc #{ext_lib.ldflags} -shared -Wl " +
-+	sh "cc #{ext_lib.ldflags} -L%%X11BASE%%/lib -shared -Wl " +
- 	    " #{t.prerequisites.join(" ")} -o #{t.name}"
- end
- 
- ext_lib.objects.each do |object|
- 	file object => object.sub(/\.[^.]+$/, ".c") do |t|
--		sh "cc #{ext_lib.cflags} #{t.prerequisites.first} " +
-+		sh "cc #{ext_lib.cflags} -I%%X11BASE%%/include #{t.prerequisites.first} " +
- 		   "-c -o #{t.name}"
- 	end
- end
diff --git a/graphics/ruby-esmart/Makefile b/graphics/ruby-esmart/Makefile
index aba6c904c731..f967e7f3728b 100644
--- a/graphics/ruby-esmart/Makefile
+++ b/graphics/ruby-esmart/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	esmart
-PORTVERSION=	20061008
-PORTREVISION=	1
+PORTVERSION=	20080302
+PORTREVISION=	0
 CATEGORIES=	graphics ruby
-MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-esmart-${PORTVERSION}
 
@@ -22,18 +22,20 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake \
 
 USE_BZIP2=	yes
 USE_RUBY=	yes
-USE_EFL_ESMART=	trans_x11
+USE_EFL_ESMART=	trans_x11 container draggies
+
+CFLAGS+=	-I"${LOCALBASE}/include" -fPIC
 
 RUBY_SA=	${RUBY_SITEARCHLIBDIR}
 
 .include <bsd.port.pre.mk>
 
 do-build:
-	@(cd ${WRKSRC}; ${SETENV} ESMART_PREFIX=${LOCALBASE} \
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ESMART_PREFIX=${LOCALBASE} \
 		${LOCALBASE}/bin/rake)
 
 do-install:
-	@(cd ${WRKSRC}; ${SETENV} ESMART_PREFIX=${LOCALBASE} \
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ESMART_PREFIX=${LOCALBASE} \
 		${LOCALBASE}/bin/rake install)
 
 .include <bsd.port.post.mk>
diff --git a/graphics/ruby-esmart/distinfo b/graphics/ruby-esmart/distinfo
index fcfdb9fd8f4d..66a19381a807 100644
--- a/graphics/ruby-esmart/distinfo
+++ b/graphics/ruby-esmart/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby-esmart-20061008.tar.bz2) = 61cdc7b6594805247efaee74e3577886
-SHA256 (ruby-esmart-20061008.tar.bz2) = 276cd71d194c8c6a6825f56ce00aaaf62355fa838a3c1ecbdb31caef1890a69f
-SIZE (ruby-esmart-20061008.tar.bz2) = 13383
+MD5 (ruby-esmart-20080302.tar.bz2) = de09151f10b36539ed69bdb5a593ee78
+SHA256 (ruby-esmart-20080302.tar.bz2) = 66a6b878e225d49d96526f5b8e35a37e5c6ede32f65258024f1ca8c2489ab3b0
+SIZE (ruby-esmart-20080302.tar.bz2) = 17444
diff --git a/graphics/ruby-esmart/pkg-plist b/graphics/ruby-esmart/pkg-plist
index 1abe031152be..6f341dcb3a0b 100644
--- a/graphics/ruby-esmart/pkg-plist
+++ b/graphics/ruby-esmart/pkg-plist
@@ -2,4 +2,3 @@
 %%RUBY_SITEARCHLIBDIR%%/esmart_container.so
 %%RUBY_SITEARCHLIBDIR%%/esmart_draggies.so
 %%RUBY_SITEARCHLIBDIR%%/esmart_trans_x11.so
-%%RUBY_SITEARCHLIBDIR%%/esmart_file_dialog.so
diff --git a/graphics/ruby-evas/Makefile b/graphics/ruby-evas/Makefile
index 78060674527a..843c41d5fce7 100644
--- a/graphics/ruby-evas/Makefile
+++ b/graphics/ruby-evas/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	evas
-PORTVERSION=	20061008
-PORTREVISION=	1
+PORTVERSION=	20080302
+PORTREVISION=	0
 CATEGORIES=	graphics ruby
-MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-evas-${PORTVERSION}
 
diff --git a/graphics/ruby-evas/distinfo b/graphics/ruby-evas/distinfo
index 828ef55cc56f..c1ef9ac50c60 100644
--- a/graphics/ruby-evas/distinfo
+++ b/graphics/ruby-evas/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby-evas-20061008.tar.bz2) = 4e47eb2ac2405d6ade439f5ef32d5c5b
-SHA256 (ruby-evas-20061008.tar.bz2) = d52308616c746049c8eb80abcfc9ad9fbd2733ce9f6a600985b39ae5a1beff3d
-SIZE (ruby-evas-20061008.tar.bz2) = 19689
+MD5 (ruby-evas-20080302.tar.bz2) = e052400b92b9a20bf740a378afd4c573
+SHA256 (ruby-evas-20080302.tar.bz2) = 206ed0225d7d2465ef390895f4c49084c93d7d4c1d3ea1b3b500b5617b5af0ea
+SIZE (ruby-evas-20080302.tar.bz2) = 23280
diff --git a/graphics/ruby-imlib2/Makefile b/graphics/ruby-imlib2/Makefile
index a003f315e766..3339080518a3 100644
--- a/graphics/ruby-imlib2/Makefile
+++ b/graphics/ruby-imlib2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	imlib2
 PORTVERSION=	0.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://www.pablotron.org/download/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -17,10 +17,9 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Imlib2 bindings for Ruby
 
-LIB_DEPENDS=	Imlib2.4:${PORTSDIR}/graphics/imlib2
-
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
+USE_EFL=	imlib2
 
 INSTALL_TARGET=	site-install
 
diff --git a/graphics/telak/Makefile b/graphics/telak/Makefile
index cff7acc1ed2e..bb008f7719f6 100644
--- a/graphics/telak/Makefile
+++ b/graphics/telak/Makefile
@@ -18,11 +18,11 @@ COMMENT=	A tool to draw pictures on your root window
 
 LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl \
 		gcrypt.15:${PORTSDIR}/security/libgcrypt \
-		Imlib2.4:${PORTSDIR}/graphics/imlib2
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GETOPT_LONG=yes
+USE_EFL=	imlib2
 
 ALL_TARGET=	${PORTNAME}
 MAKE_ENV=	CC="${CC}" LDFLAGS="${LDFLAGS}"
diff --git a/graphics/zphoto/Makefile b/graphics/zphoto/Makefile
index 8f0eaf734cf1..533656e74453 100644
--- a/graphics/zphoto/Makefile
+++ b/graphics/zphoto/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	zphoto
 PORTVERSION=	1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics www
 MASTER_SITES=	http://namazu.org/~satoru/zphoto/
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,6 @@ MAINTAINER=	umeno@rr.iij4u.or.jp
 COMMENT=	Zooming photo album generator
 
 LIB_DEPENDS=	ming.4:${PORTSDIR}/graphics/ming \
-		Imlib2.4:${PORTSDIR}/graphics/imlib2 \
 		popt.0:${PORTSDIR}/devel/popt
 .if !defined (WITHOUT_AVIPLAY)
 LIB_DEPENDS+=	aviplay.0:${PORTSDIR}/multimedia/avifile
@@ -29,6 +28,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 	       	CPPFLAGS="-I${LOCALBASE}/include \
 		${PTHREAD_CFLAGS}"
+USE_EFL=	imlib2
 .if defined (WITH_WXGTK2)
 USE_WX=		2.4
 WX_CONF_ARGS=	absolute
diff --git a/lang/embryo/Makefile b/lang/embryo/Makefile
index 1562d6a23fce..a13b9a4b2be4 100644
--- a/lang/embryo/Makefile
+++ b/lang/embryo/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	embryo
-PORTVERSION=	20070223
-PORTREVISION=	1
-PORTEPOCH=	1
+PORTVERSION=	0.9.1.042
+PORTREVISION=	0
+PORTEPOCH=	2
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
 
 MAINTAINER=	stas@FreeBSD.org
-COMMENT=	A C like scripting language used in parts of the Enlightenment
+COMMENT=	A C like scripting language used in Enlightenment
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
diff --git a/lang/embryo/distinfo b/lang/embryo/distinfo
index 56ba1186b9fb..85ce7b492130 100644
--- a/lang/embryo/distinfo
+++ b/lang/embryo/distinfo
@@ -1,3 +1,3 @@
-MD5 (embryo-20070223.tar.bz2) = d730a88a0b26a0c4d3788ac6d4612620
-SHA256 (embryo-20070223.tar.bz2) = 69960a1d1c7fbe59bea0c0226c74836730c3a01df4066fd8773199b6c3d0d332
-SIZE (embryo-20070223.tar.bz2) = 1378368
+MD5 (embryo-0.9.1.042.tar.bz2) = d6f08bb2eb9c5c466eef7c1951d3f6ba
+SHA256 (embryo-0.9.1.042.tar.bz2) = 913a9c1b9f7e513934a8c8e4873612bd79921122e9e4057ece9db793df02b463
+SIZE (embryo-0.9.1.042.tar.bz2) = 2826918
diff --git a/lang/embryo/pkg-plist b/lang/embryo/pkg-plist
index f35602942c44..538cc952a929 100644
--- a/lang/embryo/pkg-plist
+++ b/lang/embryo/pkg-plist
@@ -1,4 +1,3 @@
-bin/embryo-config
 bin/embryo_cc
 include/Embryo.h
 lib/libembryo.a
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index 3116e0750133..03f5ac6d0768 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -17,7 +17,6 @@ MAINTAINER=	uspoerlein@gmail.com
 COMMENT=	Camserv is a free program to do streaming video via the web
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		Imlib2.4:${PORTSDIR}/graphics/imlib2 \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
 		freetype.9:${PORTSDIR}/print/freetype2
 
@@ -25,6 +24,7 @@ ONLY_FOR_ARCHS=	i386 alpha
 
 USE_XLIB=	yes
 USE_AUTOTOOLS=	autoconf:261 libtool:15 libltdl:15
+USE_EFL=	imlib2
 
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
diff --git a/multimedia/eclair/Makefile b/multimedia/eclair/Makefile
index 04d9ffec593f..a89e94248d71 100644
--- a/multimedia/eclair/Makefile
+++ b/multimedia/eclair/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	eclair
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
@@ -22,7 +22,8 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget pkgconfig libxml2
 USE_EFL=	ecore edje evas emotion
-USE_EFL_ESMART=	trans_x11
+USE_EFL_ECORE=	x11 evas file
+USE_EFL_ESMART=	draggies
 USE_SQLITE=	3
 
 .include <bsd.port.mk>
diff --git a/multimedia/eclair/distinfo b/multimedia/eclair/distinfo
index 3c0cba3d2b3d..0a5a5b77f15f 100644
--- a/multimedia/eclair/distinfo
+++ b/multimedia/eclair/distinfo
@@ -1,3 +1,3 @@
-MD5 (eclair-20070223.tar.bz2) = 5ae249d9c5501fd0dd150cf20082727f
-SHA256 (eclair-20070223.tar.bz2) = 9cf60e23c68118be5f81fdba15bc5ef40c9f97ac0e79d81bf3cb6f30e522b97e
-SIZE (eclair-20070223.tar.bz2) = 635817
+MD5 (eclair-20080223.tar.bz2) = 1d98f14b43c8db54ad0f80898110e74c
+SHA256 (eclair-20080223.tar.bz2) = 45ecdc84c828b89be61bd3b70fe1fce1f05b6639790d2a6d167359be8ed3ffd4
+SIZE (eclair-20080223.tar.bz2) = 642938
diff --git a/multimedia/emotion/Makefile b/multimedia/emotion/Makefile
index 729f37b7f68d..c1752b0c1bc5 100644
--- a/multimedia/emotion/Makefile
+++ b/multimedia/emotion/Makefile
@@ -7,18 +7,21 @@
 #
 
 PORTNAME=	emotion
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	0.1.0.042
+PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	multimedia
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
 
 MAINTAINER=	stas@FreeBSD.org
-COMMENT=	Video playback wrapper library for e17
+COMMENT=	Video playback wrapper library for Enlightenment
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
 USE_EFL=	ecore edje eet embryo evas
+USE_EFL_EVAS_LOADERS=	png jpeg
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/multimedia/emotion/distinfo b/multimedia/emotion/distinfo
index ea9ad31b793e..98aebfcf2332 100644
--- a/multimedia/emotion/distinfo
+++ b/multimedia/emotion/distinfo
@@ -1,3 +1,3 @@
-MD5 (emotion-20070223.tar.bz2) = ef6e89c28b367fa4ed54d853d63694e1
-SHA256 (emotion-20070223.tar.bz2) = 640fc990183682d2f39376dbd65ba9a69b1ebd5a997f379ab7b9cded2d03fb55
-SIZE (emotion-20070223.tar.bz2) = 1433834
+MD5 (emotion-0.1.0.042.tar.bz2) = 123c043d02f4da22fb36eede930a44e5
+SHA256 (emotion-0.1.0.042.tar.bz2) = dcbe478648df63d71482947415d8cc83f1b4d8cd373801d6b1e479315d27cb97
+SIZE (emotion-0.1.0.042.tar.bz2) = 404323
diff --git a/multimedia/emotion/pkg-plist b/multimedia/emotion/pkg-plist
index da6dcdb15dea..ca64d8b743ee 100644
--- a/multimedia/emotion/pkg-plist
+++ b/multimedia/emotion/pkg-plist
@@ -1,16 +1,15 @@
-bin/emotion-config
 bin/emotion_test
 include/Emotion.h
-%%GST%%lib/emotion/emotion_decoder_gstreamer.a
-%%GST%%lib/emotion/emotion_decoder_gstreamer.la
-%%GST%%lib/emotion/emotion_decoder_gstreamer.so
-%%XINE%%lib/emotion/emotion_decoder_xine.a
-%%XINE%%lib/emotion/emotion_decoder_xine.la
-%%XINE%%lib/emotion/emotion_decoder_xine.so
+%%GST%%lib/emotion/gstreamer.a
+%%GST%%lib/emotion/gstreamer.la
+%%GST%%lib/emotion/gstreamer.so
+%%XINE%%lib/emotion/xine.a
+%%XINE%%lib/emotion/xine.la
+%%XINE%%lib/emotion/xine.so
 lib/libemotion.a
 lib/libemotion.la
 lib/libemotion.so
-lib/libemotion.so.0
+lib/libemotion.so.1
 libdata/pkgconfig/emotion.pc
 %%DATADIR%%/data/theme.edj
 @dirrm %%DATADIR%%/data
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index c1f78ff616cf..891f0f197b7e 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ffmpeg
 DISTVERSION=	2007-10-04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ahze
@@ -188,7 +188,7 @@ LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
 PLIST_FILES+=	lib/vhook/drawtext.so
 . endif # freetype2
 . ifdef(WITH_IMLIB2) || exists(${LOCALBASE}/lib/libImlib2.so)
-LIB_DEPENDS+=	Imlib2.4:${PORTSDIR}/graphics/imlib2
+USE_EFL+=	imlib2
 
 PLIST_FILES+=	lib/vhook/imlib2.so
 . else
diff --git a/net/Makefile b/net/Makefile
index b8961ccc6c8c..314c161cab7c 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -122,6 +122,7 @@
     SUBDIR += dtcpclient
     SUBDIR += easysoap
     SUBDIR += echoping
+    SUBDIR += ecore-con
     SUBDIR += ekiga
     SUBDIR += empty
     SUBDIR += enet
diff --git a/net/ecore-con/Makefile b/net/ecore-con/Makefile
new file mode 100644
index 000000000000..0c72e6d2252e
--- /dev/null
+++ b/net/ecore-con/Makefile
@@ -0,0 +1,71 @@
+# New ports collection makefile for:	ecore-con
+# Date created:				17 September 2007
+# Whom:					Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	con
+PORTVERSION=	0.9.9.042
+PORTREVISION=	0
+CATEGORIES=	net
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	ecore-
+DISTNAME=	ecore-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	Enlightenment core abstraction library (con module)
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_LDCONFIG=	yes
+USE_GETOPT_LONG=yes
+USE_EFL=	ecore
+BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_con
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+CONFIGURE_ARGS=	--enable-ecore-con \
+		--disable-ecore-config \
+		--disable-ecore-desktop \
+		--disable-ecore-directfb \
+		--disable-ecore-evas \
+		--disable-ecore-file \
+		--disable-ecore-ipc \
+		--disable-ecore-job \
+		--disable-ecore-sdl \
+		--disable-ecore-txt \
+		--disable-ecore-x \
+		--disable-ecore-imf \
+		--disable-ecore-imf_evas
+
+OPTIONS=	CURL	"Enable Curl support"	on \
+		SSL	"Enable SSL support"	on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_CURL)
+CONFIGURE_ARGS+=	--enable-curl
+LIB_DEPENDS+=		curl.4:${PORTSDIR}/ftp/curl
+.else
+CONFIGURE_ARGS+=	--disable-curl
+.endif
+
+.if !defined(WITHOUT_SSL)
+CONFIGURE_ARGS+=	--enable-openssl
+.else
+CONFIGURE_ARGS+=	--disable-openssl
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -E -e \
+		's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
+		${BUILD_WRKSRC}/Makefile.in
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/ecore-con.pc \
+		${PREFIX}/libdata/pkgconfig/
+
+.include <bsd.port.post.mk>
diff --git a/net/ecore-con/distinfo b/net/ecore-con/distinfo
new file mode 100644
index 000000000000..4672f6a1c167
--- /dev/null
+++ b/net/ecore-con/distinfo
@@ -0,0 +1,3 @@
+MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
+SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
+SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
diff --git a/net/ecore-con/files/patch-configure b/net/ecore-con/files/patch-configure
new file mode 100644
index 000000000000..f94b78947228
--- /dev/null
+++ b/net/ecore-con/files/patch-configure
@@ -0,0 +1,97 @@
+--- configure.orig	2008-02-23 22:33:06.000000000 +0300
++++ configure	2008-02-23 22:36:34.000000000 +0300
+@@ -20543,94 +20543,15 @@
+ if test "${enable_openssl+set}" = set; then
+   enableval=$enable_openssl;  want_openssl=$enableval
+ 
+-fi
+-
+-
+-if test "x$want_openssl" = "xyes"; then
+-
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for SSL" >&5
+-echo $ECHO_N "checking for SSL... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+-    if test -n "$SSL_CFLAGS"; then
+-        pkg_cv_SSL_CFLAGS="$SSL_CFLAGS"
+-    else
+-        if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  pkg_cv_SSL_CFLAGS=`$PKG_CONFIG --cflags "openssl" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+-    fi
+-else
+-	pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+-    if test -n "$SSL_LIBS"; then
+-        pkg_cv_SSL_LIBS="$SSL_LIBS"
+-    else
+-        if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  pkg_cv_SSL_LIBS=`$PKG_CONFIG --libs "openssl" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+-    fi
+-else
+-	pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        SSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "openssl"`
+-        else
+-	        SSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl"`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$SSL_PKG_ERRORS" >&5
+-
+-	{ echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-                 have_openssl="no"
+-
+-elif test $pkg_failed = untried; then
+-	 have_openssl="no"
+-
+-else
+-	SSL_CFLAGS=$pkg_cv_SSL_CFLAGS
+-	SSL_LIBS=$pkg_cv_SSL_LIBS
+-        { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-
+-
+ cat >>confdefs.h <<\_ACEOF
+ #define USE_OPENSSL 1
+ _ACEOF
+ 
+-       requirements_ecore_con="$requirements_ecore_con openssl"
+        # no need to add it to req_ecore_ipc, since they
+        # depends on ecore_con anyway.
+        have_openssl="yes"
+ 
+ fi
+-fi
+ 
+ want_curl="yes"
+ have_curl="no"
diff --git a/net/ecore-con/pkg-descr b/net/ecore-con/pkg-descr
new file mode 100644
index 000000000000..2559668d0e57
--- /dev/null
+++ b/net/ecore-con/pkg-descr
@@ -0,0 +1,5 @@
+A core event abstracter layer and X abstraction layer that makes doing
+selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
+fast, optimised, and convenient.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Ecore/
diff --git a/net/ecore-con/pkg-plist b/net/ecore-con/pkg-plist
new file mode 100644
index 000000000000..47463672d77a
--- /dev/null
+++ b/net/ecore-con/pkg-plist
@@ -0,0 +1,6 @@
+include/Ecore_Con.h
+lib/libecore_con.a
+lib/libecore_con.la
+lib/libecore_con.so
+lib/libecore_con.so.9
+libdata/pkgconfig/ecore-con.pc
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 798018ebbde1..9bda25e5e047 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -161,6 +161,7 @@
     SUBDIR += dvdtape
     SUBDIR += dwatch
     SUBDIR += e2fsprogs
+    SUBDIR += ecore-config
     SUBDIR += eiciel
     SUBDIR += eject
     SUBDIR += empower
diff --git a/sysutils/ecore-config/Makefile b/sysutils/ecore-config/Makefile
new file mode 100644
index 000000000000..b45888a8ffca
--- /dev/null
+++ b/sysutils/ecore-config/Makefile
@@ -0,0 +1,70 @@
+# New ports collection makefile for:	ecore-config
+# Date created:				17 September 2007
+# Whom:					Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	config
+PORTVERSION=	0.9.9.042
+PORTREVISION=	0
+CATEGORIES=	sysutils
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	ecore-
+DISTNAME=	ecore-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	Enlightenment core abstraction library (config module)
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_LDCONFIG=	yes
+USE_GETOPT_LONG=yes
+USE_EFL=	ecore eet evas
+USE_EFL_ECORE=	ipc con
+BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_config
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+CONFIGURE_ARGS=	--enable-ecore-con \
+		--enable-ecore-config \
+		--disable-ecore-desktop \
+		--disable-ecore-directfb \
+		--disable-ecore-evas \
+		--disable-ecore-file \
+		--enable-ecore-ipc \
+		--disable-ecore-job \
+		--disable-ecore-sdl \
+		--disable-ecore-txt \
+		--disable-ecore-x \
+		--disable-ecore-imf \
+		--disable-ecore-imf_evas
+
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore_ipc/\.libs,${LOCALBASE}/lib,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore_con/\.libs,${LOCALBASE}/lib,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore_ipc/libecore_ipc\.la,-lecore_ipc,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore_con/libecore_con\.la,-lecore_con,'\
+		${BUILD_WRKSRC}/Makefile.in ${WRKSRC}/src/bin/Makefile.in
+	@${REINPLACE_CMD} -E \
+		-e 's,../lib/ecore_ipc/.libs/libecore_ipc.la,-lecore_ipc,g' \
+		-e 's,../lib/ecore_con/.libs/libecore_con.la,-lecore_con,g' \
+		-e 's,../lib/ecore/.libs/libecore.la,-lecore,g' \
+		${WRKSRC}/src/bin/Makefile.in
+
+post-build:
+	@(cd ${WRKSRC}/src/bin; ${SETENV} ${MAKE_ENV} \
+		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/ecore-config.pc \
+		${PREFIX}/libdata/pkgconfig/
+
+	@(cd ${WRKSRC}/src/bin; ${SETENV} ${MAKE_ENV} \
+		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+
+.include <bsd.port.mk>
diff --git a/sysutils/ecore-config/distinfo b/sysutils/ecore-config/distinfo
new file mode 100644
index 000000000000..4672f6a1c167
--- /dev/null
+++ b/sysutils/ecore-config/distinfo
@@ -0,0 +1,3 @@
+MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
+SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
+SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
diff --git a/sysutils/ecore-config/pkg-descr b/sysutils/ecore-config/pkg-descr
new file mode 100644
index 000000000000..2559668d0e57
--- /dev/null
+++ b/sysutils/ecore-config/pkg-descr
@@ -0,0 +1,5 @@
+A core event abstracter layer and X abstraction layer that makes doing
+selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
+fast, optimised, and convenient.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Ecore/
diff --git a/sysutils/ecore-config/pkg-plist b/sysutils/ecore-config/pkg-plist
new file mode 100644
index 000000000000..e8ffe0b62bff
--- /dev/null
+++ b/sysutils/ecore-config/pkg-plist
@@ -0,0 +1,7 @@
+bin/ecore_config
+include/Ecore_Config.h
+lib/libecore_config.a
+lib/libecore_config.la
+lib/libecore_config.so
+lib/libecore_config.so.9
+libdata/pkgconfig/ecore-config.pc
diff --git a/sysutils/empower/Makefile b/sysutils/empower/Makefile
index 6366643a5b51..1699d700336f 100644
--- a/sysutils/empower/Makefile
+++ b/sysutils/empower/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	empower
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
@@ -18,27 +18,11 @@ COMMENT=	A graphical sudo tool based on the EFL
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
-USE_EFL=	evas ecore edje
+USE_EFL=	evas ecore edje ewl etk
 WANT_EFL=	yes
 GNU_CONFIGURE=	yes
 
-OPTIONS=	EWL "Build EWL backend" on \
-		ETK "Build ETK backed" off
+PLIST_FILES=	bin/empower \
+		bin/empower-askpass
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITHOUT_EWL) && !defined(WITH_ETK)
-BROKEN=		you should select either ETK or EWL
-.endif
-
-.if !defined(WITHOUT_EWL) || ${HAVE_EFL:Mewl}
-USE_EFL+=	ewl
-PLIST_FILES+=	bin/empower_ewl
-.endif
-
-.if defined(WITH_ETK) || ${HAVE_EFL:Metk}
-USE_EFL+=	etk
-PLIST_FILES+=	bin/empower_etk
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/empower/distinfo b/sysutils/empower/distinfo
index e9d41efe110f..370d4b13dd5a 100644
--- a/sysutils/empower/distinfo
+++ b/sysutils/empower/distinfo
@@ -1,3 +1,3 @@
-MD5 (empower-20070223.tar.bz2) = c7f984c38ad632e6507411b76a3237d8
-SHA256 (empower-20070223.tar.bz2) = ed8098e5a5f7cefa0199b939c386aa12e1ed9a638d39c31f7729f3d3ce1a9d6a
-SIZE (empower-20070223.tar.bz2) = 212599
+MD5 (empower-20080223.tar.bz2) = a7d231d6c71952305cbf6302606109cf
+SHA256 (empower-20080223.tar.bz2) = 95589809ec365df04ff81605ca8d8b1ad45ce17b6dd462b570827db8ec5605fc
+SIZE (empower-20080223.tar.bz2) = 218110
diff --git a/sysutils/extrackt/Makefile b/sysutils/extrackt/Makefile
index 84f84d58cd2f..f5e200db5a3d 100644
--- a/sysutils/extrackt/Makefile
+++ b/sysutils/extrackt/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	extrackt
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
diff --git a/sysutils/extrackt/distinfo b/sysutils/extrackt/distinfo
index 47376b4f041f..38171e15972a 100644
--- a/sysutils/extrackt/distinfo
+++ b/sysutils/extrackt/distinfo
@@ -1,3 +1,3 @@
-MD5 (extrackt-20070223.tar.bz2) = ee399a85d3c69b7da3826a8a5e3b73cf
-SHA256 (extrackt-20070223.tar.bz2) = 49eacb7f183030a3a30e90ddaaf5a9a9c913c4d3b1e83bfb9701d75792319d8e
-SIZE (extrackt-20070223.tar.bz2) = 353002
+MD5 (extrackt-20080223.tar.bz2) = 7be0194bd7153d7e56066ffe1b56ade9
+SHA256 (extrackt-20080223.tar.bz2) = ee2b268d04f24a05b4295d7c14146fc7198f3a6587477763cda47b527ec37d86
+SIZE (extrackt-20080223.tar.bz2) = 354871
diff --git a/textproc/exml/Makefile b/textproc/exml/Makefile
index e3585b1dc568..8c3b5755f2b7 100644
--- a/textproc/exml/Makefile
+++ b/textproc/exml/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	exml
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
diff --git a/textproc/exml/distinfo b/textproc/exml/distinfo
index 22c807cc41e6..84e788027b0d 100644
--- a/textproc/exml/distinfo
+++ b/textproc/exml/distinfo
@@ -1,3 +1,3 @@
-MD5 (exml-20070223.tar.bz2) = ccb3c359e536bb58187b2531dc0e7774
-SHA256 (exml-20070223.tar.bz2) = a61fa98761b7060da3708253b6311f2474da26fd08721978d5b6592bdcea4a4b
-SIZE (exml-20070223.tar.bz2) = 224487
+MD5 (exml-20080223.tar.bz2) = c3e7ae77c747edacad08948d2ca47b57
+SHA256 (exml-20080223.tar.bz2) = d5c0ea11e4520805000a229bdf26b3ff0748107611c3634060a77c2693a855a7
+SIZE (exml-20080223.tar.bz2) = 233102
diff --git a/textproc/exml/pkg-plist b/textproc/exml/pkg-plist
index 5a849cbf0c9a..0c2509b9e300 100644
--- a/textproc/exml/pkg-plist
+++ b/textproc/exml/pkg-plist
@@ -1,4 +1,3 @@
-bin/exml-config
 include/EXML.h
 lib/libexml.a
 lib/libexml.la
diff --git a/x11-fm/entropyfm/Makefile b/x11-fm/entropyfm/Makefile
index e3bd9388e664..87804453621e 100644
--- a/x11-fm/entropyfm/Makefile
+++ b/x11-fm/entropyfm/Makefile
@@ -7,11 +7,11 @@
 #
 
 PORTNAME=	entropyfm
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11-fm
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
-DISTNAME=	${PORTNAME:S,fm$,,}-${PORTVERSION}
+DISTNAME=	entropy-${PORTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An EFL-based file manager
@@ -20,6 +20,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
 USE_EFL=	ecore etk ewl evfs imlib2 epsilon
+USE_EFL_ECORE=	config
 GNU_CONFIGURE=	yes
 
 CFLAGS+=	"-L${LOCALBASE}/lib"
diff --git a/x11-fm/entropyfm/distinfo b/x11-fm/entropyfm/distinfo
index 0c22ba543813..8d28e6295946 100644
--- a/x11-fm/entropyfm/distinfo
+++ b/x11-fm/entropyfm/distinfo
@@ -1,3 +1,3 @@
-MD5 (entropy-20070223.tar.bz2) = 45e35d8fddfe708d960441284b6bc424
-SHA256 (entropy-20070223.tar.bz2) = a73995c99e174e33b938ef9ebc68b58bcc7cd00012d82773ae6448164e2ee9f2
-SIZE (entropy-20070223.tar.bz2) = 479895
+MD5 (entropy-20080223.tar.bz2) = a2871f17fb750faed1576b7f429a7538
+SHA256 (entropy-20080223.tar.bz2) = a38d636b2c660be13df82cbaff9975ceebaa9a1ac9979e59b144aa298c745fda
+SIZE (entropy-20080223.tar.bz2) = 488468
diff --git a/x11-fm/entropyfm/pkg-plist b/x11-fm/entropyfm/pkg-plist
index 17539472455f..4cf5c591ca95 100644
--- a/x11-fm/entropyfm/pkg-plist
+++ b/x11-fm/entropyfm/pkg-plist
@@ -42,6 +42,9 @@ bin/entropy
 %%DATADIR%%/plugins/distrib_thumbnailer.a
 %%DATADIR%%/plugins/distrib_thumbnailer.la
 %%DATADIR%%/plugins/distrib_thumbnailer.so
+%%DATADIR%%/plugins/etk_hover.a
+%%DATADIR%%/plugins/etk_hover.la
+%%DATADIR%%/plugins/etk_hover.so
 %%DATADIR%%/plugins/etk_iconbox.a
 %%DATADIR%%/plugins/etk_iconbox.la
 %%DATADIR%%/plugins/etk_iconbox.so
diff --git a/x11-fm/evidence/Makefile b/x11-fm/evidence/Makefile
index 74e214463304..ecf4f2461d6e 100644
--- a/x11-fm/evidence/Makefile
+++ b/x11-fm/evidence/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	evidence
 PORTVERSION=	0.9.8
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,13 +16,7 @@ MAINTAINER=	freebsd@troback.com
 COMMENT=	Enlightened file-manager
 
 BUILD_DEPENDS=	pngtopnm:${PORTSDIR}/graphics/netpbm
-LIB_DEPENDS=	Imlib2.4:${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 \
-		pcre.0:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
 BROKEN=		Does not compile
 
@@ -31,6 +25,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
 USE_GETTEXT=	yes
+USE_EFL=	imlib2 evas edje ecore embryo eet
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-dbus \
 		--disable-dcop \
diff --git a/x11-themes/e17-splash-takara/Makefile b/x11-themes/e17-splash-takara/Makefile
index 9a273e13f799..9972260f63b5 100644
--- a/x11-themes/e17-splash-takara/Makefile
+++ b/x11-themes/e17-splash-takara/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	takara
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
diff --git a/x11-themes/e17-splash-takara/distinfo b/x11-themes/e17-splash-takara/distinfo
index 933e3f101b9a..bf45b3b3e574 100644
--- a/x11-themes/e17-splash-takara/distinfo
+++ b/x11-themes/e17-splash-takara/distinfo
@@ -1,3 +1,3 @@
-MD5 (init_takara_v1.0.4.edj) = ac8bf79e06fdb87ae19fb7e0ebc08ace
-SHA256 (init_takara_v1.0.4.edj) = a86d2f2d9426dfdd7a8819965cf628949a9e07a449d1126a083d4a3998372dbc
-SIZE (init_takara_v1.0.4.edj) = 183530
+MD5 (init_takara_v1.0.5.edj) = 196308a11622903de33abdeee96f538a
+SHA256 (init_takara_v1.0.5.edj) = 0b89648ee5985e98aab32b8e066bc50cbe2c570c4610ed0fabdb2a3135803195
+SIZE (init_takara_v1.0.5.edj) = 180934
diff --git a/x11-themes/e17-theme-blue_eyed/Makefile b/x11-themes/e17-theme-blue_eyed/Makefile
index d9940da0aa58..06a81503eacb 100644
--- a/x11-themes/e17-theme-blue_eyed/Makefile
+++ b/x11-themes/e17-theme-blue_eyed/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	blue_eyed
-PORTVERSION=	0.6.5.6
-PORTREVISION=	1
+PORTVERSION=	0.6.5.7
+PORTREVISION=	0
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
+MASTER_SITES=	${MASTER_SITE_GET_E} \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITE_SUBDIR=	Themes/E17
 PKGNAMEPREFIX=	e17-theme-
-DISTNAME=	blue_eyed_0.6.5.g_l
+DISTNAME=	blue_eyed_0.6.5.g_ma
 EXTRACT_SUFX=	.edj
 
 MAINTAINER=	stas@FreeBSD.org
diff --git a/x11-themes/e17-theme-blue_eyed/distinfo b/x11-themes/e17-theme-blue_eyed/distinfo
index 8f5ca9db381b..8f5e7d7eb953 100644
--- a/x11-themes/e17-theme-blue_eyed/distinfo
+++ b/x11-themes/e17-theme-blue_eyed/distinfo
@@ -1,3 +1,3 @@
-MD5 (blue_eyed_0.6.5.g_l.edj) = b410d12dd557da981fa0ab4c799636ec
-SHA256 (blue_eyed_0.6.5.g_l.edj) = d924a7f94c2767b3edf5276dad9976af487ad638aa8afaf443d2106cdcf07897
-SIZE (blue_eyed_0.6.5.g_l.edj) = 2024157
+MD5 (blue_eyed_0.6.5.g_ma.edj) = 5280eb184a9ad60a7537a5ea790128d6
+SHA256 (blue_eyed_0.6.5.g_ma.edj) = a9ce13cd92523a24570a49e806541643c30ca2a827d693d2c5d2a943f8ec48e3
+SIZE (blue_eyed_0.6.5.g_ma.edj) = 2370930
diff --git a/x11-themes/e17-theme-cthulhain/Makefile b/x11-themes/e17-theme-cthulhain/Makefile
index d145badde6ee..9c202c241286 100644
--- a/x11-themes/e17-theme-cthulhain/Makefile
+++ b/x11-themes/e17-theme-cthulhain/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	cthulhain
-PORTVERSION=	0.3.9
-PORTREVISION=	1
+PORTVERSION=	0.4.1
+PORTREVISION=	0
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
+MASTER_SITES=	${MASTER_SITE_GET_E} \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITE_SUBDIR=	Themes/E17
 PKGNAMEPREFIX=	e17-theme-
-DISTNAME=	cthulhain-0.3pre9
 EXTRACT_SUFX=	.edj
 
 MAINTAINER=	stas@FreeBSD.org
diff --git a/x11-themes/e17-theme-cthulhain/distinfo b/x11-themes/e17-theme-cthulhain/distinfo
index 50c0af7350fd..17306384bb18 100644
--- a/x11-themes/e17-theme-cthulhain/distinfo
+++ b/x11-themes/e17-theme-cthulhain/distinfo
@@ -1,3 +1,3 @@
-MD5 (cthulhain-0.3pre9.edj) = 6f8cf81342027864a6ebc4f00c438048
-SHA256 (cthulhain-0.3pre9.edj) = 794dda4e3d40d006d0b5b80f5283bb3c8357de4565d3e86c36d0b0e353c9f1e1
-SIZE (cthulhain-0.3pre9.edj) = 2195862
+MD5 (cthulhain-0.4.1.edj) = c371dae5a58ee089afbf545b36da4e7c
+SHA256 (cthulhain-0.4.1.edj) = 8a7f55bf0ae8e3de83b9e7aa8efcacc2e6378f77f8492d40a108a9dbc2e705fc
+SIZE (cthulhain-0.4.1.edj) = 2329966
diff --git a/x11-themes/e17-theme-dali/Makefile b/x11-themes/e17-theme-dali/Makefile
index d8dfd51a084b..09679d1a6025 100644
--- a/x11-themes/e17-theme-dali/Makefile
+++ b/x11-themes/e17-theme-dali/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	dali
-PORTVERSION=	0.1
-PORTREVISION=	1
+PORTVERSION=	4.1b
+PORTREVISION=	0
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
+MASTER_SITES=	${MASTER_SITE_GET_E} \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITE_SUBDIR=	Themes/E17
 PKGNAMEPREFIX=	e17-theme-
-DISTNAME=	${PORTNAME}
+DISTNAME=	${PORTNAME}${PORTVERSION:S,.,,}
 EXTRACT_SUFX=	.edj
 
 MAINTAINER=	stas@FreeBSD.org
diff --git a/x11-themes/e17-theme-dali/distinfo b/x11-themes/e17-theme-dali/distinfo
index 1f5ad7b58f66..fb048d7bc4b2 100644
--- a/x11-themes/e17-theme-dali/distinfo
+++ b/x11-themes/e17-theme-dali/distinfo
@@ -1,3 +1,3 @@
-MD5 (dali.edj) = 6ce13072052dc1b896e0478f940ac964
-SHA256 (dali.edj) = ad45c6ec1bc6e1cd5c79fa73ef7893642e5e0970b48ed2e97e2bcef6f22d5e21
-SIZE (dali.edj) = 4489367
+MD5 (dali41b.edj) = 71511291a186c2710e8d85f45f5d4696
+SHA256 (dali41b.edj) = 2d317331312800bf324ed0475e2bb4c7bdd7c831a25e3f7eaf45a1fa9023216c
+SIZE (dali41b.edj) = 5151238
diff --git a/x11-themes/e17-theme-darkness/Makefile b/x11-themes/e17-theme-darkness/Makefile
index 8e7a97178a31..a20fb2bcf07e 100644
--- a/x11-themes/e17-theme-darkness/Makefile
+++ b/x11-themes/e17-theme-darkness/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	darkness
-PORTVERSION=	0.99.037.3
-PORTREVISION=	1
+PORTVERSION=	0.99.037.4
+PORTREVISION=	0
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
+MASTER_SITES=	${MASTER_SITE_GET_E} \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITE_SUBDIR=	Themes/E17
 PKGNAMEPREFIX=	e17-theme-
 DISTNAME=	${PORTNAME}_by_saturn_vk
 EXTRACT_SUFX=	.edj
diff --git a/x11-themes/e17-theme-darkness/distinfo b/x11-themes/e17-theme-darkness/distinfo
index c0736d2f68ef..1a07673341a3 100644
--- a/x11-themes/e17-theme-darkness/distinfo
+++ b/x11-themes/e17-theme-darkness/distinfo
@@ -1,3 +1,3 @@
-MD5 (darkness_by_saturn_vk.edj) = 97b7308808e60b86fe437147bad51144
-SHA256 (darkness_by_saturn_vk.edj) = 0c17f7de7b5f807e1eef6bc853ca6230fbf5cac3051cbefe43219a4d9c8b8c59
-SIZE (darkness_by_saturn_vk.edj) = 4012687
+MD5 (darkness_by_saturn_vk.edj) = 84f9376108e04cf3bddcfaa160a5edd7
+SHA256 (darkness_by_saturn_vk.edj) = 7c0ae93268abd6212165a8f270cb557ee864bb62f46162ac853edb27f2733099
+SIZE (darkness_by_saturn_vk.edj) = 5401434
diff --git a/x11-themes/e17-theme-gant/Makefile b/x11-themes/e17-theme-gant/Makefile
index 0e0462a28b3e..de13f93bbd9b 100644
--- a/x11-themes/e17-theme-gant/Makefile
+++ b/x11-themes/e17-theme-gant/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	gant
-PORTVERSION=	0.0.4
-PORTREVISION=	1
+PORTVERSION=	0.0.9
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
+MASTER_SITES=	${MASTER_SITE_GET_E} \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITE_SUBDIR=	Themes/E17
 PKGNAMEPREFIX=	e17-theme-
-DISTNAME=	${PORTNAME}
+DISTNAME=	${PORTNAME}-e17_${PORTVERSION}
 EXTRACT_SUFX=	.edj
 
 MAINTAINER=	stas@FreeBSD.org
diff --git a/x11-themes/e17-theme-gant/distinfo b/x11-themes/e17-theme-gant/distinfo
index f2609d454c71..2042890606b5 100644
--- a/x11-themes/e17-theme-gant/distinfo
+++ b/x11-themes/e17-theme-gant/distinfo
@@ -1,3 +1,3 @@
-MD5 (gant.edj) = 82a6bfbd3dc61c7bb312ffadfc230ff8
-SHA256 (gant.edj) = 3dd193bedfe44f670a4f80e5c18788ad3e94cad999e931a03f973c24801cda70
-SIZE (gant.edj) = 2928734
+MD5 (gant-e17_0.0.9.edj) = 574bf6e34bae053ab56404d1cb29d14e
+SHA256 (gant-e17_0.0.9.edj) = 9891296e0651ca60a6d1111802ef9d7a0bd292cecd1a38dad153a4b5ae056678
+SIZE (gant-e17_0.0.9.edj) = 4145125
diff --git a/x11-themes/e17-theme-japan2007/Makefile b/x11-themes/e17-theme-japan2007/Makefile
index 730c4ffc0cd2..383cbcaf1743 100644
--- a/x11-themes/e17-theme-japan2007/Makefile
+++ b/x11-themes/e17-theme-japan2007/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	japan2007
-PORTVERSION=	0.9.6
-PORTREVISION=	1
+PORTVERSION=	0.9.7
+PORTREVISION=	0
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
+MASTER_SITES=	${MASTER_SITE_GET_E} \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITE_SUBDIR=	Themes/E17
 PKGNAMEPREFIX=	e17-theme-
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.edj
diff --git a/x11-themes/e17-theme-japan2007/distinfo b/x11-themes/e17-theme-japan2007/distinfo
index f5b3bb3446d1..2c5b4d603d22 100644
--- a/x11-themes/e17-theme-japan2007/distinfo
+++ b/x11-themes/e17-theme-japan2007/distinfo
@@ -1,3 +1,3 @@
-MD5 (japan2007.edj) = 821285130431957bd6029723e38ffde6
-SHA256 (japan2007.edj) = 025d8741b1ca65bf3c16a54082883db3688f203d05cdc3ca8b9f14c56c518691
-SIZE (japan2007.edj) = 1600130
+MD5 (japan2007.edj) = 676124a0105ddacf6b2efa8e8f87e474
+SHA256 (japan2007.edj) = 09e802e49f3c9e01303b45a980d59ea24628331287a150e093df25c67e250edd
+SIZE (japan2007.edj) = 1686515
diff --git a/x11-themes/e17-theme-kor/Makefile b/x11-themes/e17-theme-kor/Makefile
index 1569911ee6bd..f959daf96876 100644
--- a/x11-themes/e17-theme-kor/Makefile
+++ b/x11-themes/e17-theme-kor/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	kor
-PORTVERSION=	0.0.4.3
-PORTREVISION=	1
+PORTVERSION=	0.0.6
+PORTREVISION=	0
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
+MASTER_SITES=	${MASTER_SITE_GET_E} \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITE_SUBDIR=	Themes/E17
 PKGNAMEPREFIX=	e17-theme-
-DISTNAME=	${PORTNAME}_0_0_4c
+DISTNAME=	${PORTNAME}_${PORTVERSION:S,.,_,g}
 EXTRACT_SUFX=	.edj
 
 MAINTAINER=	stas@FreeBSD.org
diff --git a/x11-themes/e17-theme-kor/distinfo b/x11-themes/e17-theme-kor/distinfo
index 72633b9d5cbe..2ac22f2bcb0c 100644
--- a/x11-themes/e17-theme-kor/distinfo
+++ b/x11-themes/e17-theme-kor/distinfo
@@ -1,3 +1,3 @@
-MD5 (kor_0_0_4c.edj) = 19848bf3a9f96944507f9a7c9c1c4a20
-SHA256 (kor_0_0_4c.edj) = 4f097eb054b64b4b2e7e5a2e320f683cb04eeeeb727626f2b8b625eaae6af688
-SIZE (kor_0_0_4c.edj) = 2499628
+MD5 (kor_0_0_6.edj) = 56cc8e1684c28c9d44fedb58be4a6e05
+SHA256 (kor_0_0_6.edj) = 945554e2fd00255b63e9073b4b2bbe840763d2c2efe7675aab48f8f86c400457
+SIZE (kor_0_0_6.edj) = 2690997
diff --git a/x11-themes/e17-theme-milky/Makefile b/x11-themes/e17-theme-milky/Makefile
index ef5568b05f8f..01599188451f 100644
--- a/x11-themes/e17-theme-milky/Makefile
+++ b/x11-themes/e17-theme-milky/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	milky
-PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTVERSION=	1.0.4
+PORTREVISION=	0
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
+MASTER_SITES=	${MASTER_SITE_GET_E} \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITE_SUBDIR=	Themes/E17
 PKGNAMEPREFIX=	e17-theme-
 DISTNAME=	Milky
 EXTRACT_SUFX=	.edj
diff --git a/x11-themes/e17-theme-night_bling/Makefile b/x11-themes/e17-theme-night_bling/Makefile
index 72031ed90765..8f22a301141e 100644
--- a/x11-themes/e17-theme-night_bling/Makefile
+++ b/x11-themes/e17-theme-night_bling/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	night_bling
-PORTVERSION=	1.1
-PORTREVISION=	1
+PORTVERSION=	1.2
+PORTREVISION=	0
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
+MASTER_SITES=	${MASTER_SITE_GET_E} \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITE_SUBDIR=	Themes/E17
 PKGNAMEPREFIX=	e17-theme-
-DISTNAME=	${PORTNAME}
+DISTNAME=	${PORTNAME}2
 EXTRACT_SUFX=	.edj
 
 MAINTAINER=	stas@FreeBSD.org
diff --git a/x11-themes/e17-theme-night_bling/distinfo b/x11-themes/e17-theme-night_bling/distinfo
index a525fb210211..8d07f807eb9f 100644
--- a/x11-themes/e17-theme-night_bling/distinfo
+++ b/x11-themes/e17-theme-night_bling/distinfo
@@ -1,3 +1,3 @@
-MD5 (night_bling.edj) = 8953ce85dfb6e91686fb862450b57e4c
-SHA256 (night_bling.edj) = f2843f994aa836f3709475b86f43084cef51bdd77f636d790964c55b24a0c6e5
-SIZE (night_bling.edj) = 2496365
+MD5 (night_bling2.edj) = e2ae2a92bfd29c53f87b4e3c114815fd
+SHA256 (night_bling2.edj) = fde811453fc0b02435345ae372c4d6d3de76a67160190bf3bec375b0b3731429
+SIZE (night_bling2.edj) = 2522855
diff --git a/x11-themes/e17-theme-simply_white/Makefile b/x11-themes/e17-theme-simply_white/Makefile
index 8faa30cd84df..4099d80f6444 100644
--- a/x11-themes/e17-theme-simply_white/Makefile
+++ b/x11-themes/e17-theme-simply_white/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	simply_white
-PORTVERSION=	0.6
-PORTREVISION=	1
+PORTVERSION=	0.8.5
+PORTREVISION=	0
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
+MASTER_SITES=	${MASTER_SITE_GET_E} \
 		ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITE_SUBDIR=	Themes/E17
 PKGNAMEPREFIX=	e17-theme-
-DISTNAME=	simply-white
+DISTNAME=	simply-white-${PORTVERSION}
 EXTRACT_SUFX=	.edj
 
 MAINTAINER=	stas@FreeBSD.org
diff --git a/x11-themes/e17-theme-simply_white/distinfo b/x11-themes/e17-theme-simply_white/distinfo
index bcfb994bd1ab..731a07862c8f 100644
--- a/x11-themes/e17-theme-simply_white/distinfo
+++ b/x11-themes/e17-theme-simply_white/distinfo
@@ -1,3 +1,3 @@
-MD5 (simply-white.edj) = 74746edd8d84c9ce6bb5d9969f27c616
-SHA256 (simply-white.edj) = 7294f2ae2e535397cc3df061a9c538400d0b36e7bbd514d706a18d0e3d0b90c6
-SIZE (simply-white.edj) = 1978867
+MD5 (simply-white-0.8.5.edj) = 1cc881f310362e57f3f113fe1362c698
+SHA256 (simply-white-0.8.5.edj) = 23c8f020ad9eb3e10a7fdc1f3ce042e8b1a4d14624c449495e5e2afcb0302f73
+SIZE (simply-white-0.8.5.edj) = 2829718
diff --git a/x11-toolkits/enhance/Makefile b/x11-toolkits/enhance/Makefile
index 05bb44e5a3a7..ea053d3f2564 100644
--- a/x11-toolkits/enhance/Makefile
+++ b/x11-toolkits/enhance/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	enhance
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
diff --git a/x11-toolkits/enhance/distinfo b/x11-toolkits/enhance/distinfo
index 76e1752bd8fa..5d96744a8356 100644
--- a/x11-toolkits/enhance/distinfo
+++ b/x11-toolkits/enhance/distinfo
@@ -1,3 +1,3 @@
-MD5 (enhance-20070223.tar.bz2) = 225a7fd36dea32b908a4e89de43c58b8
-SHA256 (enhance-20070223.tar.bz2) = 657e8cbe269832f4e42cf08111e4cb164fa37095f41687ae912ddfdaceebf759
-SIZE (enhance-20070223.tar.bz2) = 246303
+MD5 (enhance-20080223.tar.bz2) = 41af8732780a25e10957de7bfe0ae457
+SHA256 (enhance-20080223.tar.bz2) = 90f30ec5dd76a366e7b30c211193160368a3178f977009e66584665eea85aa1c
+SIZE (enhance-20080223.tar.bz2) = 248188
diff --git a/x11-toolkits/enhance/pkg-plist b/x11-toolkits/enhance/pkg-plist
index d9cdc08fc335..8093beb063e3 100644
--- a/x11-toolkits/enhance/pkg-plist
+++ b/x11-toolkits/enhance/pkg-plist
@@ -4,3 +4,4 @@ lib/libenhance.a
 lib/libenhance.la
 lib/libenhance.so
 lib/libenhance.so.0
+libdata/pkgconfig/enhance.pc
diff --git a/x11-toolkits/etk/Makefile b/x11-toolkits/etk/Makefile
index 9dd30019adab..7a3321a6ffda 100644
--- a/x11-toolkits/etk/Makefile
+++ b/x11-toolkits/etk/Makefile
@@ -7,10 +7,12 @@
 #
 
 PORTNAME=	etk
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	0.1.0.042
+PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	A comprehensive toolkit based on the EFL
@@ -20,7 +22,10 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
 USE_EFL=	evas ecore edje
+USE_EFL_ECORE=	file x11 imf imf_evas
+USE_EFL_EVAS_LOADERS=	png jpeg
 USE_LDCONFIG=	yes
+
 # NLS is mandatory
 USE_GETTEXT=	yes
 LDFLAGS=	"-lintl"
diff --git a/x11-toolkits/etk/distinfo b/x11-toolkits/etk/distinfo
index 59c18bf153f2..58db7677f9b8 100644
--- a/x11-toolkits/etk/distinfo
+++ b/x11-toolkits/etk/distinfo
@@ -1,3 +1,3 @@
-MD5 (etk-20070223.tar.bz2) = 3c318b3a55c85d9e1cdb82492df401d8
-SHA256 (etk-20070223.tar.bz2) = db400ae273bed157edb0178d868de9c2fd01ce4085462eb48b0fb45bdb13e10e
-SIZE (etk-20070223.tar.bz2) = 2329953
+MD5 (etk-0.1.0.042.tar.bz2) = 6c1f4c204f2227476cb232127156113f
+SHA256 (etk-0.1.0.042.tar.bz2) = 824f676d2c2723eb2ad1866c78aba8622cdef099ab8597feb2be917e0e252f38
+SIZE (etk-0.1.0.042.tar.bz2) = 2217975
diff --git a/x11-toolkits/etk/files/patch-configure b/x11-toolkits/etk/files/patch-configure
deleted file mode 100644
index 3de7e5ab2bc2..000000000000
--- a/x11-toolkits/etk/files/patch-configure
+++ /dev/null
@@ -1,30 +0,0 @@
---- configure.orig	Thu Sep 28 00:24:04 2006
-+++ configure	Thu Sep 28 00:24:12 2006
-@@ -22026,27 +22026,6 @@
-     ;;
- esac
- 
--function vser
--{
--  v=$1
--  VSTART=`echo $v | awk -F_ '{printf("%s", $1);}'`
--  V1=`echo $VSTART | awk -F\. '{printf("%s", $1);}'`
--  V2=`echo $VSTART | awk -F\. '{printf("%s", $2);}'`
--  V3=`echo $VSTART | awk -F\. '{printf("%s", $3);}'`
--  V4="0"
--  VEND=`echo $v | awk -F_ '{printf("%s", $2);}'`
--  if test -n "$VEND"; then
--    V4=`echo $VEND | sed s/pre//`
--  fi
--  V3=$(( $V3 * 100  ));
--  V2=$(( $V2 * 10000  ));
--  V1=$(( $V1 * 1000000  ));
--  V=$(( $V4 + $V3 + $V2 + $V1 ));
--  echo $V
--}
--
--
--
- # Check whether --with-evas-prefix was given.
- if test "${with_evas_prefix+set}" = set; then
-   withval=$with_evas_prefix; evas_config_prefix="$withval"
diff --git a/x11-toolkits/etk/pkg-plist b/x11-toolkits/etk/pkg-plist
index d3a932796a02..30c83cd89a1f 100644
--- a/x11-toolkits/etk/pkg-plist
+++ b/x11-toolkits/etk/pkg-plist
@@ -1,4 +1,3 @@
-bin/etk-config
 bin/etk_prefs
 bin/etk_test
 include/Etk_Engine_Ecore_Evas.h
@@ -14,6 +13,7 @@ include/etk/etk_canvas.h
 include/etk/etk_check_button.h
 include/etk/etk_colorpicker.h
 include/etk/etk_combobox.h
+include/etk/etk_combobox_entry.h
 include/etk/etk_config.h
 include/etk/etk_container.h
 include/etk/etk_dialog.h
@@ -32,6 +32,8 @@ include/etk/etk_image.h
 include/etk/etk_label.h
 include/etk/etk_main.h
 include/etk/etk_marshallers.h
+include/etk/etk_mdi_area.h
+include/etk/etk_mdi_window.h
 include/etk/etk_menu.h
 include/etk/etk_menu_bar.h
 include/etk/etk_menu_item.h
@@ -59,7 +61,9 @@ include/etk/etk_stock.h
 include/etk/etk_string.h
 include/etk/etk_table.h
 include/etk/etk_text_view.h
+include/etk/etk_text_view2.h
 include/etk/etk_textblock.h
+include/etk/etk_textblock2.h
 include/etk/etk_theme.h
 include/etk/etk_toggle_button.h
 include/etk/etk_tool_button.h
@@ -83,6 +87,9 @@ lib/etk/engines/ecore_evas_gl_x11.so
 lib/etk/engines/ecore_evas_software_x11.a
 lib/etk/engines/ecore_evas_software_x11.la
 lib/etk/engines/ecore_evas_software_x11.so
+lib/etk/engines/ecore_evas_software_x11_16.a
+lib/etk/engines/ecore_evas_software_x11_16.la
+lib/etk/engines/ecore_evas_software_x11_16.so
 lib/etk/engines/ecore_evas_x11.a
 lib/etk/engines/ecore_evas_x11.la
 lib/etk/engines/ecore_evas_x11.so
@@ -121,7 +128,6 @@ libdata/pkgconfig/etk.pc
 share/locale/fr/LC_MESSAGES/etk.mo
 @dirrm %%DATADIR%%/wm
 @dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%/pointers
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%/fonts
diff --git a/x11-toolkits/ewl/Makefile b/x11-toolkits/ewl/Makefile
index b983551de18e..c3c517779218 100644
--- a/x11-toolkits/ewl/Makefile
+++ b/x11-toolkits/ewl/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	ewl
-PORTVERSION=	20070223
-PORTREVISION=	1
-PORTEPOCH=	1
+PORTVERSION=	0.5.2.042
+PORTREVISION=	0
+PORTEPOCH=	2
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Enlightened Widget Library
@@ -19,12 +20,20 @@ GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
-USE_EFL=	embryo edb evas edje ecore
+USE_EFL=	embryo edb evas edje ecore efreet
+USE_EFL_ECORE=	txt file
 WANT_EFL=	yes
 USE_LDCONFIG=	yes
 
+CONFIGURE_ARGS=	--disable-tests
+
 OPTIONS=	EPSILON	"Enable Epsilon Support for Ewl_Image" on \
-		EMOTION "Enable Emotion Support for Ewl_Media" on
+		EMOTION "Enable Emotion Support for Ewl_Media" on \
+		SOFTX11	"Enable software X11 evas engine support" on \
+		XRENDER	"Enable XRender evas engine support" on \
+		GL	"Enable OpenGL evas engine support" on \
+		BUFFER	"Enable buffer evas engine support" on \
+		SDL	"Enable SDL evas engine support" off
 
 .include <bsd.port.pre.mk>
 
@@ -34,22 +43,65 @@ BROKEN=		does not compile on ${ARCH}
 
 .if !defined(WITHOUT_EPSILON) || ${HAVE_EFL:Mepsilon}
 USE_EFL+=	epsilon
-PLIST_SUB+=	EPSILON=""
-.else
-PLIST_SUB+=	EPSILON="@comment "
 .endif
 
 .if !defined(WITHOUT_EMOTION) || ${HAVE_EFL:Memotion}
 USE_EFL+=	emotion
-PLIST_SUB+=	EMOTION=""
+.endif
+
+.if !defined(WITHOUT_SOFTX11)
+USE_EVAS_ENGINES+=	x11
+CONFIGURE_ARGS+=	--enable-software-x11
+PLIST_SUB+=		SOFTX11=""
+WITH_ECORE_X=		yes
+.else
+CONFIGURE_ARGS+=	--disable-software-x11
+PLIST_SUB+=		SOFTX11="@comment "
+.endif
+
+.if !defined(WITHOUT_XRENDER)
+USE_EVAS_ENGINES+=	xrender
+CONFIGURE_ARGS+=	--enable-xrender-x11
+PLIST_SUB+=		XRENDER=""
+WITH_ECORE_X=		yes
+.else
+CONFIGURE_ARGS+=	--disable-xrender-x11
+PLIST_SUB+=		XRENDER="@comment "
+.endif
+
+.if !defined(WITHOUT_GL)
+USE_EVAS_ENGINES+=	opengl
+CONFIGURE_ARGS+=	--enable-opengl-x11
+PLIST_SUB+=		GL=""
+WITH_ECORE_X=		yes
+.else
+CONFIGURE_ARGS+=	--disable-opengl-x11
+PLIST_SUB+=		GL="@comment "
+.endif
+
+.if defined(WITH_SDL)
+CONFIGURE_ARGS+=	--enable-software-sdl
+PLIST_SUB+=		SDL=""
+USE_EFL_ECORE+=		sdl
+.else
+CONFIGURE_ARGS+=	--disable-software-sdl
+PLIST_SUB+=		SDL="@comment "
+.endif
+
+.if defined(WITH_ECORE_X)
+PLIST_SUB+=		X11=""
+USE_EFL_ECORE+=		x11
 .else
-PLIST_SUB+=	EMOTION="@comment "
+PLIST_SUB+=		X11="@comment "
 .endif
 
-.if exists(${LOCALBASE}/include/Evas_Engine_GL_X11.h)
-PLIST_SUB+=	EVAS_GL=""
+.if !defined(WITHOUT_BUFFER)
+USE_EVAS_ENGINES+=	buffer
+CONFIGURE_ARGS+=	--enable-buffer
+PLIST_SUB+=		BUFFER=""
 .else
-PLIST_SUB+=	EVAS_GL="@comment "
+CONFIGURE_ARGS+=	--disable-buffer
+PLIST_SUB+=		BUFFER="@comment "
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/ewl/distinfo b/x11-toolkits/ewl/distinfo
index e2a5d356edbb..4ceab4eb4dbd 100644
--- a/x11-toolkits/ewl/distinfo
+++ b/x11-toolkits/ewl/distinfo
@@ -1,3 +1,3 @@
-MD5 (ewl-20070223.tar.bz2) = 21ad5cf8873fae88ce672e72001649f3
-SHA256 (ewl-20070223.tar.bz2) = 781454e2412e169547772d3e2c777d782d5a6ce26a80a9bd0831d9cbb70ca293
-SIZE (ewl-20070223.tar.bz2) = 3018085
+MD5 (ewl-0.5.2.042.tar.bz2) = c25a57cdee3e58b016ad8ad5e0767902
+SHA256 (ewl-0.5.2.042.tar.bz2) = dd6b496b3a94925a24ced82a0150b8778f29cda20a9c2f9ac18807fe7497c431
+SIZE (ewl-0.5.2.042.tar.bz2) = 3090006
diff --git a/x11-toolkits/ewl/pkg-plist b/x11-toolkits/ewl/pkg-plist
index ff4a5eb1fd8e..0305f6508228 100644
--- a/x11-toolkits/ewl/pkg-plist
+++ b/x11-toolkits/ewl/pkg-plist
@@ -1,9 +1,5 @@
-bin/ewl-config
 bin/ewl_config
-bin/ewl_embed_test
-bin/ewl_simple_test
-bin/ewl_test
-etc/ewl/ewl.cfg
+%%ETCDIR%%/ewl.cfg
 include/ewl/Ewl.h
 include/ewl/Ewl_Test.h
 include/ewl/ewl_attach.h
@@ -21,6 +17,7 @@ include/ewl/ewl_colorpicker.h
 include/ewl/ewl_combo.h
 include/ewl/ewl_config.h
 include/ewl/ewl_container.h
+include/ewl/ewl_context_menu.h
 include/ewl/ewl_cursor.h
 include/ewl/ewl_datepicker.h
 include/ewl/ewl_debug.h
@@ -34,10 +31,8 @@ include/ewl/ewl_events.h
 include/ewl/ewl_expansion.h
 include/ewl/ewl_filedialog.h
 include/ewl/ewl_filelist.h
-include/ewl/ewl_filelist_column.h
-include/ewl/ewl_filelist_icon.h
-include/ewl/ewl_filelist_list.h
-include/ewl/ewl_filelist_tree.h
+include/ewl/ewl_filelist_model.h
+include/ewl/ewl_filelist_view.h
 include/ewl/ewl_filepicker.h
 include/ewl/ewl_floater.h
 include/ewl/ewl_freebox.h
@@ -53,7 +48,6 @@ include/ewl/ewl_list.h
 include/ewl/ewl_macros.h
 include/ewl/ewl_media.h
 include/ewl/ewl_menu.h
-include/ewl/ewl_menu_base.h
 include/ewl/ewl_menu_item.h
 include/ewl/ewl_menubar.h
 include/ewl/ewl_misc.h
@@ -81,13 +75,16 @@ include/ewl/ewl_statusbar.h
 include/ewl/ewl_stock.h
 include/ewl/ewl_table.h
 include/ewl/ewl_text.h
+include/ewl/ewl_text_context.h
+include/ewl/ewl_text_fmt.h
+include/ewl/ewl_text_trigger.h
 include/ewl/ewl_theme.h
 include/ewl/ewl_toolbar.h
 include/ewl/ewl_tree.h
-include/ewl/ewl_tree2.h
-include/ewl/ewl_tree2_view.h
-include/ewl/ewl_tree2_view_plain.h
-include/ewl/ewl_tree2_view_scrolled.h
+include/ewl/ewl_tree_view.h
+include/ewl/ewl_tree_view_freebox.h
+include/ewl/ewl_tree_view_plain.h
+include/ewl/ewl_tree_view_scrolled.h
 include/ewl/ewl_view.h
 include/ewl/ewl_widget.h
 include/ewl/ewl_window.h
@@ -95,254 +92,46 @@ lib/ewl/engines/evas.a
 lib/ewl/engines/evas.la
 lib/ewl/engines/evas.so
 lib/ewl/engines/evas.so.1
-lib/ewl/engines/evas_buffer.a
-lib/ewl/engines/evas_buffer.la
-lib/ewl/engines/evas_buffer.so
-lib/ewl/engines/evas_buffer.so.1
-%%EVAS_GL%%lib/ewl/engines/evas_gl_x11.a
-%%EVAS_GL%%lib/ewl/engines/evas_gl_x11.la
-%%EVAS_GL%%lib/ewl/engines/evas_gl_x11.so
-lib/ewl/engines/evas_software_x11.a
-lib/ewl/engines/evas_software_x11.la
-lib/ewl/engines/evas_software_x11.so
-lib/ewl/engines/evas_software_x11.so.1
-lib/ewl/engines/evas_xrender_x11.a
-lib/ewl/engines/evas_xrender_x11.la
-lib/ewl/engines/evas_xrender_x11.so
-lib/ewl/engines/evas_xrender_x11.so.1
-lib/ewl/engines/x11.a
-lib/ewl/engines/x11.la
-lib/ewl/engines/x11.so
-lib/ewl/engines/x11.so.1
+%%BUFFER%%lib/ewl/engines/evas_buffer.a
+%%BUFFER%%lib/ewl/engines/evas_buffer.la
+%%BUFFER%%lib/ewl/engines/evas_buffer.so
+%%BUFFER%%lib/ewl/engines/evas_buffer.so.1
+%%GL%%lib/ewl/engines/evas_gl_x11.a
+%%GL%%lib/ewl/engines/evas_gl_x11.la
+%%GL%%lib/ewl/engines/evas_gl_x11.so
+%%GL%%lib/ewl/engines/evas_gl_x11.so.1
+%%SOFTX11%%lib/ewl/engines/evas_software_x11.a
+%%SOFTX11%%lib/ewl/engines/evas_software_x11.la
+%%SOFTX11%%lib/ewl/engines/evas_software_x11.so
+%%SOFTX11%%lib/ewl/engines/evas_software_x11.so.1
+%%SDL%%lib/ewl/engines/evas_software_sdl.a
+%%SDL%%lib/ewl/engines/evas_software_sdl.la
+%%SDL%%lib/ewl/engines/evas_software_sdl.so
+%%SDL%%lib/ewl/engines/evas_software_sdl.so.1
+%%XRENDER%%lib/ewl/engines/evas_xrender_x11.a
+%%XRENDER%%lib/ewl/engines/evas_xrender_x11.la
+%%XRENDER%%lib/ewl/engines/evas_xrender_x11.so
+%%XRENDER%%lib/ewl/engines/evas_xrender_x11.so.1
+%%X11%%lib/ewl/engines/x11.a
+%%X11%%lib/ewl/engines/x11.la
+%%X11%%lib/ewl/engines/x11.so
+%%X11%%lib/ewl/engines/x11.so.1
 lib/ewl/plugins/ewl_io_manager_image_plugin.a
 lib/ewl/plugins/ewl_io_manager_image_plugin.la
 lib/ewl/plugins/ewl_io_manager_image_plugin.so
+lib/ewl/plugins/ewl_io_manager_text_c_plugin.a
+lib/ewl/plugins/ewl_io_manager_text_c_plugin.la
+lib/ewl/plugins/ewl_io_manager_text_c_plugin.so
 lib/ewl/plugins/ewl_io_manager_text_plugin.a
 lib/ewl/plugins/ewl_io_manager_text_plugin.la
 lib/ewl/plugins/ewl_io_manager_text_plugin.so
-lib/ewl/plugins/ewl_io_manager_text_c_plugin.so
-lib/ewl/plugins/ewl_io_manager_text_c_plugin.la
-lib/ewl/plugins/ewl_io_manager_text_c_plugin.a
-lib/ewl/tests/ewl_border.a
-lib/ewl/tests/ewl_border.la
-lib/ewl/tests/ewl_border.so
-lib/ewl/tests/ewl_box.a
-lib/ewl/tests/ewl_box.la
-lib/ewl/tests/ewl_box.so
-lib/ewl/tests/ewl_button.a
-lib/ewl/tests/ewl_button.la
-lib/ewl/tests/ewl_button.so
-lib/ewl/tests/ewl_calendar.a
-lib/ewl/tests/ewl_calendar.la
-lib/ewl/tests/ewl_calendar.so
-lib/ewl/tests/ewl_colordialog.a
-lib/ewl/tests/ewl_colordialog.la
-lib/ewl/tests/ewl_colordialog.so
-lib/ewl/tests/ewl_colorpicker.a
-lib/ewl/tests/ewl_colorpicker.la
-lib/ewl/tests/ewl_colorpicker.so
-lib/ewl/tests/ewl_combo.a
-lib/ewl/tests/ewl_combo.la
-lib/ewl/tests/ewl_combo.so
-lib/ewl/tests/ewl_container.a
-lib/ewl/tests/ewl_container.la
-lib/ewl/tests/ewl_container.so
-lib/ewl/tests/ewl_datepicker.a
-lib/ewl/tests/ewl_datepicker.la
-lib/ewl/tests/ewl_datepicker.so
-lib/ewl/tests/ewl_dialog.a
-lib/ewl/tests/ewl_dialog.la
-lib/ewl/tests/ewl_dialog.so
-lib/ewl/tests/ewl_dnd_snoop.a
-lib/ewl/tests/ewl_dnd_snoop.la
-lib/ewl/tests/ewl_dnd_snoop.so
-lib/ewl/tests/ewl_engine.a
-lib/ewl/tests/ewl_engine.la
-lib/ewl/tests/ewl_engine.so
-lib/ewl/tests/ewl_entry.a
-lib/ewl/tests/ewl_entry.la
-lib/ewl/tests/ewl_entry.so
-lib/ewl/tests/ewl_filedialog.a
-lib/ewl/tests/ewl_filedialog.la
-lib/ewl/tests/ewl_filedialog.so
-lib/ewl/tests/ewl_filepicker.a
-lib/ewl/tests/ewl_filepicker.la
-lib/ewl/tests/ewl_filepicker.so
-lib/ewl/tests/ewl_floater.a
-lib/ewl/tests/ewl_floater.la
-lib/ewl/tests/ewl_floater.so
-lib/ewl/tests/ewl_freebox.a
-lib/ewl/tests/ewl_freebox.la
-lib/ewl/tests/ewl_freebox.so
-lib/ewl/tests/ewl_fullscreen.a
-lib/ewl/tests/ewl_fullscreen.la
-lib/ewl/tests/ewl_fullscreen.so
-lib/ewl/tests/ewl_grid.a
-lib/ewl/tests/ewl_grid.la
-lib/ewl/tests/ewl_grid.so
-lib/ewl/tests/ewl_histogram.a
-lib/ewl/tests/ewl_histogram.la
-lib/ewl/tests/ewl_histogram.so
-lib/ewl/tests/ewl_icon.a
-lib/ewl/tests/ewl_icon.la
-lib/ewl/tests/ewl_icon.so
-lib/ewl/tests/ewl_icon_theme.a
-lib/ewl/tests/ewl_icon_theme.la
-lib/ewl/tests/ewl_icon_theme.so
-lib/ewl/tests/ewl_image.a
-lib/ewl/tests/ewl_image.la
-lib/ewl/tests/ewl_image.so
-lib/ewl/tests/ewl_image_thumbnail.a
-lib/ewl/tests/ewl_image_thumbnail.la
-lib/ewl/tests/ewl_image_thumbnail.so
-lib/ewl/tests/ewl_io_manager.a
-lib/ewl/tests/ewl_io_manager.la
-lib/ewl/tests/ewl_io_manager.so
-lib/ewl/tests/ewl_layer.a
-lib/ewl/tests/ewl_layer.la
-lib/ewl/tests/ewl_layer.so
-lib/ewl/tests/ewl_list.a
-lib/ewl/tests/ewl_list.la
-lib/ewl/tests/ewl_list.so
-lib/ewl/tests/ewl_media.a
-lib/ewl/tests/ewl_media.la
-lib/ewl/tests/ewl_media.so
-lib/ewl/tests/ewl_menu.a
-lib/ewl/tests/ewl_menu.la
-lib/ewl/tests/ewl_menu.so
-lib/ewl/tests/ewl_menubar.a
-lib/ewl/tests/ewl_menubar.la
-lib/ewl/tests/ewl_menubar.so
-lib/ewl/tests/ewl_modal.a
-lib/ewl/tests/ewl_modal.la
-lib/ewl/tests/ewl_modal.so
-lib/ewl/tests/ewl_mvc.a
-lib/ewl/tests/ewl_mvc.la
-lib/ewl/tests/ewl_mvc.so
-lib/ewl/tests/ewl_notebook.a
-lib/ewl/tests/ewl_notebook.la
-lib/ewl/tests/ewl_notebook.so
-lib/ewl/tests/ewl_paned.a
-lib/ewl/tests/ewl_paned.la
-lib/ewl/tests/ewl_paned.so
-lib/ewl/tests/ewl_password.a
-lib/ewl/tests/ewl_password.la
-lib/ewl/tests/ewl_password.so
-lib/ewl/tests/ewl_pointer.a
-lib/ewl/tests/ewl_pointer.la
-lib/ewl/tests/ewl_pointer.so
-lib/ewl/tests/ewl_progressbar.a
-lib/ewl/tests/ewl_progressbar.la
-lib/ewl/tests/ewl_progressbar.so
-lib/ewl/tests/ewl_puzzle.a
-lib/ewl/tests/ewl_puzzle.la
-lib/ewl/tests/ewl_puzzle.so
-lib/ewl/tests/ewl_scrollbar.a
-lib/ewl/tests/ewl_scrollbar.la
-lib/ewl/tests/ewl_scrollbar.so
-lib/ewl/tests/ewl_scrollpane.a
-lib/ewl/tests/ewl_scrollpane.la
-lib/ewl/tests/ewl_scrollpane.so
-lib/ewl/tests/ewl_seeker.a
-lib/ewl/tests/ewl_seeker.la
-lib/ewl/tests/ewl_seeker.so
-lib/ewl/tests/ewl_shadow.a
-lib/ewl/tests/ewl_shadow.la
-lib/ewl/tests/ewl_shadow.so
-lib/ewl/tests/ewl_spinner.a
-lib/ewl/tests/ewl_spinner.la
-lib/ewl/tests/ewl_spinner.so
-lib/ewl/tests/ewl_statusbar.a
-lib/ewl/tests/ewl_statusbar.la
-lib/ewl/tests/ewl_statusbar.so
-lib/ewl/tests/ewl_table.a
-lib/ewl/tests/ewl_table.la
-lib/ewl/tests/ewl_table.so
-lib/ewl/tests/ewl_text.a
-lib/ewl/tests/ewl_text.la
-lib/ewl/tests/ewl_text.so
-lib/ewl/tests/ewl_text_editor.a
-lib/ewl/tests/ewl_text_editor.la
-lib/ewl/tests/ewl_text_editor.so
-lib/ewl/tests/ewl_theme.a
-lib/ewl/tests/ewl_theme.la
-lib/ewl/tests/ewl_theme.so
-lib/ewl/tests/ewl_toolbar.a
-lib/ewl/tests/ewl_toolbar.la
-lib/ewl/tests/ewl_toolbar.so
-lib/ewl/tests/ewl_tooltip.a
-lib/ewl/tests/ewl_tooltip.la
-lib/ewl/tests/ewl_tooltip.so
-lib/ewl/tests/ewl_tree.a
-lib/ewl/tests/ewl_tree.la
-lib/ewl/tests/ewl_tree.so
-lib/ewl/tests/ewl_tree2.a
-lib/ewl/tests/ewl_tree2.la
-lib/ewl/tests/ewl_tree2.so
-lib/ewl/tests/ewl_widget.a
-lib/ewl/tests/ewl_widget.la
-lib/ewl/tests/ewl_widget.so
 lib/libewl.a
 lib/libewl.la
 lib/libewl.so
 lib/libewl.so.1
 libdata/pkgconfig/ewl.pc
-share/aclocal/ewl.m4
 %%DATADIR%%/examples/Ewl_Test.h
-%%DATADIR%%/examples/ewl_border.c
-%%DATADIR%%/examples/ewl_box.c
-%%DATADIR%%/examples/ewl_button.c
-%%DATADIR%%/examples/ewl_calendar.c
-%%DATADIR%%/examples/ewl_colordialog.c
-%%DATADIR%%/examples/ewl_colorpicker.c
-%%DATADIR%%/examples/ewl_combo.c
-%%DATADIR%%/examples/ewl_container.c
-%%DATADIR%%/examples/ewl_datepicker.c
-%%DATADIR%%/examples/ewl_dialog.c
-%%DATADIR%%/examples/ewl_dnd_snoop.c
-%%DATADIR%%/examples/ewl_engine.c
-%%DATADIR%%/examples/ewl_entry.c
-%%DATADIR%%/examples/ewl_filedialog.c
-%%DATADIR%%/examples/ewl_filepicker.c
-%%DATADIR%%/examples/ewl_floater.c
-%%DATADIR%%/examples/ewl_freebox.c
-%%DATADIR%%/examples/ewl_fullscreen.c
-%%DATADIR%%/examples/ewl_grid.c
-%%DATADIR%%/examples/ewl_histogram.c
-%%DATADIR%%/examples/ewl_icon.c
-%%DATADIR%%/examples/ewl_icon_theme.c
-%%DATADIR%%/examples/ewl_image.c
-%%DATADIR%%/examples/ewl_image_thumbnail.c
-%%DATADIR%%/examples/ewl_io_manager.c
-%%DATADIR%%/examples/ewl_layer.c
-%%DATADIR%%/examples/ewl_list.c
-%%DATADIR%%/examples/ewl_media.c
-%%DATADIR%%/examples/ewl_menu.c
-%%DATADIR%%/examples/ewl_menubar.c
-%%DATADIR%%/examples/ewl_modal.c
-%%DATADIR%%/examples/ewl_mvc.c
-%%DATADIR%%/examples/ewl_notebook.c
-%%DATADIR%%/examples/ewl_paned.c
-%%DATADIR%%/examples/ewl_password.c
-%%DATADIR%%/examples/ewl_pointer.c
-%%DATADIR%%/examples/ewl_progressbar.c
-%%DATADIR%%/examples/ewl_puzzle.c
-%%DATADIR%%/examples/ewl_scrollbar.c
-%%DATADIR%%/examples/ewl_scrollpane.c
-%%DATADIR%%/examples/ewl_seeker.c
-%%DATADIR%%/examples/ewl_shadow.c
-%%DATADIR%%/examples/ewl_spinner.c
-%%DATADIR%%/examples/ewl_statusbar.c
-%%DATADIR%%/examples/ewl_table.c
 %%DATADIR%%/examples/ewl_test_private.h
-%%DATADIR%%/examples/ewl_text.c
-%%DATADIR%%/examples/ewl_text_editor.c
-%%DATADIR%%/examples/ewl_theme.c
-%%DATADIR%%/examples/ewl_toolbar.c
-%%DATADIR%%/examples/ewl_tooltip.c
-%%DATADIR%%/examples/ewl_tree.c
-%%DATADIR%%/examples/ewl_tree2.c
-%%DATADIR%%/examples/ewl_widget.c
 %%DATADIR%%/examples/main.c
 %%DATADIR%%/images/Draw.png
 %%DATADIR%%/images/End.png
@@ -365,7 +154,7 @@ share/aclocal/ewl.m4
 %%DATADIR%%/images/e-logo-5.png
 %%DATADIR%%/images/e-logo-6.png
 %%DATADIR%%/images/e-logo-7.png
-%%DATADIR%%/images/e-logo-%%XAWVER%%.png
+%%DATADIR%%/images/e-logo-8.png
 %%DATADIR%%/images/e-logo-9.png
 %%DATADIR%%/images/e-logo.png
 %%DATADIR%%/images/elicit.png
@@ -388,14 +177,13 @@ share/aclocal/ewl.m4
 %%DATADIR%%/images/lilbottom.png
 %%DATADIR%%/images/lilgrad.png
 %%DATADIR%%/themes/e17.edj
-%%DATADIR%%/themes/ewl_embed_test.edj
+@dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%
-@dirrm lib/ewl/tests
 @dirrm lib/ewl/plugins
+@dirrm lib/ewl/examples
 @dirrm lib/ewl/engines
 @dirrm lib/ewl
 @dirrm include/ewl
-@dirrm etc/ewl
+@dirrm %%ETCDIR%%
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index 1dc69ad6a68b..ad3a4fe906a0 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	enlightenment
 PORTVERSION=	0.16.8.12
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +16,7 @@ DISTNAME=	e16-${PORTVERSION}-0.01
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	A very artistic X window manager
 
-LIB_DEPENDS=	Imlib2.4:${PORTSDIR}/graphics/imlib2 \
-		Xft.2:${PORTSDIR}/x11-fonts/libXft
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 
 DATADIR=	${PREFIX}/share/e16
 
@@ -24,6 +24,7 @@ USE_X_PREFIX=	yes
 USE_XORG=	xbitmaps
 USE_ICONV=	yes
 USE_GMAKE=	yes
+USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fsstd --disable-esdtest --disable-dependency-tracking \
 		--disable-rpath
diff --git a/x11-wm/e17-module-calendar/Makefile b/x11-wm/e17-module-calendar/Makefile
index 72323396da12..724071efdff0 100644
--- a/x11-wm/e17-module-calendar/Makefile
+++ b/x11-wm/e17-module-calendar/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	calendar
-PORTVERSION=	20060926
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
@@ -27,8 +27,6 @@ USE_EFL=	ecore evas edje eet
 USE_EFL_ESMART=	trans_x11
 GNU_CONFIGURE=	yes
 
-IGNORE=		doesn't compile with recent e17
-
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
@@ -37,7 +35,4 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e s,`${PRINTF} '\r'`,,g ${WRKSRC}/src/*.[ch]
-
 .include <bsd.port.mk>
diff --git a/x11-wm/e17-module-calendar/distinfo b/x11-wm/e17-module-calendar/distinfo
index 492ca7b8e1dc..c78a68a819af 100644
--- a/x11-wm/e17-module-calendar/distinfo
+++ b/x11-wm/e17-module-calendar/distinfo
@@ -1,3 +1,3 @@
-MD5 (calendar-20060926.tar.bz2) = a7c47f3efc02a2688ce4b8cc3fe2a659
-SHA256 (calendar-20060926.tar.bz2) = cdfaa4277375994287149310cf3b2a4be224cd38304ff3909f99006c55ec9331
-SIZE (calendar-20060926.tar.bz2) = 552639
+MD5 (calendar-20080223.tar.bz2) = 71d12bd35f1bf10e6b9d7ffdfa7795cd
+SHA256 (calendar-20080223.tar.bz2) = 05a6557c4dbbada9665d340084476b015442daebdf03708ba72fe69dc9ed0b5d
+SIZE (calendar-20080223.tar.bz2) = 305824
diff --git a/x11-wm/e17-module-calendar/pkg-plist b/x11-wm/e17-module-calendar/pkg-plist
index e74419126e29..ccaf607ad5bd 100644
--- a/x11-wm/e17-module-calendar/pkg-plist
+++ b/x11-wm/e17-module-calendar/pkg-plist
@@ -1,23 +1,15 @@
-lib/enlightenment/modules/calendar/NoImage_icon.png
-lib/enlightenment/modules/calendar/arrow.edj
-lib/enlightenment/modules/calendar/backimage.edj
 lib/enlightenment/modules/calendar/calendar.edj
-lib/enlightenment/modules/calendar/label.edj
-lib/enlightenment/modules/calendar/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/calendar/module.eap
-lib/enlightenment/modules/calendar/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/calendar/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/calendar/module_icon.png
-lib/enlightenment/modules/calendar/today.edj
-lib/enlightenment/modules/calendar/topimage.edj
-lib/enlightenment/modules/calendar/weekday.edj
-lib/enlightenment/modules/calendar/weekend.edj
-%%NLS%%share/locale/bg/LC_MESSAGES/calendar.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/calendar.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/calendar.mo
-%%NLS%%share/locale/it/LC_MESSAGES/calendar.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/calendar.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/calendar.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/calendar.mo
-@dirrm lib/enlightenment/modules/calendar/%%MODULE_ARCH%%
+lib/enlightenment/modules/calendar/e-module-calendar.edj
+lib/enlightenment/modules/calendar/module.desktop
+lib/enlightenment/modules/calendar/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/calendar/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/calendar/%%E17_ARCH%%/module.so
+%%NLS%%lib/enlightenment/modules/calendar/locale/fi/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/it/LC_MESSAGES/calendar.mo
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale
+@dirrm lib/enlightenment/modules/calendar/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/calendar
diff --git a/x11-wm/e17-module-cpu/Makefile b/x11-wm/e17-module-cpu/Makefile
index f6e16b1af42b..bfb3453c3df8 100644
--- a/x11-wm/e17-module-cpu/Makefile
+++ b/x11-wm/e17-module-cpu/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	cpu
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11-wm/e17-module-cpu/distinfo b/x11-wm/e17-module-cpu/distinfo
index eab0e6c2036e..70530f65d7a2 100644
--- a/x11-wm/e17-module-cpu/distinfo
+++ b/x11-wm/e17-module-cpu/distinfo
@@ -1,3 +1,3 @@
-MD5 (cpu-20070223.tar.bz2) = 30e514b12b1962bdccc25efe7fdb01b6
-SHA256 (cpu-20070223.tar.bz2) = a4ff1df53f919f0b101eaf335038a88e6d8712a1648528982e411a3805d75b96
-SIZE (cpu-20070223.tar.bz2) = 261528
+MD5 (cpu-20080223.tar.bz2) = 3b05b752b4580e74bcdfa81182b0a942
+SHA256 (cpu-20080223.tar.bz2) = a91b07fa671037b4add7af40e811730b1c7f09584b1965509a801d7306701950
+SIZE (cpu-20080223.tar.bz2) = 271713
diff --git a/x11-wm/e17-module-cpu/pkg-plist b/x11-wm/e17-module-cpu/pkg-plist
index 1f5208e5a15b..79b81ddb6f3a 100644
--- a/x11-wm/e17-module-cpu/pkg-plist
+++ b/x11-wm/e17-module-cpu/pkg-plist
@@ -3,7 +3,29 @@ 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/e-module-cpu.edj
+%%NLS%%lib/enlightenment/modules/cpu/locale/eo/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/bg/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/fi/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/it/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/ja/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/ru/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/sv/LC_MESSAGES/cpu.mo
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/fi                                     
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/it                                     
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale
 @dirrm lib/enlightenment/modules/cpu/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/cpu
 @dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-deskshow/Makefile b/x11-wm/e17-module-deskshow/Makefile
index dae67ad0b679..8b76593f0255 100644
--- a/x11-wm/e17-module-deskshow/Makefile
+++ b/x11-wm/e17-module-deskshow/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	deskshow
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11-wm/e17-module-deskshow/distinfo b/x11-wm/e17-module-deskshow/distinfo
index 02a446cb2b0d..733891cfa3a2 100644
--- a/x11-wm/e17-module-deskshow/distinfo
+++ b/x11-wm/e17-module-deskshow/distinfo
@@ -1,3 +1,3 @@
-MD5 (deskshow-20070223.tar.bz2) = a18ff84163447ea899cc21ff71718f0c
-SHA256 (deskshow-20070223.tar.bz2) = 98b1b9138fa75d43a8e4a2c9c461007bf3129d5aa934798241e12c22b12bdfb5
-SIZE (deskshow-20070223.tar.bz2) = 281233
+MD5 (deskshow-20080223.tar.bz2) = d7d969b736b436930d35e56a9406ed0c
+SHA256 (deskshow-20080223.tar.bz2) = dcf5e551c191e485a1beece04f986babdfc3bf45f70a0d2915e9a18c71c7d972
+SIZE (deskshow-20080223.tar.bz2) = 252520
diff --git a/x11-wm/e17-module-deskshow/pkg-plist b/x11-wm/e17-module-deskshow/pkg-plist
index a5528559f717..b63bdae99989 100644
--- a/x11-wm/e17-module-deskshow/pkg-plist
+++ b/x11-wm/e17-module-deskshow/pkg-plist
@@ -3,8 +3,7 @@ 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
+lib/enlightenment/modules/deskshow/e-module-deskshow.edj
 @dirrm lib/enlightenment/modules/deskshow/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/deskshow
 @dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-flame/Makefile b/x11-wm/e17-module-flame/Makefile
index 278fe318b88c..510f458c9689 100644
--- a/x11-wm/e17-module-flame/Makefile
+++ b/x11-wm/e17-module-flame/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	flame
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11-wm/e17-module-flame/distinfo b/x11-wm/e17-module-flame/distinfo
index 7b40e0f4f2dc..69ba773e3ed1 100644
--- a/x11-wm/e17-module-flame/distinfo
+++ b/x11-wm/e17-module-flame/distinfo
@@ -1,3 +1,3 @@
-MD5 (flame-20070223.tar.bz2) = 4fbb97b86add29eef207cda3dd802468
-SHA256 (flame-20070223.tar.bz2) = 18f81de98337826d04716278fe12efc7f0043cfe05f391b21e93ef9777be8738
-SIZE (flame-20070223.tar.bz2) = 278915
+MD5 (flame-20080223.tar.bz2) = a6bc14b59ea1c7d40d0994aaf7545fff
+SHA256 (flame-20080223.tar.bz2) = 242a5e4be9cc8863ef4b95fb71b9e305a6eaa08baa9c7ef85ab6c5d4faad38e9
+SIZE (flame-20080223.tar.bz2) = 229806
diff --git a/x11-wm/e17-module-flame/pkg-plist b/x11-wm/e17-module-flame/pkg-plist
index 6651443c6b32..76d917dd30f9 100644
--- a/x11-wm/e17-module-flame/pkg-plist
+++ b/x11-wm/e17-module-flame/pkg-plist
@@ -2,11 +2,20 @@ 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
-%%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
+lib/enlightenment/modules/flame/e-module-flame.edj
+%%NLS%%lib/enlightenment/modules/flame/locale/eo/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/fi/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/it/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/ja/LC_MESSAGES/flame.mo
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/eo/LC_MESSAGES                        
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale
 @dirrm lib/enlightenment/modules/flame/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/flame
 @dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-language/Makefile b/x11-wm/e17-module-language/Makefile
index 8107c559daaf..5bdd82fadb41 100644
--- a/x11-wm/e17-module-language/Makefile
+++ b/x11-wm/e17-module-language/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	language
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
@@ -25,5 +25,14 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget pkgconfig
 USE_EFL=	edje exml
+USE_XORG=	x11 xkbfile
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
 
 .include <bsd.port.mk>
diff --git a/x11-wm/e17-module-language/distinfo b/x11-wm/e17-module-language/distinfo
index 72899efb161e..1a265df3bc05 100644
--- a/x11-wm/e17-module-language/distinfo
+++ b/x11-wm/e17-module-language/distinfo
@@ -1,3 +1,3 @@
-MD5 (language-20070223.tar.bz2) = 7c915bfbb7bd52e9d0943488c0212a1d
-SHA256 (language-20070223.tar.bz2) = f80623d4ab1b6b259d21d546493fde30892aaf59b5c165dd017a7ab4a0608334
-SIZE (language-20070223.tar.bz2) = 456281
+MD5 (language-20080223.tar.bz2) = 9a2fb69f4f2681d32215ae85b03667f4
+SHA256 (language-20080223.tar.bz2) = 073208e8874627682101f9a373188a481baa24261f3c1b820bcf2197d0837ec9
+SIZE (language-20080223.tar.bz2) = 405615
diff --git a/x11-wm/e17-module-language/pkg-plist b/x11-wm/e17-module-language/pkg-plist
index b4a26ed34c97..86b38fe3bd9b 100644
--- a/x11-wm/e17-module-language/pkg-plist
+++ b/x11-wm/e17-module-language/pkg-plist
@@ -73,11 +73,24 @@ 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.edj
+lib/enlightenment/modules/language/e-module-language.edj
 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
+%%NLS%%lib/enlightenment/modules/language/locale/eo/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/fi/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/fr/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/it/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/sv/LC_MESSAGES/language.mo
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale
 @dirrm lib/enlightenment/modules/language/images
 @dirrm lib/enlightenment/modules/language/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/language
diff --git a/x11-wm/e17-module-mail/Makefile b/x11-wm/e17-module-mail/Makefile
index 2e61a02d11ef..cf89623fea6d 100644
--- a/x11-wm/e17-module-mail/Makefile
+++ b/x11-wm/e17-module-mail/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mail
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
@@ -26,4 +26,12 @@ USE_GMAKE=	yes
 USE_GNOME=	gnometarget pkgconfig
 USE_EFL=	edje
 
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11-wm/e17-module-mail/distinfo b/x11-wm/e17-module-mail/distinfo
index 2d267b2dcf5d..8c332f9f87e6 100644
--- a/x11-wm/e17-module-mail/distinfo
+++ b/x11-wm/e17-module-mail/distinfo
@@ -1,3 +1,3 @@
-MD5 (mail-20070223.tar.bz2) = c300a031aa7e68ad4f45305e3a4bacbd
-SHA256 (mail-20070223.tar.bz2) = b3ef91549cc061904d8aea7e9a9ac44066fcdfe951bfb6da214afc11ea055207
-SIZE (mail-20070223.tar.bz2) = 344411
+MD5 (mail-20080223.tar.bz2) = b98d34ad295095779e5c8a2286e77f62
+SHA256 (mail-20080223.tar.bz2) = 0bc096b188c0dae6347cd8acb7e7b806fb21b7263181b6e1e1e53c10977c7581
+SIZE (mail-20080223.tar.bz2) = 304423
diff --git a/x11-wm/e17-module-mail/pkg-plist b/x11-wm/e17-module-mail/pkg-plist
index d32b8e0e82c8..5fe294a96b64 100644
--- a/x11-wm/e17-module-mail/pkg-plist
+++ b/x11-wm/e17-module-mail/pkg-plist
@@ -2,10 +2,15 @@ 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/e-module-mail.edj
 lib/enlightenment/modules/mail/module.desktop
-lib/enlightenment/modules/mail/module.edj
-lib/enlightenment/modules/mail/module_icon.png
-share/locale/it/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/fi/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/it/LC_MESSAGES/mail.mo
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale
 @dirrm lib/enlightenment/modules/mail/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/mail
 @dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-mem/Makefile b/x11-wm/e17-module-mem/Makefile
index e2c7d3e74d4b..fdfe07354e25 100644
--- a/x11-wm/e17-module-mem/Makefile
+++ b/x11-wm/e17-module-mem/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mem
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-wm/e17-module-mem/distinfo b/x11-wm/e17-module-mem/distinfo
index 50f192030695..185749c2a842 100644
--- a/x11-wm/e17-module-mem/distinfo
+++ b/x11-wm/e17-module-mem/distinfo
@@ -1,3 +1,3 @@
-MD5 (mem-20070223.tar.bz2) = 806aae2b3cc2e748a9b26bd8363265ab
-SHA256 (mem-20070223.tar.bz2) = 7d311e2f1efff3e54f33541d338a4ef63a4256e7969f1d7993d84d5a94bceae3
-SIZE (mem-20070223.tar.bz2) = 426211
+MD5 (mem-20080223.tar.bz2) = 835c499960837db2d2db98f6f3dfef37
+SHA256 (mem-20080223.tar.bz2) = c959441f8749f084e9b1967640566e94ba1c13e27a8dceab198fe8aa0726dadf
+SIZE (mem-20080223.tar.bz2) = 383825
diff --git a/x11-wm/e17-module-mem/pkg-plist b/x11-wm/e17-module-mem/pkg-plist
index e6d9793970a2..592205b8e34d 100644
--- a/x11-wm/e17-module-mem/pkg-plist
+++ b/x11-wm/e17-module-mem/pkg-plist
@@ -2,15 +2,27 @@ 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/e-module-mem.edj
 lib/enlightenment/modules/mem/module.desktop
-lib/enlightenment/modules/mem/module.edj
-lib/enlightenment/modules/mem/module_icon.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
+%%NLS%%lib/enlightenment/modules/mem/locale/eo/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/fi/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/it/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/ja/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/ru/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/sv/LC_MESSAGES/mem.mo
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale
 @dirrm lib/enlightenment/modules/mem/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/mem
 @dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-mixer/Makefile b/x11-wm/e17-module-mixer/Makefile
index f18221d40a69..c3d53eadcd2e 100644
--- a/x11-wm/e17-module-mixer/Makefile
+++ b/x11-wm/e17-module-mixer/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mixer
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11-wm/e17-module-mixer/distinfo b/x11-wm/e17-module-mixer/distinfo
index a90a4bba763e..73b0c692169a 100644
--- a/x11-wm/e17-module-mixer/distinfo
+++ b/x11-wm/e17-module-mixer/distinfo
@@ -1,3 +1,3 @@
-MD5 (mixer-20070223.tar.bz2) = cc6f42aa6e610276e24c6751d4dd74c5
-SHA256 (mixer-20070223.tar.bz2) = c59985082b4cadcb9feccf1bc30f436fd1908f32d2f87bf53a9a47eaab6942c6
-SIZE (mixer-20070223.tar.bz2) = 338312
+MD5 (mixer-20080223.tar.bz2) = 578efbd7f92e64532cd1511d0158e8dd
+SHA256 (mixer-20080223.tar.bz2) = 7a6b814bae322e8ac5988f532410ea092967d16f7b3742bd5f2cc01bd672d7ff
+SIZE (mixer-20080223.tar.bz2) = 289275
diff --git a/x11-wm/e17-module-mixer/pkg-plist b/x11-wm/e17-module-mixer/pkg-plist
index 65daad44b823..23d0ae78ed2d 100644
--- a/x11-wm/e17-module-mixer/pkg-plist
+++ b/x11-wm/e17-module-mixer/pkg-plist
@@ -2,10 +2,18 @@ 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/e-module-mixer.edj
 lib/enlightenment/modules/mixer/module.desktop
-lib/enlightenment/modules/mixer/module.edj
-%%NLS%%share/locale/it/LC_MESSAGES/mixer.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/mixer.mo
+%%NLS%%lib/enlightenment/modules/mixer/locale/fi/LC_MESSAGES/mixer.mo
+%%NLS%%lib/enlightenment/modules/mixer/locale/it/LC_MESSAGES/mixer.mo
+%%NLS%%lib/enlightenment/modules/mixer/locale/sv/LC_MESSAGES/mixer.mo
+%%NLS%%@dirrm lib/enlightenment/modules/mixer/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mixer/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/mixer/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mixer/locale/it/
+%%NLS%%@dirrm lib/enlightenment/modules/mixer/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mixer/locale/sv/
+%%NLS%%@dirrm lib/enlightenment/modules/mixer/locale
 @dirrm lib/enlightenment/modules/mixer/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/mixer
 @dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-moon/Makefile b/x11-wm/e17-module-moon/Makefile
index 01eee6b51d99..5c5afc33b2b5 100644
--- a/x11-wm/e17-module-moon/Makefile
+++ b/x11-wm/e17-module-moon/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	moon
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-wm/e17-module-moon/distinfo b/x11-wm/e17-module-moon/distinfo
index b686069e9d75..985c259b8383 100644
--- a/x11-wm/e17-module-moon/distinfo
+++ b/x11-wm/e17-module-moon/distinfo
@@ -1,3 +1,3 @@
-MD5 (moon-20070223.tar.bz2) = a110d53bc5a05297e93a3a1eb05c9c11
-SHA256 (moon-20070223.tar.bz2) = 4e387eabe35435c61da7fd84a33cad8f8f3db31092c44bdf65834273f5f4a775
-SIZE (moon-20070223.tar.bz2) = 699637
+MD5 (moon-20080223.tar.bz2) = 77f4e625f597799c5bf160cbabfc1601
+SHA256 (moon-20080223.tar.bz2) = 0b8bd6bfe7147bbadddd642b35cb1d89a11d2bb5f1ad6f448185ebf948e85e62
+SIZE (moon-20080223.tar.bz2) = 648718
diff --git a/x11-wm/e17-module-moon/pkg-plist b/x11-wm/e17-module-moon/pkg-plist
index 9e45a173c835..fb85cb2abbce 100644
--- a/x11-wm/e17-module-moon/pkg-plist
+++ b/x11-wm/e17-module-moon/pkg-plist
@@ -2,12 +2,24 @@ 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/e-module-moon.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
+%%NLS%%lib/enlightenment/modules/moon/locale/eo/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/fi/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/it/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/ja/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/sv/LC_MESSAGES/moon.mo
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale
 @dirrm lib/enlightenment/modules/moon/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/moon
 @dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-rain/Makefile b/x11-wm/e17-module-rain/Makefile
index 155c65f629b1..71527be76277 100644
--- a/x11-wm/e17-module-rain/Makefile
+++ b/x11-wm/e17-module-rain/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	rain
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11-wm/e17-module-rain/distinfo b/x11-wm/e17-module-rain/distinfo
index 15917d0bc525..56101a06a01f 100644
--- a/x11-wm/e17-module-rain/distinfo
+++ b/x11-wm/e17-module-rain/distinfo
@@ -1,3 +1,3 @@
-MD5 (rain-20070223.tar.bz2) = 18fa7a1fdf1cd51098620a0514436d34
-SHA256 (rain-20070223.tar.bz2) = f132a1118622fd718b32ca5c28e415b5af3edc51d87642b58885ea723a344806
-SIZE (rain-20070223.tar.bz2) = 347010
+MD5 (rain-20080223.tar.bz2) = 639e63c2b425d83b11ba0bc4860a954f
+SHA256 (rain-20080223.tar.bz2) = 8723b2b56fce6c24db8d4586ad4d00104db26690a40addec2a518855576264b7
+SIZE (rain-20080223.tar.bz2) = 302065
diff --git a/x11-wm/e17-module-rain/pkg-plist b/x11-wm/e17-module-rain/pkg-plist
index 3b4f45a09cfc..cd9fcbdd71fd 100644
--- a/x11-wm/e17-module-rain/pkg-plist
+++ b/x11-wm/e17-module-rain/pkg-plist
@@ -6,13 +6,26 @@ 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
-%%NLS%%share/locale/eo/LC_MESSAGES/rain.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/rain.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/rain.mo
-%%NLS%%share/locale/it/LC_MESSAGES/rain.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/rain.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/rain.mo
+lib/enlightenment/modules/rain/e-module-rain.edj
+%%NLS%%lib/enlightenment/modules/rain/locale/eo/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/fi/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/fr/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/it/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/ja/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/sv/LC_MESSAGES/rain.mo
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale
 @dirrm lib/enlightenment/modules/rain/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/rain
 @dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-screenshot/Makefile b/x11-wm/e17-module-screenshot/Makefile
index 405edd0fda9f..1639edacaedd 100644
--- a/x11-wm/e17-module-screenshot/Makefile
+++ b/x11-wm/e17-module-screenshot/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	screenshot
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
@@ -16,8 +16,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module which allows users to take screenshots
 
-BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel \
+		emprint:${PORTSDIR}/x11/emprint
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel \
+		emprint:${PORTSDIR}/x11/emprint
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
@@ -25,27 +27,4 @@ USE_GMAKE=	yes
 USE_GNOME=	gnometarget pkgconfig
 USE_EFL=	edje
 
-OPTIONS=	IMAGIC "Use ImageMagick" on \
-		SCROT "Use Scrot" off
-
-.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
-
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-screenshot/distinfo b/x11-wm/e17-module-screenshot/distinfo
index a5226e0d1280..458f212e6f78 100644
--- a/x11-wm/e17-module-screenshot/distinfo
+++ b/x11-wm/e17-module-screenshot/distinfo
@@ -1,3 +1,3 @@
-MD5 (screenshot-20070223.tar.bz2) = d351d0fb604bf87c5eaf80c0a8089c96
-SHA256 (screenshot-20070223.tar.bz2) = 16e3fcfe9479791af46c3d8fb933fc3020d522c013f26e8847516f4561824e54
-SIZE (screenshot-20070223.tar.bz2) = 407617
+MD5 (screenshot-20080223.tar.bz2) = 21cc85f9743230fe807e634f493697c9
+SHA256 (screenshot-20080223.tar.bz2) = eb1cc3372fe9548bd438f5cc4e4863b84849481c49e4a6186e9df56aae2bddc9
+SIZE (screenshot-20080223.tar.bz2) = 247699
diff --git a/x11-wm/e17-module-screenshot/pkg-plist b/x11-wm/e17-module-screenshot/pkg-plist
index bf1d4b69764d..3b1727746708 100644
--- a/x11-wm/e17-module-screenshot/pkg-plist
+++ b/x11-wm/e17-module-screenshot/pkg-plist
@@ -2,16 +2,7 @@ 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
-%%NLS%%share/locale/it/LC_MESSAGES/screenshot.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/screenshot.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/screenshot.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/screenshot.mo
+lib/enlightenment/modules/screenshot/e-module-screenshot.edj
 @dirrm lib/enlightenment/modules/screenshot/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/screenshot
 @dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-slideshow/Makefile b/x11-wm/e17-module-slideshow/Makefile
index ad25dcef43df..47f48ca45d6b 100644
--- a/x11-wm/e17-module-slideshow/Makefile
+++ b/x11-wm/e17-module-slideshow/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	slideshow
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11-wm/e17-module-slideshow/distinfo b/x11-wm/e17-module-slideshow/distinfo
index 657acb2a7fd8..ce8938b85acc 100644
--- a/x11-wm/e17-module-slideshow/distinfo
+++ b/x11-wm/e17-module-slideshow/distinfo
@@ -1,3 +1,3 @@
-MD5 (slideshow-20070223.tar.bz2) = 619c2f89b4fe10fc608f3694a74a99ee
-SHA256 (slideshow-20070223.tar.bz2) = 59b481d3bdb1bd38187fc397f4a2f3922befc41713ede7dd08a30353321e1a25
-SIZE (slideshow-20070223.tar.bz2) = 284528
+MD5 (slideshow-20080223.tar.bz2) = 451ba84f1f04ea04d23b5c9e313470c9
+SHA256 (slideshow-20080223.tar.bz2) = ddc5e1298512fb219c6ee7403d45b0e9be540f44a9f4b4cb49c106ff68e89e63
+SIZE (slideshow-20080223.tar.bz2) = 239915
diff --git a/x11-wm/e17-module-slideshow/pkg-plist b/x11-wm/e17-module-slideshow/pkg-plist
index fb0ceadcb818..60d0b7ec2b4e 100644
--- a/x11-wm/e17-module-slideshow/pkg-plist
+++ b/x11-wm/e17-module-slideshow/pkg-plist
@@ -2,15 +2,27 @@ 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/e-module-slideshow.edj
 lib/enlightenment/modules/slideshow/slideshow.edj
-%%NLS%%share/locale/eo/LC_MESSAGES/slideshow.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/slideshow.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/slideshow.mo
-%%NLS%%share/locale/it/LC_MESSAGES/slideshow.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/slideshow.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/eo/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/fi/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/fr/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/it/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/ja/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/sv/LC_MESSAGES/slideshow.mo
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale
 @dirrm lib/enlightenment/modules/slideshow/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/slideshow
 @dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-snow/Makefile b/x11-wm/e17-module-snow/Makefile
index b79c8a7dd8c2..7d2084cacbc2 100644
--- a/x11-wm/e17-module-snow/Makefile
+++ b/x11-wm/e17-module-snow/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	snow
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11-wm/e17-module-snow/distinfo b/x11-wm/e17-module-snow/distinfo
index c88a10edbbf2..70f2f1b77341 100644
--- a/x11-wm/e17-module-snow/distinfo
+++ b/x11-wm/e17-module-snow/distinfo
@@ -1,3 +1,3 @@
-MD5 (snow-20070223.tar.bz2) = 820d1c99ba6007e4d0d7eca164cbbe9a
-SHA256 (snow-20070223.tar.bz2) = 4695cc214ababccb04ca746626bc87edeb32c5319c1b3f9b76eb92c7023c8396
-SIZE (snow-20070223.tar.bz2) = 278212
+MD5 (snow-20080223.tar.bz2) = 34c2e67e72f3c5b77813e01ec0e6102d
+SHA256 (snow-20080223.tar.bz2) = 869ba38e49a929cab5dd31a1c3b0e7e66676e1aa41596f2088c9be8ef223013d
+SIZE (snow-20080223.tar.bz2) = 234493
diff --git a/x11-wm/e17-module-snow/pkg-plist b/x11-wm/e17-module-snow/pkg-plist
index 31ad449eeda5..2f328ce1cb46 100644
--- a/x11-wm/e17-module-snow/pkg-plist
+++ b/x11-wm/e17-module-snow/pkg-plist
@@ -5,14 +5,27 @@ 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/e-module-snow.edj
 lib/enlightenment/modules/snow/tree.png
-%%NLS%%share/locale/eo/LC_MESSAGES/snow.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/snow.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/snow.mo
-%%NLS%%share/locale/it/LC_MESSAGES/snow.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/snow.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/eo/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/fi/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/fr/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/it/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/ja/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/sv/LC_MESSAGES/snow.mo
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale
 @dirrm lib/enlightenment/modules/snow/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/snow
 @dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-uptime/Makefile b/x11-wm/e17-module-uptime/Makefile
index 41f7cb1d2e4e..5b7b9b457ec0 100644
--- a/x11-wm/e17-module-uptime/Makefile
+++ b/x11-wm/e17-module-uptime/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	uptime
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11-wm/e17-module-uptime/distinfo b/x11-wm/e17-module-uptime/distinfo
index a638c4ae756d..45f29f45c564 100644
--- a/x11-wm/e17-module-uptime/distinfo
+++ b/x11-wm/e17-module-uptime/distinfo
@@ -1,3 +1,3 @@
-MD5 (uptime-20070223.tar.bz2) = 0c806db8ced0ec7e6b544cd0096cbe83
-SHA256 (uptime-20070223.tar.bz2) = 96ebb7053d410ed5f56cf0359ad7d7e7c393de376b349dc1107c96355d76d2d0
-SIZE (uptime-20070223.tar.bz2) = 316556
+MD5 (uptime-20080223.tar.bz2) = 5e9d0e8da1f42c000179f32fd5366d72
+SHA256 (uptime-20080223.tar.bz2) = 73d354196917e907aa8568981cb650407d010954454745d76018ffe0f5c92e67
+SIZE (uptime-20080223.tar.bz2) = 272634
diff --git a/x11-wm/e17-module-uptime/pkg-plist b/x11-wm/e17-module-uptime/pkg-plist
index 37f9e851da0e..af2dfdfb44aa 100644
--- a/x11-wm/e17-module-uptime/pkg-plist
+++ b/x11-wm/e17-module-uptime/pkg-plist
@@ -2,18 +2,31 @@ 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
-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 lib/enlightenment/modules/uptime/%%E17_ARCH%%
-@dirrmtry lib/enlightenment/modules/uptime
+lib/enlightenment/modules/uptime/e-module-uptime.edj
+%%NLS%%lib/enlightenment/modules/uptime/locale/bg/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/eo/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/fi/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/fr/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/it/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/ja/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/sv/LC_MESSAGES/uptime.mo
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale
+@dirrm lib/enlightenment/modules/uptime/%%E17_ARCH%%
+@dirrm 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 376696b84436..c9b84e7eb2b0 100644
--- a/x11-wm/e17-module-weather/Makefile
+++ b/x11-wm/e17-module-weather/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	weather
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-wm/e17-module-weather/distinfo b/x11-wm/e17-module-weather/distinfo
index b552ac86e987..e10aeab54741 100644
--- a/x11-wm/e17-module-weather/distinfo
+++ b/x11-wm/e17-module-weather/distinfo
@@ -1,3 +1,3 @@
-MD5 (weather-20070223.tar.bz2) = f8b7e939ed671722639e5d1fff8ed5cf
-SHA256 (weather-20070223.tar.bz2) = 796a3a1167677e1360af7d997245f7d6400b89e1b9d173e9d775325fc2c77056
-SIZE (weather-20070223.tar.bz2) = 868191
+MD5 (weather-20080223.tar.bz2) = b275301cf3bfc104c62b59ab59b7195a
+SHA256 (weather-20080223.tar.bz2) = 04ac1173638961708c3787d49bafff44a138da528a6e8b5bed81cc23f251d8bc
+SIZE (weather-20080223.tar.bz2) = 930951
diff --git a/x11-wm/e17-module-weather/pkg-plist b/x11-wm/e17-module-weather/pkg-plist
index 8c41253f625e..69beaa879d6a 100644
--- a/x11-wm/e17-module-weather/pkg-plist
+++ b/x11-wm/e17-module-weather/pkg-plist
@@ -2,12 +2,87 @@ 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/module.desktop
-lib/enlightenment/modules/weather/module.edj
 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
+lib/enlightenment/modules/weather/e-module-weather.edj
+lib/enlightenment/modules/weather/images/blizzard.png
+lib/enlightenment/modules/weather/images/blowingsnow.png
+lib/enlightenment/modules/weather/images/chancetstorm.png
+lib/enlightenment/modules/weather/images/chancetstormn.png
+lib/enlightenment/modules/weather/images/clear-sky.png
+lib/enlightenment/modules/weather/images/cloud.png
+lib/enlightenment/modules/weather/images/cloudy.png
+lib/enlightenment/modules/weather/images/cloudy_night.png
+lib/enlightenment/modules/weather/images/drizzle.png
+lib/enlightenment/modules/weather/images/fair.png
+lib/enlightenment/modules/weather/images/fdrizzle.png
+lib/enlightenment/modules/weather/images/flurries.png
+lib/enlightenment/modules/weather/images/fog.png
+lib/enlightenment/modules/weather/images/freezingrain.png
+lib/enlightenment/modules/weather/images/hazy.png
+lib/enlightenment/modules/weather/images/heavy-rain.png
+lib/enlightenment/modules/weather/images/ice.png
+lib/enlightenment/modules/weather/images/isolated.t-storm.png
+lib/enlightenment/modules/weather/images/light-rain.png
+lib/enlightenment/modules/weather/images/light-snow.png
+lib/enlightenment/modules/weather/images/luna-ceatza.png
+lib/enlightenment/modules/weather/images/luna-nori.png
+lib/enlightenment/modules/weather/images/mcloudy.png
+lib/enlightenment/modules/weather/images/mcloudyn.png
+lib/enlightenment/modules/weather/images/mcloudynr.png
+lib/enlightenment/modules/weather/images/mcloudyns.png
+lib/enlightenment/modules/weather/images/mcloudyr.png
+lib/enlightenment/modules/weather/images/mcloudys.png
+lib/enlightenment/modules/weather/images/moon-rain.png
+lib/enlightenment/modules/weather/images/moon-snow.png
+lib/enlightenment/modules/weather/images/moon-tstorm.png
+lib/enlightenment/modules/weather/images/moon.png
+lib/enlightenment/modules/weather/images/mostly-cloudy.png
+lib/enlightenment/modules/weather/images/pcloudy.png
+lib/enlightenment/modules/weather/images/pcloudyn.png
+lib/enlightenment/modules/weather/images/pcloudynr.png
+lib/enlightenment/modules/weather/images/pcloudyns.png
+lib/enlightenment/modules/weather/images/pcloudyr.png
+lib/enlightenment/modules/weather/images/pcloudyrn.png
+lib/enlightenment/modules/weather/images/pcloudys.png
+lib/enlightenment/modules/weather/images/rain.png
+lib/enlightenment/modules/weather/images/rainandsnow.png
+lib/enlightenment/modules/weather/images/showers.png
+lib/enlightenment/modules/weather/images/sleet.png
+lib/enlightenment/modules/weather/images/smoke.png
+lib/enlightenment/modules/weather/images/snow.png
+lib/enlightenment/modules/weather/images/snowshowers.png
+lib/enlightenment/modules/weather/images/sun-light-clouds.png
+lib/enlightenment/modules/weather/images/sun.png
+lib/enlightenment/modules/weather/images/suncloud.png
+lib/enlightenment/modules/weather/images/sunny.png
+lib/enlightenment/modules/weather/images/sunnyn.png
+lib/enlightenment/modules/weather/images/sunrain.png
+lib/enlightenment/modules/weather/images/sunsnow.png
+lib/enlightenment/modules/weather/images/t-storm_night.png
+lib/enlightenment/modules/weather/images/thunder.png
+lib/enlightenment/modules/weather/images/tstorm.png
+lib/enlightenment/modules/weather/images/tstormn.png
+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
+%%NLS%%lib/enlightenment/modules/weather/locale/eo/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/fi/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/it/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/ja/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/sv/LC_MESSAGES/weather.mo
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale
+@dirrm lib/enlightenment/modules/weather/images
 @dirrm lib/enlightenment/modules/weather/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/weather
 @dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-winselector/Makefile b/x11-wm/e17-module-winselector/Makefile
index 485bf032a019..913233e4d994 100644
--- a/x11-wm/e17-module-winselector/Makefile
+++ b/x11-wm/e17-module-winselector/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	winselector
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11-wm/e17-module-winselector/distinfo b/x11-wm/e17-module-winselector/distinfo
index 417522d22d7b..bf1bec42b879 100644
--- a/x11-wm/e17-module-winselector/distinfo
+++ b/x11-wm/e17-module-winselector/distinfo
@@ -1,3 +1,3 @@
-MD5 (winselector-20070223.tar.bz2) = bfd3d02ddda2bec18a400175bf6d6b6a
-SHA256 (winselector-20070223.tar.bz2) = b25e693378fd8cd64d69c8d5301b915e94b48e8d18a012850efef0ce928d0794
-SIZE (winselector-20070223.tar.bz2) = 271828
+MD5 (winselector-20080223.tar.bz2) = a3f10fee0c678ebff0dfa0a9f970362d
+SHA256 (winselector-20080223.tar.bz2) = 30a87d45b954627dcb44e5a2f404a59c6f5eb1dcb0938a2b4bfe07aec74f0332
+SIZE (winselector-20080223.tar.bz2) = 246692
diff --git a/x11-wm/e17-module-winselector/pkg-plist b/x11-wm/e17-module-winselector/pkg-plist
index 27724a16ee28..61cdf4bfb075 100644
--- a/x11-wm/e17-module-winselector/pkg-plist
+++ b/x11-wm/e17-module-winselector/pkg-plist
@@ -2,8 +2,7 @@ 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/e-module-winselector.edj
 lib/enlightenment/modules/winselector/winselector.edj
 @dirrm lib/enlightenment/modules/winselector/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/winselector
diff --git a/x11-wm/e17-utils/Makefile b/x11-wm/e17-utils/Makefile
index 297e3b60d87e..fe04e4f1337f 100644
--- a/x11-wm/e17-utils/Makefile
+++ b/x11-wm/e17-utils/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	utils
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-
@@ -17,16 +17,50 @@ DISTNAME=	e_${PORTNAME}-${PORTVERSION}
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Various supplementary utilities for e17 window manager
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-
 DATADIR=	${PREFIX}/share/e_utils
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget pkgconfig
-USE_EFL=	imlib2 evas edje ecore embryo eet ewl engrave epsilon
-USE_EFL_ESMART=	trans_x11
+USE_EFL=	imlib2 engrave ecore
+USE_EFL_ECORE=	evas file config
+
+OPTIONS=	SETROOT		"Build e17setroot"	on \
+		ENTANGLE	"Build entangle"	on \
+		EXIGE		"Build exige"		on
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_SETROOT) && defined(WITHOUT_ENTANGLE) && \
+	defined(WITHOUT_EXIGE)
+IGNORE=		select at least one utility to install
+.endif
+
+.if !defined(WITHOUT_SETROOT)
+BUILD_DEPENDS+=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS+=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
+PLIST_SUB+=	SETROOT=""
+.else
+PLIST_SUB+=	SETROOT="@comment "
+.endif
+
+.if !defined(WITHOUT_ENTANGLE)
+BUILD_DEPENDS+=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS+=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
+USE_EFL+=	edje eet
+USE_EFL_ESMART+=	container text_entry
+PLIST_SUB+=	ENTANGLE=""
+.else
+PLIST_SUB+=	ENTANGLE="@comment "
+.endif
+
+.if !defined(WITHOUT_EXIGE)
+USE_EFL+=	edje eet
+USE_EFL_ESMART+=	container text_entry
+PLIST_SUB+=	EXIGE=""
+.else
+PLIST_SUB+=	EXIGE="@comment "
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/e17-utils/distinfo b/x11-wm/e17-utils/distinfo
index b457c41f88bc..92454ec99aac 100644
--- a/x11-wm/e17-utils/distinfo
+++ b/x11-wm/e17-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (e_utils-20070223.tar.bz2) = 3ed1786358166c1cc0cfbccfbdd6a192
-SHA256 (e_utils-20070223.tar.bz2) = a9b86d8beaf995aa8643e0d5c6002e74576b64caf9b56485e1b6fdb9da822f8a
-SIZE (e_utils-20070223.tar.bz2) = 776040
+MD5 (e_utils-20080223.tar.bz2) = 1e82c2c0767fb85ac15c185f2dc53f24
+SHA256 (e_utils-20080223.tar.bz2) = a5ee61f6cac8275f6c0aca3cdaade9b4e58b345c645ee7e060dd4fa0a08ce58d
+SIZE (e_utils-20080223.tar.bz2) = 795101
diff --git a/x11-wm/e17-utils/pkg-plist b/x11-wm/e17-utils/pkg-plist
index 198db601145c..6d9897b9df33 100644
--- a/x11-wm/e17-utils/pkg-plist
+++ b/x11-wm/e17-utils/pkg-plist
@@ -1,13 +1,12 @@
-bin/e17setroot
-bin/entangle
-bin/exige
-%%DATADIR%%/data/entangle/default.edj
+%%SETROOT%%bin/e17setroot
+%%ENTANGLE%%bin/entangle
+%%EXIGE%%bin/exige
+%%ENTANGLE%%%%DATADIR%%/data/entangle/default.edj
+%%ENTANGLE%%share/enlightenment/config-apps/entangle.eap
 %%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/e17genmenu
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%
+%%EXIGE%%@dirrm %%DATADIR%%/data/exige
+%%ENTANGLE%%@dirrm %%DATADIR%%/data/entangle
+%%ENTANGLE%%@dirrmtry share/enlightenment/config-apps
+%%ENTANGLE%%@dirrmtry share/enlightenment
+@dirrmtry %%DATADIR%%/data
+@dirrmtry %%DATADIR%%
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index da29380273bc..86b513748651 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	enlightenment
-PORTVERSION=	20070223
-PORTREVISION=	1
-PORTEPOCH=	1
+PORTVERSION=	0.16.999.042
+PORTREVISION=	0
+PORTEPOCH=	2
 CATEGORIES=	x11-wm
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
-DISTNAME=	e-${PORTVERSION}
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	A very artistic X window manager
@@ -19,7 +19,9 @@ COMMENT=	A very artistic X window manager
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_EFL=	imlib2 evas edje ecore embryo eet
+USE_EFL=	imlib2 evas edje ecore embryo eet efreet edbus
+USE_EFL_ECORE=	evas config file ipc con job txt imf imf_evas
+USE_EFL_EVAS_LOADERS=	edb eet jpeg png
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
diff --git a/x11-wm/enlightenment-devel/distinfo b/x11-wm/enlightenment-devel/distinfo
index bddc264ce440..83f2a39f5600 100644
--- a/x11-wm/enlightenment-devel/distinfo
+++ b/x11-wm/enlightenment-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (e-20070223.tar.bz2) = d7c5ca68a6a276fdf4fa45e26757c7eb
-SHA256 (e-20070223.tar.bz2) = c9d112c1f0a9e5690745a3e6f8a45fa76366883d21d9c85010e5f22239b765a5
-SIZE (e-20070223.tar.bz2) = 31413115
+MD5 (enlightenment-0.16.999.042.tar.bz2) = f729622a0dd21eafb6fadc44a12b8e28
+SHA256 (enlightenment-0.16.999.042.tar.bz2) = 7605e877fcf213b0a6a0bfc46101a981d2e3eb6f2dcec04795a3e314ab8d0981
+SIZE (enlightenment-0.16.999.042.tar.bz2) = 32566682
diff --git a/x11-wm/enlightenment-devel/files/patch-src_bin_Makefile.in b/x11-wm/enlightenment-devel/files/patch-src_bin_Makefile.in
new file mode 100644
index 000000000000..e5a89cd7e4b6
--- /dev/null
+++ b/x11-wm/enlightenment-devel/files/patch-src_bin_Makefile.in
@@ -0,0 +1,11 @@
+--- src/bin/Makefile.in.orig	2008-03-11 02:13:30.000000000 +0300
++++ src/bin/Makefile.in	2008-03-11 02:13:34.000000000 +0300
+@@ -659,7 +659,7 @@
+ e_xinerama.c
+ 
+ enlightenment_init_LDFLAGS = @e_libs@
+-setuid_root_mode = a=rx,u+xs
++setuid_root_mode = a=rx,u+x
+ installed_headersdir = $(prefix)/include/enlightenment
+ installed_headers_DATA = $(ENLIGHTENMENTHEADERS)
+ all: all-am
diff --git a/x11-wm/enlightenment-devel/files/patch-src_modules_cpufreq_Makefile.in b/x11-wm/enlightenment-devel/files/patch-src_modules_cpufreq_Makefile.in
new file mode 100644
index 000000000000..595ace9be74f
--- /dev/null
+++ b/x11-wm/enlightenment-devel/files/patch-src_modules_cpufreq_Makefile.in
@@ -0,0 +1,11 @@
+--- src/modules/cpufreq/Makefile.in.orig	2008-03-11 02:13:50.000000000 +0300
++++ src/modules/cpufreq/Makefile.in	2008-03-11 02:13:54.000000000 +0300
+@@ -274,7 +274,7 @@
+ freqset_DATA = \
+ freqset$(EXEEXT)
+ 
+-setuid_root_mode = a=rx,u+xs
++setuid_root_mode = a=rx,u+x
+ freqset_SOURCES = freqset.c
+ all: all-am
+ 
diff --git a/x11-wm/enlightenment-devel/pkg-plist b/x11-wm/enlightenment-devel/pkg-plist
index da82d2defcaf..fcef23c20028 100644
--- a/x11-wm/enlightenment-devel/pkg-plist
+++ b/x11-wm/enlightenment-devel/pkg-plist
@@ -1,17 +1,17 @@
 bin/enlightenment
 bin/enlightenment-config
+bin/enlightenment_fm
 bin/enlightenment_imc
+bin/enlightenment_init
 bin/enlightenment_remote
 bin/enlightenment_start
 bin/enlightenment_sys
 bin/enlightenment_thumb
-etc/enlightenment/sysactions.conf
+%%ETCDIR%%/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_error.h
 include/enlightenment/e_atoms.h
 include/enlightenment/e_bg.h
 include/enlightenment/e_bindings.h
@@ -22,6 +22,7 @@ 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_data.h
 include/enlightenment/e_config_dialog.h
 include/enlightenment/e_configure.h
 include/enlightenment/e_confirm_dialog.h
@@ -37,18 +38,20 @@ 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_exec.h
 include/enlightenment/e_exehist.h
-include/enlightenment/e_fdo_menu_to_order.h
 include/enlightenment/e_filereg.h
 include/enlightenment/e_flowlayout.h
 include/enlightenment/e_fm.h
+include/enlightenment/e_fm_custom.h
+include/enlightenment/e_fm_hal.h
 include/enlightenment/e_fm_mime.h
 include/enlightenment/e_fm_prop.h
+include/enlightenment/e_fm_shared.h
 include/enlightenment/e_focus.h
 include/enlightenment/e_font.h
-include/enlightenment/e_fwin.h
 include/enlightenment/e_gadcon.h
+include/enlightenment/e_gadcon_popup.h
 include/enlightenment/e_grabinput.h
 include/enlightenment/e_hints.h
 include/enlightenment/e_icon.h
@@ -59,48 +62,13 @@ 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_apps.h
-include/enlightenment/e_int_config_borders.h
-include/enlightenment/e_int_config_cfgdialogs.h
-include/enlightenment/e_int_config_clientlist.h
-include/enlightenment/e_int_config_color_classes.h
-include/enlightenment/e_int_config_cursor.h
-include/enlightenment/e_int_config_desk.h
-include/enlightenment/e_int_config_desklock.h
-include/enlightenment/e_int_config_desks.h
-include/enlightenment/e_int_config_display.h
-include/enlightenment/e_int_config_dpms.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_icon_themes.h
-include/enlightenment/e_int_config_imc.h
-include/enlightenment/e_int_config_imc_import.h
-include/enlightenment/e_int_config_intl.h
-include/enlightenment/e_int_config_keybindings.h
-include/enlightenment/e_int_config_menus.h
-include/enlightenment/e_int_config_mime.h
-include/enlightenment/e_int_config_mime_edit.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_screensaver.h
-include/enlightenment/e_int_config_shelf.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_toolbar_config.h
 include/enlightenment/e_intl.h
+include/enlightenment/e_intl_data.h
 include/enlightenment/e_ipc.h
 include/enlightenment/e_ipc_codec.h
 include/enlightenment/e_ipc_handlers.h
@@ -112,15 +80,19 @@ include/enlightenment/e_maximize.h
 include/enlightenment/e_menu.h
 include/enlightenment/e_mmx.h
 include/enlightenment/e_module.h
+include/enlightenment/e_mouse.h
 include/enlightenment/e_moveresize.h
 include/enlightenment/e_msg.h
+include/enlightenment/e_msgbus.h
 include/enlightenment/e_obj_dialog.h
 include/enlightenment/e_object.h
+include/enlightenment/e_order.h
 include/enlightenment/e_pan.h
 include/enlightenment/e_path.h
 include/enlightenment/e_place.h
 include/enlightenment/e_pointer.h
 include/enlightenment/e_popup.h
+include/enlightenment/e_powersave.h
 include/enlightenment/e_prefix.h
 include/enlightenment/e_remember.h
 include/enlightenment/e_resist.h
@@ -140,6 +112,7 @@ include/enlightenment/e_theme.h
 include/enlightenment/e_theme_about.h
 include/enlightenment/e_thumb.h
 include/enlightenment/e_tlist.h
+include/enlightenment/e_toolbar.h
 include/enlightenment/e_user.h
 include/enlightenment/e_utils.h
 include/enlightenment/e_widget.h
@@ -152,6 +125,7 @@ include/enlightenment/e_widget_csel.h
 include/enlightenment/e_widget_cslider.h
 include/enlightenment/e_widget_desk_preview.h
 include/enlightenment/e_widget_entry.h
+include/enlightenment/e_widget_font_preview.h
 include/enlightenment/e_widget_framelist.h
 include/enlightenment/e_widget_frametable.h
 include/enlightenment/e_widget_fsel.h
@@ -168,58 +142,282 @@ include/enlightenment/e_widget_table.h
 include/enlightenment/e_widget_textblock.h
 include/enlightenment/e_widget_tlist.h
 include/enlightenment/e_win.h
-include/enlightenment/e_winlist.h
 include/enlightenment/e_xinerama.h
 include/enlightenment/e_zone.h
+lib/enlightenment/modules/battery/e-module-battery.edj
 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/e-module-clock.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/conf/e-module-conf.edj
+lib/enlightenment/modules/conf/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf/module.desktop
+lib/enlightenment/modules/conf_applications/e-module-conf_applications.edj
+lib/enlightenment/modules/conf_applications/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_applications/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_applications/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_applications/module.desktop
+lib/enlightenment/modules/conf_borders/e-module-conf_borders.edj
+lib/enlightenment/modules/conf_borders/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_borders/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_borders/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_borders/module.desktop
+lib/enlightenment/modules/conf_clientlist/e-module-conf_clientlist.edj
+lib/enlightenment/modules/conf_clientlist/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_clientlist/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_clientlist/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_clientlist/module.desktop
+lib/enlightenment/modules/conf_colors/e-module-conf_colors.edj
+lib/enlightenment/modules/conf_colors/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_colors/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_colors/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_colors/module.desktop
+lib/enlightenment/modules/conf_desk/e-module-conf_desk.edj
+lib/enlightenment/modules/conf_desk/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_desk/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_desk/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_desk/module.desktop
+lib/enlightenment/modules/conf_desklock/e-module-conf_desklock.edj
+lib/enlightenment/modules/conf_desklock/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_desklock/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_desklock/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_desklock/module.desktop
+lib/enlightenment/modules/conf_desks/e-module-conf_desks.edj
+lib/enlightenment/modules/conf_desks/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_desks/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_desks/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_desks/module.desktop
+lib/enlightenment/modules/conf_dialogs/e-module-conf_dialogs.edj
+lib/enlightenment/modules/conf_dialogs/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_dialogs/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_dialogs/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_dialogs/module.desktop
+lib/enlightenment/modules/conf_display/e-module-conf_display.edj
+lib/enlightenment/modules/conf_display/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_display/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_display/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_display/module.desktop
+lib/enlightenment/modules/conf_dpms/e-module-conf_dpms.edj
+lib/enlightenment/modules/conf_dpms/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_dpms/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_dpms/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_dpms/module.desktop
+lib/enlightenment/modules/conf_engine/e-module-conf_engine.edj
+lib/enlightenment/modules/conf_engine/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_engine/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_engine/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_engine/module.desktop
+lib/enlightenment/modules/conf_exebuf/e-module-conf_exebuf.edj
+lib/enlightenment/modules/conf_exebuf/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_exebuf/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_exebuf/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_exebuf/module.desktop
+lib/enlightenment/modules/conf_fonts/e-module-conf_fonts.edj
+lib/enlightenment/modules/conf_fonts/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_fonts/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_fonts/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_fonts/module.desktop
+lib/enlightenment/modules/conf_icon_theme/e-module-conf_icon_theme.edj
+lib/enlightenment/modules/conf_icon_theme/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_icon_theme/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_icon_theme/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_icon_theme/module.desktop
+lib/enlightenment/modules/conf_imc/e-module-conf_imc.edj
+lib/enlightenment/modules/conf_imc/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_imc/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_imc/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_imc/module.desktop
+lib/enlightenment/modules/conf_interaction/e-module-conf_interaction.edj
+lib/enlightenment/modules/conf_interaction/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_interaction/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_interaction/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_interaction/module.desktop
+lib/enlightenment/modules/conf_intl/e-module-conf_intl.edj
+lib/enlightenment/modules/conf_intl/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_intl/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_intl/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_intl/module.desktop
+lib/enlightenment/modules/conf_keybindings/e-module-conf_keybindings.edj
+lib/enlightenment/modules/conf_keybindings/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_keybindings/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_keybindings/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_keybindings/module.desktop
+lib/enlightenment/modules/conf_menus/e-module-conf_menus.edj
+lib/enlightenment/modules/conf_menus/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_menus/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_menus/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_menus/module.desktop
+lib/enlightenment/modules/conf_mime/e-module-conf_mime.edj
+lib/enlightenment/modules/conf_mime/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_mime/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_mime/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_mime/module.desktop
+lib/enlightenment/modules/conf_mouse/e-module-conf_mouse.edj
+lib/enlightenment/modules/conf_mouse/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_mouse/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_mouse/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_mouse/module.desktop
+lib/enlightenment/modules/conf_mouse_cursor/e-module-conf_mouse_cursor.edj
+lib/enlightenment/modules/conf_mouse_cursor/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_mouse_cursor/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_mouse_cursor/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_mouse_cursor/module.desktop
+lib/enlightenment/modules/conf_mousebindings/e-module-conf_mousebindings.edj
+lib/enlightenment/modules/conf_mousebindings/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_mousebindings/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_mousebindings/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_mousebindings/module.desktop
+lib/enlightenment/modules/conf_paths/e-module-conf_paths.edj
+lib/enlightenment/modules/conf_paths/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_paths/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_paths/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_paths/module.desktop
+lib/enlightenment/modules/conf_performance/e-module-conf_performance.edj
+lib/enlightenment/modules/conf_performance/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_performance/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_performance/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_performance/module.desktop
+lib/enlightenment/modules/conf_profiles/e-module-conf_profiles.edj
+lib/enlightenment/modules/conf_profiles/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_profiles/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_profiles/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_profiles/module.desktop
+lib/enlightenment/modules/conf_screensaver/e-module-conf_screensaver.edj
+lib/enlightenment/modules/conf_screensaver/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_screensaver/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_screensaver/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_screensaver/module.desktop
+lib/enlightenment/modules/conf_shelves/e-module-conf_shelves.edj
+lib/enlightenment/modules/conf_shelves/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_shelves/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_shelves/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_shelves/module.desktop
+lib/enlightenment/modules/conf_startup/e-module-conf_startup.edj
+lib/enlightenment/modules/conf_startup/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_startup/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_startup/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_startup/module.desktop
+lib/enlightenment/modules/conf_theme/e-module-conf_theme.edj
+lib/enlightenment/modules/conf_theme/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_theme/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_theme/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_theme/module.desktop
+lib/enlightenment/modules/conf_transitions/e-module-conf_transitions.edj
+lib/enlightenment/modules/conf_transitions/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_transitions/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_transitions/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_transitions/module.desktop
+lib/enlightenment/modules/conf_wallpaper/e-module-conf_wallpaper.edj
+lib/enlightenment/modules/conf_wallpaper/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_wallpaper/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_wallpaper/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_wallpaper/module.desktop
+lib/enlightenment/modules/conf_window_display/e-module-conf_window_display.edj
+lib/enlightenment/modules/conf_window_display/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_window_display/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_window_display/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_window_display/module.desktop
+lib/enlightenment/modules/conf_window_focus/e-module-conf_window_focus.edj
+lib/enlightenment/modules/conf_window_focus/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_window_focus/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_window_focus/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_window_focus/module.desktop
+lib/enlightenment/modules/conf_window_manipulation/e-module-conf_winmanip.edj
+lib/enlightenment/modules/conf_window_manipulation/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_window_manipulation/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_window_manipulation/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_window_manipulation/module.desktop
+lib/enlightenment/modules/conf_winlist/e-module-conf_winlist.edj
+lib/enlightenment/modules/conf_winlist/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_winlist/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_winlist/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_winlist/module.desktop
+lib/enlightenment/modules/cpufreq/e-module-cpufreq.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/e-module-dropshadow.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/exebuf/e-module-exebuf.edj
+lib/enlightenment/modules/exebuf/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/exebuf/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/exebuf/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/exebuf/module.desktop
+lib/enlightenment/modules/fileman/e-module-fileman.edj
+lib/enlightenment/modules/fileman/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/fileman/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/fileman/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/fileman/module.desktop
+lib/enlightenment/modules/ibar/e-module-ibar.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/e-module-ibox.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/layout/e-module-layout.edj
+lib/enlightenment/modules/layout/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/layout/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/layout/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/layout/module.desktop
+lib/enlightenment/modules/msgbus_lang/e-module-msgbus_lang.edj
+lib/enlightenment/modules/msgbus_lang/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/msgbus_lang/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/msgbus_lang/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/msgbus_lang/module.desktop
+lib/enlightenment/modules/pager/e-module-pager.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/e-module-start.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/e-module-temperature.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/%%E17_ARCH%%/tempget
 lib/enlightenment/modules/temperature/module.desktop
-lib/enlightenment/modules/temperature/module.edj
-lib/enlightenment/preload/e_precache.so
-lib/enlightenment/preload/e_precache.la
+lib/enlightenment/modules/winlist/e-module-winlist.edj
+lib/enlightenment/modules/winlist/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/winlist/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/winlist/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/winlist/module.desktop
+lib/enlightenment/modules/wizard/e-module-wizard.edj
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_000.a
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_000.la
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_000.so
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_010.a
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_010.la
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_010.so
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_020.a
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_020.la
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_020.so
+lib/enlightenment/modules/wizard/module.desktop
 lib/enlightenment/preload/e_precache.a
+lib/enlightenment/preload/e_precache.la
+lib/enlightenment/preload/e_precache.so
 %%DATADIR%%/AUTHORS
 %%DATADIR%%/COPYING
 %%DATADIR%%/data/backgrounds/Blue_Sky_Tree.edj
@@ -255,7 +453,8 @@ lib/enlightenment/preload/e_precache.a
 %%DATADIR%%/data/input_methods/iiimf.imc
 %%DATADIR%%/data/input_methods/scim.imc
 %%DATADIR%%/data/input_methods/uim.imc
-%%DATADIR%%/data/other/applications.tar.gz
+%%DATADIR%%/data/other/desktop_files.tar.gz
+%%DATADIR%%/data/other/desktop_order.tar.gz
 %%DATADIR%%/data/other/efm_favorites.tar.gz
 %%DATADIR%%/data/other/icon_example.tar.gz
 %%DATADIR%%/data/themes/default.edj
@@ -264,16 +463,26 @@ lib/enlightenment/preload/e_precache.a
 %%DATADIR%%/doc/documentation.html
 %%DATADIR%%/doc/enlightenment.png
 share/locale/bg/LC_MESSAGES/enlightenment.mo
+share/locale/ca/LC_MESSAGES/enlightenment.mo
 share/locale/de/LC_MESSAGES/enlightenment.mo
 share/locale/eo/LC_MESSAGES/enlightenment.mo
+share/locale/es/LC_MESSAGES/enlightenment.mo
+share/locale/fi/LC_MESSAGES/enlightenment.mo
 share/locale/fr/LC_MESSAGES/enlightenment.mo
+share/locale/fr_CH/LC_MESSAGES/enlightenment.mo
 share/locale/hu/LC_MESSAGES/enlightenment.mo
 share/locale/it/LC_MESSAGES/enlightenment.mo
 share/locale/ja/LC_MESSAGES/enlightenment.mo
+share/locale/ko/LC_MESSAGES/enlightenment.mo
+share/locale/pt_BR/LC_MESSAGES/enlightenment.mo
 share/locale/ru/LC_MESSAGES/enlightenment.mo
 share/locale/sl/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/fr_CH/LC_MESSAGES
+@dirrmtry share/locale/fr_CH
 @dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/data/themes
 @dirrm %%DATADIR%%/data/other
@@ -285,26 +494,112 @@ share/xsessions/enlightenment.desktop
 @dirrm %%DATADIR%%/data/backgrounds
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
+@dirrm lib/enlightenment/preload
+@dirrm lib/enlightenment/modules/wizard/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/wizard
+@dirrm lib/enlightenment/modules/winlist/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/winlist
 @dirrm lib/enlightenment/modules/temperature/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/temperature
 @dirrm lib/enlightenment/modules/start/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/start
 @dirrm lib/enlightenment/modules/pager/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/pager
+@dirrm lib/enlightenment/modules/msgbus_lang/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/msgbus_lang
+@dirrm lib/enlightenment/modules/layout/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/layout
 @dirrm lib/enlightenment/modules/ibox/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/ibox
 @dirrm lib/enlightenment/modules/ibar/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/ibar
+@dirrm lib/enlightenment/modules/fileman/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/fileman
+@dirrm lib/enlightenment/modules/exebuf/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/exebuf
 @dirrm lib/enlightenment/modules/dropshadow/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/dropshadow
 @dirrm lib/enlightenment/modules/cpufreq/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/cpufreq
+@dirrm lib/enlightenment/modules/conf_winlist/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_winlist
+@dirrm lib/enlightenment/modules/conf_window_manipulation/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_window_manipulation
+@dirrm lib/enlightenment/modules/conf_window_focus/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_window_focus
+@dirrm lib/enlightenment/modules/conf_window_display/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_window_display
+@dirrm lib/enlightenment/modules/conf_wallpaper/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_wallpaper
+@dirrm lib/enlightenment/modules/conf_transitions/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_transitions
+@dirrm lib/enlightenment/modules/conf_theme/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_theme
+@dirrm lib/enlightenment/modules/conf_startup/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_startup
+@dirrm lib/enlightenment/modules/conf_shelves/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_shelves
+@dirrm lib/enlightenment/modules/conf_screensaver/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_screensaver
+@dirrm lib/enlightenment/modules/conf_profiles/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_profiles
+@dirrm lib/enlightenment/modules/conf_performance/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_performance
+@dirrm lib/enlightenment/modules/conf_paths/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_paths
+@dirrm lib/enlightenment/modules/conf_mousebindings/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_mousebindings
+@dirrm lib/enlightenment/modules/conf_mouse_cursor/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_mouse_cursor
+@dirrm lib/enlightenment/modules/conf_mouse/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_mouse
+@dirrm lib/enlightenment/modules/conf_mime/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_mime
+@dirrm lib/enlightenment/modules/conf_menus/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_menus
+@dirrm lib/enlightenment/modules/conf_keybindings/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_keybindings
+@dirrm lib/enlightenment/modules/conf_intl/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_intl
+@dirrm lib/enlightenment/modules/conf_interaction/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_interaction
+@dirrm lib/enlightenment/modules/conf_imc/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_imc
+@dirrm lib/enlightenment/modules/conf_icon_theme/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_icon_theme
+@dirrm lib/enlightenment/modules/conf_fonts/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_fonts
+@dirrm lib/enlightenment/modules/conf_exebuf/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_exebuf
+@dirrm lib/enlightenment/modules/conf_engine/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_engine
+@dirrm lib/enlightenment/modules/conf_dpms/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_dpms
+@dirrm lib/enlightenment/modules/conf_display/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_display
+@dirrm lib/enlightenment/modules/conf_dialogs/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_dialogs
+@dirrm lib/enlightenment/modules/conf_desks/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_desks
+@dirrm lib/enlightenment/modules/conf_desklock/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_desklock
+@dirrm lib/enlightenment/modules/conf_desk/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_desk
+@dirrm lib/enlightenment/modules/conf_colors/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_colors
+@dirrm lib/enlightenment/modules/conf_clientlist/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_clientlist
+@dirrm lib/enlightenment/modules/conf_borders/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_borders
+@dirrm lib/enlightenment/modules/conf_applications/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_applications
+@dirrm lib/enlightenment/modules/conf/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf
 @dirrm lib/enlightenment/modules/clock/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/clock
 @dirrm lib/enlightenment/modules/battery/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/battery
 @dirrm lib/enlightenment/modules
-@dirrm lib/enlightenment/preload
 @dirrm lib/enlightenment
 @dirrm include/enlightenment
-@dirrm etc/enlightenment
+@dirrmtry %%ETCDIR%%
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 1dc69ad6a68b..ad3a4fe906a0 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	enlightenment
 PORTVERSION=	0.16.8.12
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +16,7 @@ DISTNAME=	e16-${PORTVERSION}-0.01
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	A very artistic X window manager
 
-LIB_DEPENDS=	Imlib2.4:${PORTSDIR}/graphics/imlib2 \
-		Xft.2:${PORTSDIR}/x11-fonts/libXft
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 
 DATADIR=	${PREFIX}/share/e16
 
@@ -24,6 +24,7 @@ USE_X_PREFIX=	yes
 USE_XORG=	xbitmaps
 USE_ICONV=	yes
 USE_GMAKE=	yes
+USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fsstd --disable-esdtest --disable-dependency-tracking \
 		--disable-rpath
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index dd9c44c5d679..46c53f0226d3 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fluxbox
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -55,7 +56,7 @@ PLIST_SUB+=		DOCPDF:="@comment "
 .endif
 
 .if !defined(WITHOUT_IMLIB2)
-LIB_DEPENDS+=		Imlib2.4:${PORTSDIR}/graphics/imlib2
+USE_EFL+=		imlib2
 CONFIGURE_ARGS+=	--enable-imlib2
 .else
 CONFIGURE_ARGS+=	--disable-imlib2
diff --git a/x11-wm/fluxspace/Makefile b/x11-wm/fluxspace/Makefile
index 34e040f32beb..f33790591794 100644
--- a/x11-wm/fluxspace/Makefile
+++ b/x11-wm/fluxspace/Makefile
@@ -7,15 +7,14 @@
 
 PORTNAME=	fluxspace
 PORTVERSION=	0.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A window manager and workspace enhancer and integrator
 
-BUILD_DEPENDS=	imlib2-config:${PORTSDIR}/graphics/imlib2 \
-		swig:${PORTSDIR}/devel/swig13
+BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
 
 BROKEN=		Checksum mismatch
 
@@ -23,6 +22,7 @@ USE_XLIB=	yes
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
+USE_EFL=	imlib2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_LDCONFIG=	yes
diff --git a/x11-wm/kahakai/Makefile b/x11-wm/kahakai/Makefile
index 3cfe2003d8e0..822a061a61f2 100644
--- a/x11-wm/kahakai/Makefile
+++ b/x11-wm/kahakai/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kahakai
 PORTVERSION=	0.6.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,8 +17,7 @@ COMMENT=	Kahakai window manager
 
 BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13 \
 	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost
-LIB_DEPENDS=	Imlib2.4:${PORTSDIR}/graphics/imlib2 \
-		Xft.2:${PORTSDIR}/x11-fonts/libXft
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 RUN_DEPENDS=	\
 	${X11BASE}/lib/X11/fonts/artwiz-fonts:${PORTSDIR}/x11-fonts/artwiz-fonts
 
@@ -34,6 +33,7 @@ GNU_CONFIGURE=	yes
 USE_PYTHON=	yes
 USE_X_PREFIX=	yes
 USE_GCC=	3.4
+USE_EFL=	imlib2
 
 MAN1=		kahakai.1
 
diff --git a/x11-wm/phluid/Makefile b/x11-wm/phluid/Makefile
index 4da060145c22..d4d6f4f75042 100644
--- a/x11-wm/phluid/Makefile
+++ b/x11-wm/phluid/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	phluid
 PORTVERSION=	0.0.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phluid
@@ -15,10 +15,9 @@ MASTER_SITE_SUBDIR=	phluid
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A window manager that emphasizes efficiency, speed, and beauty
 
-LIB_DEPENDS=	Imlib2.4:${PORTSDIR}/graphics/imlib2
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lm"
diff --git a/x11-wm/skippy/Makefile b/x11-wm/skippy/Makefile
index b86acf9abd7e..6c9c07bb5d5e 100644
--- a/x11-wm/skippy/Makefile
+++ b/x11-wm/skippy/Makefile
@@ -7,19 +7,19 @@
 
 PORTNAME=	skippy
 PORTVERSION=	0.5.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://thegraveyard.org/files/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A full-screen X11 task-switcher like Apple's Expose
 
-LIB_DEPENDS=	Imlib2.4:${PORTSDIR}/graphics/imlib2 \
-		Xft.2:${PORTSDIR}/x11-fonts/libXft
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 
 USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GNOME=	pkgconfig
+USE_EFL=	imlib2
 PLIST_FILES=	bin/skippy \
 		%%DATADIR%%/skippyrc-default
 PLIST_DIRS=	%%DATADIR%%
diff --git a/x11-wm/waimea/Makefile b/x11-wm/waimea/Makefile
index d41ebe97b984..4061481c1a01 100644
--- a/x11-wm/waimea/Makefile
+++ b/x11-wm/waimea/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	waimea
 PORTVERSION=	0.4.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	waimea
@@ -32,7 +32,7 @@ OPTIONS=	PIXMAP "Build with pixmap textures support" on \
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_PIXMAP)
-LIB_DEPENDS+=	Imlib2.4:${PORTSDIR}/graphics/imlib2
+USE_EFL+=	imlib2
 .endif
 
 .if defined(WITH_DITHER)
diff --git a/x11/3ddesktop/Makefile b/x11/3ddesktop/Makefile
index 199e58308c16..87c9c3ee6d17 100644
--- a/x11/3ddesktop/Makefile
+++ b/x11/3ddesktop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	3ddesktop
 PORTVERSION=	0.2.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	desk3d
@@ -15,11 +15,11 @@ MASTER_SITE_SUBDIR=	desk3d
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	3D Virtual Desktop Switcher
 
-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut \
-		Imlib2.4:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
 
 USE_GL=		yes
 USE_GETOPT_LONG=	yes
+USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/x11/Makefile b/x11/Makefile
index b11df381a5f8..d5ff15822523 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -57,10 +57,15 @@
     SUBDIR += e17-module-weather
     SUBDIR += e17-module-winselector
     SUBDIR += ebuttons
-    SUBDIR += ecore
+    SUBDIR += ecore-desktop
+    SUBDIR += ecore-imf
+    SUBDIR += ecore-imf_evas
+    SUBDIR += ecore-x11
     SUBDIR += editres
+    SUBDIR += efreet
     SUBDIR += electricsheep
     SUBDIR += elicit
+    SUBDIR += emprint
     SUBDIR += emu
     SUBDIR += enity
     SUBDIR += enterminus
diff --git a/x11/e17-module-calendar/Makefile b/x11/e17-module-calendar/Makefile
index 72323396da12..724071efdff0 100644
--- a/x11/e17-module-calendar/Makefile
+++ b/x11/e17-module-calendar/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	calendar
-PORTVERSION=	20060926
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
@@ -27,8 +27,6 @@ USE_EFL=	ecore evas edje eet
 USE_EFL_ESMART=	trans_x11
 GNU_CONFIGURE=	yes
 
-IGNORE=		doesn't compile with recent e17
-
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
@@ -37,7 +35,4 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e s,`${PRINTF} '\r'`,,g ${WRKSRC}/src/*.[ch]
-
 .include <bsd.port.mk>
diff --git a/x11/e17-module-calendar/distinfo b/x11/e17-module-calendar/distinfo
index 492ca7b8e1dc..c78a68a819af 100644
--- a/x11/e17-module-calendar/distinfo
+++ b/x11/e17-module-calendar/distinfo
@@ -1,3 +1,3 @@
-MD5 (calendar-20060926.tar.bz2) = a7c47f3efc02a2688ce4b8cc3fe2a659
-SHA256 (calendar-20060926.tar.bz2) = cdfaa4277375994287149310cf3b2a4be224cd38304ff3909f99006c55ec9331
-SIZE (calendar-20060926.tar.bz2) = 552639
+MD5 (calendar-20080223.tar.bz2) = 71d12bd35f1bf10e6b9d7ffdfa7795cd
+SHA256 (calendar-20080223.tar.bz2) = 05a6557c4dbbada9665d340084476b015442daebdf03708ba72fe69dc9ed0b5d
+SIZE (calendar-20080223.tar.bz2) = 305824
diff --git a/x11/e17-module-calendar/pkg-plist b/x11/e17-module-calendar/pkg-plist
index e74419126e29..ccaf607ad5bd 100644
--- a/x11/e17-module-calendar/pkg-plist
+++ b/x11/e17-module-calendar/pkg-plist
@@ -1,23 +1,15 @@
-lib/enlightenment/modules/calendar/NoImage_icon.png
-lib/enlightenment/modules/calendar/arrow.edj
-lib/enlightenment/modules/calendar/backimage.edj
 lib/enlightenment/modules/calendar/calendar.edj
-lib/enlightenment/modules/calendar/label.edj
-lib/enlightenment/modules/calendar/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/calendar/module.eap
-lib/enlightenment/modules/calendar/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/calendar/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/calendar/module_icon.png
-lib/enlightenment/modules/calendar/today.edj
-lib/enlightenment/modules/calendar/topimage.edj
-lib/enlightenment/modules/calendar/weekday.edj
-lib/enlightenment/modules/calendar/weekend.edj
-%%NLS%%share/locale/bg/LC_MESSAGES/calendar.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/calendar.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/calendar.mo
-%%NLS%%share/locale/it/LC_MESSAGES/calendar.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/calendar.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/calendar.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/calendar.mo
-@dirrm lib/enlightenment/modules/calendar/%%MODULE_ARCH%%
+lib/enlightenment/modules/calendar/e-module-calendar.edj
+lib/enlightenment/modules/calendar/module.desktop
+lib/enlightenment/modules/calendar/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/calendar/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/calendar/%%E17_ARCH%%/module.so
+%%NLS%%lib/enlightenment/modules/calendar/locale/fi/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/it/LC_MESSAGES/calendar.mo
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale
+@dirrm lib/enlightenment/modules/calendar/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/calendar
diff --git a/x11/e17-module-cpu/Makefile b/x11/e17-module-cpu/Makefile
index f6e16b1af42b..bfb3453c3df8 100644
--- a/x11/e17-module-cpu/Makefile
+++ b/x11/e17-module-cpu/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	cpu
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11/e17-module-cpu/distinfo b/x11/e17-module-cpu/distinfo
index eab0e6c2036e..70530f65d7a2 100644
--- a/x11/e17-module-cpu/distinfo
+++ b/x11/e17-module-cpu/distinfo
@@ -1,3 +1,3 @@
-MD5 (cpu-20070223.tar.bz2) = 30e514b12b1962bdccc25efe7fdb01b6
-SHA256 (cpu-20070223.tar.bz2) = a4ff1df53f919f0b101eaf335038a88e6d8712a1648528982e411a3805d75b96
-SIZE (cpu-20070223.tar.bz2) = 261528
+MD5 (cpu-20080223.tar.bz2) = 3b05b752b4580e74bcdfa81182b0a942
+SHA256 (cpu-20080223.tar.bz2) = a91b07fa671037b4add7af40e811730b1c7f09584b1965509a801d7306701950
+SIZE (cpu-20080223.tar.bz2) = 271713
diff --git a/x11/e17-module-cpu/pkg-plist b/x11/e17-module-cpu/pkg-plist
index 1f5208e5a15b..79b81ddb6f3a 100644
--- a/x11/e17-module-cpu/pkg-plist
+++ b/x11/e17-module-cpu/pkg-plist
@@ -3,7 +3,29 @@ 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/e-module-cpu.edj
+%%NLS%%lib/enlightenment/modules/cpu/locale/eo/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/bg/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/fi/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/it/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/ja/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/ru/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/sv/LC_MESSAGES/cpu.mo
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/fi                                     
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/it                                     
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale
 @dirrm lib/enlightenment/modules/cpu/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/cpu
 @dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-deskshow/Makefile b/x11/e17-module-deskshow/Makefile
index dae67ad0b679..8b76593f0255 100644
--- a/x11/e17-module-deskshow/Makefile
+++ b/x11/e17-module-deskshow/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	deskshow
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11/e17-module-deskshow/distinfo b/x11/e17-module-deskshow/distinfo
index 02a446cb2b0d..733891cfa3a2 100644
--- a/x11/e17-module-deskshow/distinfo
+++ b/x11/e17-module-deskshow/distinfo
@@ -1,3 +1,3 @@
-MD5 (deskshow-20070223.tar.bz2) = a18ff84163447ea899cc21ff71718f0c
-SHA256 (deskshow-20070223.tar.bz2) = 98b1b9138fa75d43a8e4a2c9c461007bf3129d5aa934798241e12c22b12bdfb5
-SIZE (deskshow-20070223.tar.bz2) = 281233
+MD5 (deskshow-20080223.tar.bz2) = d7d969b736b436930d35e56a9406ed0c
+SHA256 (deskshow-20080223.tar.bz2) = dcf5e551c191e485a1beece04f986babdfc3bf45f70a0d2915e9a18c71c7d972
+SIZE (deskshow-20080223.tar.bz2) = 252520
diff --git a/x11/e17-module-deskshow/pkg-plist b/x11/e17-module-deskshow/pkg-plist
index a5528559f717..b63bdae99989 100644
--- a/x11/e17-module-deskshow/pkg-plist
+++ b/x11/e17-module-deskshow/pkg-plist
@@ -3,8 +3,7 @@ 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
+lib/enlightenment/modules/deskshow/e-module-deskshow.edj
 @dirrm lib/enlightenment/modules/deskshow/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/deskshow
 @dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-devian/Makefile b/x11/e17-module-devian/Makefile
index a1f97faa7568..dcee14703d12 100644
--- a/x11/e17-module-devian/Makefile
+++ b/x11/e17-module-devian/Makefile
@@ -25,6 +25,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnometarget pkgconfig
 USE_EFL=	edje
 
-IGNORE=		doesn't compile with recent e17
+BROKEN=		doesn't compile with recent e17
+DEPRECATED=	abandoned by developer
+EXPIRATION_DATE=	2008-03-20
 
 .include <bsd.port.mk>
diff --git a/x11/e17-module-engage/Makefile b/x11/e17-module-engage/Makefile
index 2901f7dbbf26..2c5786c8ec75 100644
--- a/x11/e17-module-engage/Makefile
+++ b/x11/e17-module-engage/Makefile
@@ -32,5 +32,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
 
 IGNORE=		doesn't compile with recent e17
+DEPRECATED=	abandoned by developer                                                         
+EXPIRATION_DATE=	2008-03-20
 
 .include <bsd.port.mk>
diff --git a/x11/e17-module-eveil/Makefile b/x11/e17-module-eveil/Makefile
index bfae868c09cc..268240453637 100644
--- a/x11/e17-module-eveil/Makefile
+++ b/x11/e17-module-eveil/Makefile
@@ -33,4 +33,8 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+IGNORE=		doesn't compile with recent e17                                                
+DEPRECATED=	abandoned by developer                                                         
+EXPIRATION_DATE=	2008-03-20
+
 .include <bsd.port.mk>
diff --git a/x11/e17-module-flame/Makefile b/x11/e17-module-flame/Makefile
index 278fe318b88c..510f458c9689 100644
--- a/x11/e17-module-flame/Makefile
+++ b/x11/e17-module-flame/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	flame
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11/e17-module-flame/distinfo b/x11/e17-module-flame/distinfo
index 7b40e0f4f2dc..69ba773e3ed1 100644
--- a/x11/e17-module-flame/distinfo
+++ b/x11/e17-module-flame/distinfo
@@ -1,3 +1,3 @@
-MD5 (flame-20070223.tar.bz2) = 4fbb97b86add29eef207cda3dd802468
-SHA256 (flame-20070223.tar.bz2) = 18f81de98337826d04716278fe12efc7f0043cfe05f391b21e93ef9777be8738
-SIZE (flame-20070223.tar.bz2) = 278915
+MD5 (flame-20080223.tar.bz2) = a6bc14b59ea1c7d40d0994aaf7545fff
+SHA256 (flame-20080223.tar.bz2) = 242a5e4be9cc8863ef4b95fb71b9e305a6eaa08baa9c7ef85ab6c5d4faad38e9
+SIZE (flame-20080223.tar.bz2) = 229806
diff --git a/x11/e17-module-flame/pkg-plist b/x11/e17-module-flame/pkg-plist
index 6651443c6b32..76d917dd30f9 100644
--- a/x11/e17-module-flame/pkg-plist
+++ b/x11/e17-module-flame/pkg-plist
@@ -2,11 +2,20 @@ 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
-%%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
+lib/enlightenment/modules/flame/e-module-flame.edj
+%%NLS%%lib/enlightenment/modules/flame/locale/eo/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/fi/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/it/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/ja/LC_MESSAGES/flame.mo
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/eo/LC_MESSAGES                        
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale
 @dirrm lib/enlightenment/modules/flame/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/flame
 @dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-language/Makefile b/x11/e17-module-language/Makefile
index 8107c559daaf..5bdd82fadb41 100644
--- a/x11/e17-module-language/Makefile
+++ b/x11/e17-module-language/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	language
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
@@ -25,5 +25,14 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget pkgconfig
 USE_EFL=	edje exml
+USE_XORG=	x11 xkbfile
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
 
 .include <bsd.port.mk>
diff --git a/x11/e17-module-language/distinfo b/x11/e17-module-language/distinfo
index 72899efb161e..1a265df3bc05 100644
--- a/x11/e17-module-language/distinfo
+++ b/x11/e17-module-language/distinfo
@@ -1,3 +1,3 @@
-MD5 (language-20070223.tar.bz2) = 7c915bfbb7bd52e9d0943488c0212a1d
-SHA256 (language-20070223.tar.bz2) = f80623d4ab1b6b259d21d546493fde30892aaf59b5c165dd017a7ab4a0608334
-SIZE (language-20070223.tar.bz2) = 456281
+MD5 (language-20080223.tar.bz2) = 9a2fb69f4f2681d32215ae85b03667f4
+SHA256 (language-20080223.tar.bz2) = 073208e8874627682101f9a373188a481baa24261f3c1b820bcf2197d0837ec9
+SIZE (language-20080223.tar.bz2) = 405615
diff --git a/x11/e17-module-language/pkg-plist b/x11/e17-module-language/pkg-plist
index b4a26ed34c97..86b38fe3bd9b 100644
--- a/x11/e17-module-language/pkg-plist
+++ b/x11/e17-module-language/pkg-plist
@@ -73,11 +73,24 @@ 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.edj
+lib/enlightenment/modules/language/e-module-language.edj
 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
+%%NLS%%lib/enlightenment/modules/language/locale/eo/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/fi/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/fr/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/it/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/sv/LC_MESSAGES/language.mo
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale
 @dirrm lib/enlightenment/modules/language/images
 @dirrm lib/enlightenment/modules/language/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/language
diff --git a/x11/e17-module-mail/Makefile b/x11/e17-module-mail/Makefile
index 2e61a02d11ef..cf89623fea6d 100644
--- a/x11/e17-module-mail/Makefile
+++ b/x11/e17-module-mail/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mail
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
@@ -26,4 +26,12 @@ USE_GMAKE=	yes
 USE_GNOME=	gnometarget pkgconfig
 USE_EFL=	edje
 
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11/e17-module-mail/distinfo b/x11/e17-module-mail/distinfo
index 2d267b2dcf5d..8c332f9f87e6 100644
--- a/x11/e17-module-mail/distinfo
+++ b/x11/e17-module-mail/distinfo
@@ -1,3 +1,3 @@
-MD5 (mail-20070223.tar.bz2) = c300a031aa7e68ad4f45305e3a4bacbd
-SHA256 (mail-20070223.tar.bz2) = b3ef91549cc061904d8aea7e9a9ac44066fcdfe951bfb6da214afc11ea055207
-SIZE (mail-20070223.tar.bz2) = 344411
+MD5 (mail-20080223.tar.bz2) = b98d34ad295095779e5c8a2286e77f62
+SHA256 (mail-20080223.tar.bz2) = 0bc096b188c0dae6347cd8acb7e7b806fb21b7263181b6e1e1e53c10977c7581
+SIZE (mail-20080223.tar.bz2) = 304423
diff --git a/x11/e17-module-mail/pkg-plist b/x11/e17-module-mail/pkg-plist
index d32b8e0e82c8..5fe294a96b64 100644
--- a/x11/e17-module-mail/pkg-plist
+++ b/x11/e17-module-mail/pkg-plist
@@ -2,10 +2,15 @@ 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/e-module-mail.edj
 lib/enlightenment/modules/mail/module.desktop
-lib/enlightenment/modules/mail/module.edj
-lib/enlightenment/modules/mail/module_icon.png
-share/locale/it/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/fi/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/it/LC_MESSAGES/mail.mo
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale
 @dirrm lib/enlightenment/modules/mail/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/mail
 @dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-mem/Makefile b/x11/e17-module-mem/Makefile
index e2c7d3e74d4b..fdfe07354e25 100644
--- a/x11/e17-module-mem/Makefile
+++ b/x11/e17-module-mem/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mem
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11/e17-module-mem/distinfo b/x11/e17-module-mem/distinfo
index 50f192030695..185749c2a842 100644
--- a/x11/e17-module-mem/distinfo
+++ b/x11/e17-module-mem/distinfo
@@ -1,3 +1,3 @@
-MD5 (mem-20070223.tar.bz2) = 806aae2b3cc2e748a9b26bd8363265ab
-SHA256 (mem-20070223.tar.bz2) = 7d311e2f1efff3e54f33541d338a4ef63a4256e7969f1d7993d84d5a94bceae3
-SIZE (mem-20070223.tar.bz2) = 426211
+MD5 (mem-20080223.tar.bz2) = 835c499960837db2d2db98f6f3dfef37
+SHA256 (mem-20080223.tar.bz2) = c959441f8749f084e9b1967640566e94ba1c13e27a8dceab198fe8aa0726dadf
+SIZE (mem-20080223.tar.bz2) = 383825
diff --git a/x11/e17-module-mem/pkg-plist b/x11/e17-module-mem/pkg-plist
index e6d9793970a2..592205b8e34d 100644
--- a/x11/e17-module-mem/pkg-plist
+++ b/x11/e17-module-mem/pkg-plist
@@ -2,15 +2,27 @@ 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/e-module-mem.edj
 lib/enlightenment/modules/mem/module.desktop
-lib/enlightenment/modules/mem/module.edj
-lib/enlightenment/modules/mem/module_icon.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
+%%NLS%%lib/enlightenment/modules/mem/locale/eo/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/fi/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/it/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/ja/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/ru/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/sv/LC_MESSAGES/mem.mo
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale
 @dirrm lib/enlightenment/modules/mem/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/mem
 @dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-mixer/Makefile b/x11/e17-module-mixer/Makefile
index f18221d40a69..c3d53eadcd2e 100644
--- a/x11/e17-module-mixer/Makefile
+++ b/x11/e17-module-mixer/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mixer
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11/e17-module-mixer/distinfo b/x11/e17-module-mixer/distinfo
index a90a4bba763e..73b0c692169a 100644
--- a/x11/e17-module-mixer/distinfo
+++ b/x11/e17-module-mixer/distinfo
@@ -1,3 +1,3 @@
-MD5 (mixer-20070223.tar.bz2) = cc6f42aa6e610276e24c6751d4dd74c5
-SHA256 (mixer-20070223.tar.bz2) = c59985082b4cadcb9feccf1bc30f436fd1908f32d2f87bf53a9a47eaab6942c6
-SIZE (mixer-20070223.tar.bz2) = 338312
+MD5 (mixer-20080223.tar.bz2) = 578efbd7f92e64532cd1511d0158e8dd
+SHA256 (mixer-20080223.tar.bz2) = 7a6b814bae322e8ac5988f532410ea092967d16f7b3742bd5f2cc01bd672d7ff
+SIZE (mixer-20080223.tar.bz2) = 289275
diff --git a/x11/e17-module-mixer/pkg-plist b/x11/e17-module-mixer/pkg-plist
index 65daad44b823..23d0ae78ed2d 100644
--- a/x11/e17-module-mixer/pkg-plist
+++ b/x11/e17-module-mixer/pkg-plist
@@ -2,10 +2,18 @@ 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/e-module-mixer.edj
 lib/enlightenment/modules/mixer/module.desktop
-lib/enlightenment/modules/mixer/module.edj
-%%NLS%%share/locale/it/LC_MESSAGES/mixer.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/mixer.mo
+%%NLS%%lib/enlightenment/modules/mixer/locale/fi/LC_MESSAGES/mixer.mo
+%%NLS%%lib/enlightenment/modules/mixer/locale/it/LC_MESSAGES/mixer.mo
+%%NLS%%lib/enlightenment/modules/mixer/locale/sv/LC_MESSAGES/mixer.mo
+%%NLS%%@dirrm lib/enlightenment/modules/mixer/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mixer/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/mixer/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mixer/locale/it/
+%%NLS%%@dirrm lib/enlightenment/modules/mixer/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mixer/locale/sv/
+%%NLS%%@dirrm lib/enlightenment/modules/mixer/locale
 @dirrm lib/enlightenment/modules/mixer/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/mixer
 @dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-moon/Makefile b/x11/e17-module-moon/Makefile
index 01eee6b51d99..5c5afc33b2b5 100644
--- a/x11/e17-module-moon/Makefile
+++ b/x11/e17-module-moon/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	moon
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11/e17-module-moon/distinfo b/x11/e17-module-moon/distinfo
index b686069e9d75..985c259b8383 100644
--- a/x11/e17-module-moon/distinfo
+++ b/x11/e17-module-moon/distinfo
@@ -1,3 +1,3 @@
-MD5 (moon-20070223.tar.bz2) = a110d53bc5a05297e93a3a1eb05c9c11
-SHA256 (moon-20070223.tar.bz2) = 4e387eabe35435c61da7fd84a33cad8f8f3db31092c44bdf65834273f5f4a775
-SIZE (moon-20070223.tar.bz2) = 699637
+MD5 (moon-20080223.tar.bz2) = 77f4e625f597799c5bf160cbabfc1601
+SHA256 (moon-20080223.tar.bz2) = 0b8bd6bfe7147bbadddd642b35cb1d89a11d2bb5f1ad6f448185ebf948e85e62
+SIZE (moon-20080223.tar.bz2) = 648718
diff --git a/x11/e17-module-moon/pkg-plist b/x11/e17-module-moon/pkg-plist
index 9e45a173c835..fb85cb2abbce 100644
--- a/x11/e17-module-moon/pkg-plist
+++ b/x11/e17-module-moon/pkg-plist
@@ -2,12 +2,24 @@ 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/e-module-moon.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
+%%NLS%%lib/enlightenment/modules/moon/locale/eo/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/fi/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/it/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/ja/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/sv/LC_MESSAGES/moon.mo
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale
 @dirrm lib/enlightenment/modules/moon/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/moon
 @dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-rain/Makefile b/x11/e17-module-rain/Makefile
index 155c65f629b1..71527be76277 100644
--- a/x11/e17-module-rain/Makefile
+++ b/x11/e17-module-rain/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	rain
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11/e17-module-rain/distinfo b/x11/e17-module-rain/distinfo
index 15917d0bc525..56101a06a01f 100644
--- a/x11/e17-module-rain/distinfo
+++ b/x11/e17-module-rain/distinfo
@@ -1,3 +1,3 @@
-MD5 (rain-20070223.tar.bz2) = 18fa7a1fdf1cd51098620a0514436d34
-SHA256 (rain-20070223.tar.bz2) = f132a1118622fd718b32ca5c28e415b5af3edc51d87642b58885ea723a344806
-SIZE (rain-20070223.tar.bz2) = 347010
+MD5 (rain-20080223.tar.bz2) = 639e63c2b425d83b11ba0bc4860a954f
+SHA256 (rain-20080223.tar.bz2) = 8723b2b56fce6c24db8d4586ad4d00104db26690a40addec2a518855576264b7
+SIZE (rain-20080223.tar.bz2) = 302065
diff --git a/x11/e17-module-rain/pkg-plist b/x11/e17-module-rain/pkg-plist
index 3b4f45a09cfc..cd9fcbdd71fd 100644
--- a/x11/e17-module-rain/pkg-plist
+++ b/x11/e17-module-rain/pkg-plist
@@ -6,13 +6,26 @@ 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
-%%NLS%%share/locale/eo/LC_MESSAGES/rain.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/rain.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/rain.mo
-%%NLS%%share/locale/it/LC_MESSAGES/rain.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/rain.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/rain.mo
+lib/enlightenment/modules/rain/e-module-rain.edj
+%%NLS%%lib/enlightenment/modules/rain/locale/eo/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/fi/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/fr/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/it/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/ja/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/sv/LC_MESSAGES/rain.mo
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale
 @dirrm lib/enlightenment/modules/rain/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/rain
 @dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-screenshot/Makefile b/x11/e17-module-screenshot/Makefile
index 405edd0fda9f..1639edacaedd 100644
--- a/x11/e17-module-screenshot/Makefile
+++ b/x11/e17-module-screenshot/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	screenshot
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
@@ -16,8 +16,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module which allows users to take screenshots
 
-BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel \
+		emprint:${PORTSDIR}/x11/emprint
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel \
+		emprint:${PORTSDIR}/x11/emprint
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
@@ -25,27 +27,4 @@ USE_GMAKE=	yes
 USE_GNOME=	gnometarget pkgconfig
 USE_EFL=	edje
 
-OPTIONS=	IMAGIC "Use ImageMagick" on \
-		SCROT "Use Scrot" off
-
-.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
-
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/e17-module-screenshot/distinfo b/x11/e17-module-screenshot/distinfo
index a5226e0d1280..458f212e6f78 100644
--- a/x11/e17-module-screenshot/distinfo
+++ b/x11/e17-module-screenshot/distinfo
@@ -1,3 +1,3 @@
-MD5 (screenshot-20070223.tar.bz2) = d351d0fb604bf87c5eaf80c0a8089c96
-SHA256 (screenshot-20070223.tar.bz2) = 16e3fcfe9479791af46c3d8fb933fc3020d522c013f26e8847516f4561824e54
-SIZE (screenshot-20070223.tar.bz2) = 407617
+MD5 (screenshot-20080223.tar.bz2) = 21cc85f9743230fe807e634f493697c9
+SHA256 (screenshot-20080223.tar.bz2) = eb1cc3372fe9548bd438f5cc4e4863b84849481c49e4a6186e9df56aae2bddc9
+SIZE (screenshot-20080223.tar.bz2) = 247699
diff --git a/x11/e17-module-screenshot/pkg-plist b/x11/e17-module-screenshot/pkg-plist
index bf1d4b69764d..3b1727746708 100644
--- a/x11/e17-module-screenshot/pkg-plist
+++ b/x11/e17-module-screenshot/pkg-plist
@@ -2,16 +2,7 @@ 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
-%%NLS%%share/locale/it/LC_MESSAGES/screenshot.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/screenshot.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/screenshot.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/screenshot.mo
+lib/enlightenment/modules/screenshot/e-module-screenshot.edj
 @dirrm lib/enlightenment/modules/screenshot/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/screenshot
 @dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-slideshow/Makefile b/x11/e17-module-slideshow/Makefile
index ad25dcef43df..47f48ca45d6b 100644
--- a/x11/e17-module-slideshow/Makefile
+++ b/x11/e17-module-slideshow/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	slideshow
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11/e17-module-slideshow/distinfo b/x11/e17-module-slideshow/distinfo
index 657acb2a7fd8..ce8938b85acc 100644
--- a/x11/e17-module-slideshow/distinfo
+++ b/x11/e17-module-slideshow/distinfo
@@ -1,3 +1,3 @@
-MD5 (slideshow-20070223.tar.bz2) = 619c2f89b4fe10fc608f3694a74a99ee
-SHA256 (slideshow-20070223.tar.bz2) = 59b481d3bdb1bd38187fc397f4a2f3922befc41713ede7dd08a30353321e1a25
-SIZE (slideshow-20070223.tar.bz2) = 284528
+MD5 (slideshow-20080223.tar.bz2) = 451ba84f1f04ea04d23b5c9e313470c9
+SHA256 (slideshow-20080223.tar.bz2) = ddc5e1298512fb219c6ee7403d45b0e9be540f44a9f4b4cb49c106ff68e89e63
+SIZE (slideshow-20080223.tar.bz2) = 239915
diff --git a/x11/e17-module-slideshow/pkg-plist b/x11/e17-module-slideshow/pkg-plist
index fb0ceadcb818..60d0b7ec2b4e 100644
--- a/x11/e17-module-slideshow/pkg-plist
+++ b/x11/e17-module-slideshow/pkg-plist
@@ -2,15 +2,27 @@ 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/e-module-slideshow.edj
 lib/enlightenment/modules/slideshow/slideshow.edj
-%%NLS%%share/locale/eo/LC_MESSAGES/slideshow.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/slideshow.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/slideshow.mo
-%%NLS%%share/locale/it/LC_MESSAGES/slideshow.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/slideshow.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/eo/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/fi/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/fr/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/it/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/ja/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/sv/LC_MESSAGES/slideshow.mo
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale
 @dirrm lib/enlightenment/modules/slideshow/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/slideshow
 @dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-snow/Makefile b/x11/e17-module-snow/Makefile
index b79c8a7dd8c2..7d2084cacbc2 100644
--- a/x11/e17-module-snow/Makefile
+++ b/x11/e17-module-snow/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	snow
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11/e17-module-snow/distinfo b/x11/e17-module-snow/distinfo
index c88a10edbbf2..70f2f1b77341 100644
--- a/x11/e17-module-snow/distinfo
+++ b/x11/e17-module-snow/distinfo
@@ -1,3 +1,3 @@
-MD5 (snow-20070223.tar.bz2) = 820d1c99ba6007e4d0d7eca164cbbe9a
-SHA256 (snow-20070223.tar.bz2) = 4695cc214ababccb04ca746626bc87edeb32c5319c1b3f9b76eb92c7023c8396
-SIZE (snow-20070223.tar.bz2) = 278212
+MD5 (snow-20080223.tar.bz2) = 34c2e67e72f3c5b77813e01ec0e6102d
+SHA256 (snow-20080223.tar.bz2) = 869ba38e49a929cab5dd31a1c3b0e7e66676e1aa41596f2088c9be8ef223013d
+SIZE (snow-20080223.tar.bz2) = 234493
diff --git a/x11/e17-module-snow/pkg-plist b/x11/e17-module-snow/pkg-plist
index 31ad449eeda5..2f328ce1cb46 100644
--- a/x11/e17-module-snow/pkg-plist
+++ b/x11/e17-module-snow/pkg-plist
@@ -5,14 +5,27 @@ 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/e-module-snow.edj
 lib/enlightenment/modules/snow/tree.png
-%%NLS%%share/locale/eo/LC_MESSAGES/snow.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/snow.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/snow.mo
-%%NLS%%share/locale/it/LC_MESSAGES/snow.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/snow.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/eo/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/fi/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/fr/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/it/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/ja/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/sv/LC_MESSAGES/snow.mo
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale
 @dirrm lib/enlightenment/modules/snow/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/snow
 @dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-uptime/Makefile b/x11/e17-module-uptime/Makefile
index 41f7cb1d2e4e..5b7b9b457ec0 100644
--- a/x11/e17-module-uptime/Makefile
+++ b/x11/e17-module-uptime/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	uptime
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11/e17-module-uptime/distinfo b/x11/e17-module-uptime/distinfo
index a638c4ae756d..45f29f45c564 100644
--- a/x11/e17-module-uptime/distinfo
+++ b/x11/e17-module-uptime/distinfo
@@ -1,3 +1,3 @@
-MD5 (uptime-20070223.tar.bz2) = 0c806db8ced0ec7e6b544cd0096cbe83
-SHA256 (uptime-20070223.tar.bz2) = 96ebb7053d410ed5f56cf0359ad7d7e7c393de376b349dc1107c96355d76d2d0
-SIZE (uptime-20070223.tar.bz2) = 316556
+MD5 (uptime-20080223.tar.bz2) = 5e9d0e8da1f42c000179f32fd5366d72
+SHA256 (uptime-20080223.tar.bz2) = 73d354196917e907aa8568981cb650407d010954454745d76018ffe0f5c92e67
+SIZE (uptime-20080223.tar.bz2) = 272634
diff --git a/x11/e17-module-uptime/pkg-plist b/x11/e17-module-uptime/pkg-plist
index 37f9e851da0e..af2dfdfb44aa 100644
--- a/x11/e17-module-uptime/pkg-plist
+++ b/x11/e17-module-uptime/pkg-plist
@@ -2,18 +2,31 @@ 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
-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 lib/enlightenment/modules/uptime/%%E17_ARCH%%
-@dirrmtry lib/enlightenment/modules/uptime
+lib/enlightenment/modules/uptime/e-module-uptime.edj
+%%NLS%%lib/enlightenment/modules/uptime/locale/bg/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/eo/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/fi/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/fr/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/it/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/ja/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/sv/LC_MESSAGES/uptime.mo
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale
+@dirrm lib/enlightenment/modules/uptime/%%E17_ARCH%%
+@dirrm 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 376696b84436..c9b84e7eb2b0 100644
--- a/x11/e17-module-weather/Makefile
+++ b/x11/e17-module-weather/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	weather
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11/e17-module-weather/distinfo b/x11/e17-module-weather/distinfo
index b552ac86e987..e10aeab54741 100644
--- a/x11/e17-module-weather/distinfo
+++ b/x11/e17-module-weather/distinfo
@@ -1,3 +1,3 @@
-MD5 (weather-20070223.tar.bz2) = f8b7e939ed671722639e5d1fff8ed5cf
-SHA256 (weather-20070223.tar.bz2) = 796a3a1167677e1360af7d997245f7d6400b89e1b9d173e9d775325fc2c77056
-SIZE (weather-20070223.tar.bz2) = 868191
+MD5 (weather-20080223.tar.bz2) = b275301cf3bfc104c62b59ab59b7195a
+SHA256 (weather-20080223.tar.bz2) = 04ac1173638961708c3787d49bafff44a138da528a6e8b5bed81cc23f251d8bc
+SIZE (weather-20080223.tar.bz2) = 930951
diff --git a/x11/e17-module-weather/pkg-plist b/x11/e17-module-weather/pkg-plist
index 8c41253f625e..69beaa879d6a 100644
--- a/x11/e17-module-weather/pkg-plist
+++ b/x11/e17-module-weather/pkg-plist
@@ -2,12 +2,87 @@ 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/module.desktop
-lib/enlightenment/modules/weather/module.edj
 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
+lib/enlightenment/modules/weather/e-module-weather.edj
+lib/enlightenment/modules/weather/images/blizzard.png
+lib/enlightenment/modules/weather/images/blowingsnow.png
+lib/enlightenment/modules/weather/images/chancetstorm.png
+lib/enlightenment/modules/weather/images/chancetstormn.png
+lib/enlightenment/modules/weather/images/clear-sky.png
+lib/enlightenment/modules/weather/images/cloud.png
+lib/enlightenment/modules/weather/images/cloudy.png
+lib/enlightenment/modules/weather/images/cloudy_night.png
+lib/enlightenment/modules/weather/images/drizzle.png
+lib/enlightenment/modules/weather/images/fair.png
+lib/enlightenment/modules/weather/images/fdrizzle.png
+lib/enlightenment/modules/weather/images/flurries.png
+lib/enlightenment/modules/weather/images/fog.png
+lib/enlightenment/modules/weather/images/freezingrain.png
+lib/enlightenment/modules/weather/images/hazy.png
+lib/enlightenment/modules/weather/images/heavy-rain.png
+lib/enlightenment/modules/weather/images/ice.png
+lib/enlightenment/modules/weather/images/isolated.t-storm.png
+lib/enlightenment/modules/weather/images/light-rain.png
+lib/enlightenment/modules/weather/images/light-snow.png
+lib/enlightenment/modules/weather/images/luna-ceatza.png
+lib/enlightenment/modules/weather/images/luna-nori.png
+lib/enlightenment/modules/weather/images/mcloudy.png
+lib/enlightenment/modules/weather/images/mcloudyn.png
+lib/enlightenment/modules/weather/images/mcloudynr.png
+lib/enlightenment/modules/weather/images/mcloudyns.png
+lib/enlightenment/modules/weather/images/mcloudyr.png
+lib/enlightenment/modules/weather/images/mcloudys.png
+lib/enlightenment/modules/weather/images/moon-rain.png
+lib/enlightenment/modules/weather/images/moon-snow.png
+lib/enlightenment/modules/weather/images/moon-tstorm.png
+lib/enlightenment/modules/weather/images/moon.png
+lib/enlightenment/modules/weather/images/mostly-cloudy.png
+lib/enlightenment/modules/weather/images/pcloudy.png
+lib/enlightenment/modules/weather/images/pcloudyn.png
+lib/enlightenment/modules/weather/images/pcloudynr.png
+lib/enlightenment/modules/weather/images/pcloudyns.png
+lib/enlightenment/modules/weather/images/pcloudyr.png
+lib/enlightenment/modules/weather/images/pcloudyrn.png
+lib/enlightenment/modules/weather/images/pcloudys.png
+lib/enlightenment/modules/weather/images/rain.png
+lib/enlightenment/modules/weather/images/rainandsnow.png
+lib/enlightenment/modules/weather/images/showers.png
+lib/enlightenment/modules/weather/images/sleet.png
+lib/enlightenment/modules/weather/images/smoke.png
+lib/enlightenment/modules/weather/images/snow.png
+lib/enlightenment/modules/weather/images/snowshowers.png
+lib/enlightenment/modules/weather/images/sun-light-clouds.png
+lib/enlightenment/modules/weather/images/sun.png
+lib/enlightenment/modules/weather/images/suncloud.png
+lib/enlightenment/modules/weather/images/sunny.png
+lib/enlightenment/modules/weather/images/sunnyn.png
+lib/enlightenment/modules/weather/images/sunrain.png
+lib/enlightenment/modules/weather/images/sunsnow.png
+lib/enlightenment/modules/weather/images/t-storm_night.png
+lib/enlightenment/modules/weather/images/thunder.png
+lib/enlightenment/modules/weather/images/tstorm.png
+lib/enlightenment/modules/weather/images/tstormn.png
+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
+%%NLS%%lib/enlightenment/modules/weather/locale/eo/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/fi/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/it/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/ja/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/sv/LC_MESSAGES/weather.mo
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale
+@dirrm lib/enlightenment/modules/weather/images
 @dirrm lib/enlightenment/modules/weather/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/weather
 @dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-winselector/Makefile b/x11/e17-module-winselector/Makefile
index 485bf032a019..913233e4d994 100644
--- a/x11/e17-module-winselector/Makefile
+++ b/x11/e17-module-winselector/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	winselector
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
diff --git a/x11/e17-module-winselector/distinfo b/x11/e17-module-winselector/distinfo
index 417522d22d7b..bf1bec42b879 100644
--- a/x11/e17-module-winselector/distinfo
+++ b/x11/e17-module-winselector/distinfo
@@ -1,3 +1,3 @@
-MD5 (winselector-20070223.tar.bz2) = bfd3d02ddda2bec18a400175bf6d6b6a
-SHA256 (winselector-20070223.tar.bz2) = b25e693378fd8cd64d69c8d5301b915e94b48e8d18a012850efef0ce928d0794
-SIZE (winselector-20070223.tar.bz2) = 271828
+MD5 (winselector-20080223.tar.bz2) = a3f10fee0c678ebff0dfa0a9f970362d
+SHA256 (winselector-20080223.tar.bz2) = 30a87d45b954627dcb44e5a2f404a59c6f5eb1dcb0938a2b4bfe07aec74f0332
+SIZE (winselector-20080223.tar.bz2) = 246692
diff --git a/x11/e17-module-winselector/pkg-plist b/x11/e17-module-winselector/pkg-plist
index 27724a16ee28..61cdf4bfb075 100644
--- a/x11/e17-module-winselector/pkg-plist
+++ b/x11/e17-module-winselector/pkg-plist
@@ -2,8 +2,7 @@ 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/e-module-winselector.edj
 lib/enlightenment/modules/winselector/winselector.edj
 @dirrm lib/enlightenment/modules/winselector/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/winselector
diff --git a/x11/ecore-desktop/Makefile b/x11/ecore-desktop/Makefile
new file mode 100644
index 000000000000..8a24b4e145b8
--- /dev/null
+++ b/x11/ecore-desktop/Makefile
@@ -0,0 +1,56 @@
+# New ports collection makefile for:	ecore-desktop
+# Date created:				22 September 2007
+# Whom:					Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	desktop
+PORTVERSION=	0.9.9.042
+PORTREVISION=	0
+CATEGORIES=	x11
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	ecore-
+DISTNAME=	ecore-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	Enlightenment core abstraction library (desktop module)
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_LDCONFIG=	yes
+USE_GETOPT_LONG=yes
+USE_EFL=	ecore
+USE_EFL_ECORE=	file
+BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_desktop
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+CONFIGURE_ARGS=	--disable-ecore-con \
+		--disable-ecore-config \
+		--enable-ecore-desktop \
+		--disable-ecore-directfb \
+		--disable-ecore-evas \
+		--enable-ecore-file \
+		--disable-ecore-ipc \
+		--disable-ecore-job \
+		--disable-ecore-sdl \
+		--disable-ecore-txt \
+		--disable-ecore-x \
+		--disable-ecore-imf \
+		--disable-ecore-imf_evas
+
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore_file/\.libs,${LOCALBASE}/lib,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore_file/libecore_file\.la,-lecore_file,'\
+		${BUILD_WRKSRC}/Makefile.in
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/ecore-desktop.pc \
+		${PREFIX}/libdata/pkgconfig/
+
+.include <bsd.port.mk>
diff --git a/x11/ecore-desktop/distinfo b/x11/ecore-desktop/distinfo
new file mode 100644
index 000000000000..4672f6a1c167
--- /dev/null
+++ b/x11/ecore-desktop/distinfo
@@ -0,0 +1,3 @@
+MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
+SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
+SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
diff --git a/x11/ecore-desktop/pkg-descr b/x11/ecore-desktop/pkg-descr
new file mode 100644
index 000000000000..2559668d0e57
--- /dev/null
+++ b/x11/ecore-desktop/pkg-descr
@@ -0,0 +1,5 @@
+A core event abstracter layer and X abstraction layer that makes doing
+selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
+fast, optimised, and convenient.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Ecore/
diff --git a/x11/ecore-desktop/pkg-plist b/x11/ecore-desktop/pkg-plist
new file mode 100644
index 000000000000..257a4b52a74b
--- /dev/null
+++ b/x11/ecore-desktop/pkg-plist
@@ -0,0 +1,6 @@
+include/Ecore_Desktop.h
+lib/libecore_desktop.a
+lib/libecore_desktop.la
+lib/libecore_desktop.so
+lib/libecore_desktop.so.9
+libdata/pkgconfig/ecore-desktop.pc
diff --git a/x11/ecore-imf/Makefile b/x11/ecore-imf/Makefile
new file mode 100644
index 000000000000..06781e11477c
--- /dev/null
+++ b/x11/ecore-imf/Makefile
@@ -0,0 +1,55 @@
+# New ports collection makefile for:	ecore-imf
+# Date created:				17 September 2007
+# Whom:					Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	imf
+PORTVERSION=	0.9.9.042
+PORTREVISION=	0
+CATEGORIES=	x11
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	ecore-
+DISTNAME=	ecore-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	Enlightenment core abstraction library (IMF module)
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_LDCONFIG=	yes
+USE_GETOPT_LONG=yes
+USE_EFL=	ecore
+BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_imf
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+CONFIGURE_ARGS=	--enable-ecore-con \
+		--enable-ecore-config \
+		--disable-ecore-desktop \
+		--disable-ecore-directfb \
+		--disable-ecore-evas \
+		--disable-ecore-file \
+		--disable-ecore-ipc \
+		--disable-ecore-job \
+		--disable-ecore-sdl \
+		--disable-ecore-txt \
+		--disable-ecore-x \
+		--enable-ecore-imf \
+		--disable-ecore-imf_evas
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
+		${BUILD_WRKSRC}/Makefile.in
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/ecore-imf.pc \
+		${PREFIX}/libdata/pkgconfig/
+
+.include <bsd.port.post.mk>
diff --git a/x11/ecore-imf/distinfo b/x11/ecore-imf/distinfo
new file mode 100644
index 000000000000..4672f6a1c167
--- /dev/null
+++ b/x11/ecore-imf/distinfo
@@ -0,0 +1,3 @@
+MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
+SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
+SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
diff --git a/x11/ecore-imf/pkg-descr b/x11/ecore-imf/pkg-descr
new file mode 100644
index 000000000000..2559668d0e57
--- /dev/null
+++ b/x11/ecore-imf/pkg-descr
@@ -0,0 +1,5 @@
+A core event abstracter layer and X abstraction layer that makes doing
+selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
+fast, optimised, and convenient.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Ecore/
diff --git a/x11/ecore-imf/pkg-plist b/x11/ecore-imf/pkg-plist
new file mode 100644
index 000000000000..2f0ba4d3e68e
--- /dev/null
+++ b/x11/ecore-imf/pkg-plist
@@ -0,0 +1,6 @@
+include/Ecore_IMF.h
+lib/libecore_imf.a
+lib/libecore_imf.la
+lib/libecore_imf.so
+lib/libecore_imf.so.9
+libdata/pkgconfig/ecore-imf.pc
diff --git a/x11/ecore-imf_evas/Makefile b/x11/ecore-imf_evas/Makefile
new file mode 100644
index 000000000000..9b8da10f7b04
--- /dev/null
+++ b/x11/ecore-imf_evas/Makefile
@@ -0,0 +1,58 @@
+# New ports collection makefile for:	ecore-emf_evas
+# Date created:				17 September 2007
+# Whom:					Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	imf_evas
+PORTVERSION=	0.9.9.042
+PORTREVISION=	0
+CATEGORIES=	x11
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	ecore-
+DISTNAME=	ecore-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	Enlightenment core abstraction library (config module)
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_LDCONFIG=	yes
+USE_GETOPT_LONG=yes
+USE_EFL=	ecore evas
+USE_EFL_ECORE=	imf
+BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_imf_evas
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+CONFIGURE_ARGS=	--enable-ecore-con \
+		--enable-ecore-config \
+		--disable-ecore-desktop \
+		--disable-ecore-directfb \
+		--disable-ecore-evas \
+		--disable-ecore-file \
+		--enable-ecore-ipc \
+		--disable-ecore-job \
+		--disable-ecore-sdl \
+		--disable-ecore-txt \
+		--disable-ecore-x \
+		--enable-ecore-imf \
+		--enable-ecore-imf_evas
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore_imf/\.libs,${LOCALBASE}/lib,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore_imf/libecore_imf\.la,-lecore_imf,'\
+		${BUILD_WRKSRC}/Makefile.in
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/ecore-imf-evas.pc \
+		${PREFIX}/libdata/pkgconfig/
+
+.include <bsd.port.post.mk>
diff --git a/x11/ecore-imf_evas/distinfo b/x11/ecore-imf_evas/distinfo
new file mode 100644
index 000000000000..4672f6a1c167
--- /dev/null
+++ b/x11/ecore-imf_evas/distinfo
@@ -0,0 +1,3 @@
+MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
+SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
+SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
diff --git a/x11/ecore-imf_evas/pkg-descr b/x11/ecore-imf_evas/pkg-descr
new file mode 100644
index 000000000000..2559668d0e57
--- /dev/null
+++ b/x11/ecore-imf_evas/pkg-descr
@@ -0,0 +1,5 @@
+A core event abstracter layer and X abstraction layer that makes doing
+selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
+fast, optimised, and convenient.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Ecore/
diff --git a/x11/ecore-imf_evas/pkg-plist b/x11/ecore-imf_evas/pkg-plist
new file mode 100644
index 000000000000..05465e4c7e01
--- /dev/null
+++ b/x11/ecore-imf_evas/pkg-plist
@@ -0,0 +1,6 @@
+include/Ecore_IMF_Evas.h
+lib/libecore_imf_evas.a
+lib/libecore_imf_evas.la
+lib/libecore_imf_evas.so
+lib/libecore_imf_evas.so.9
+libdata/pkgconfig/ecore-imf-evas.pc
diff --git a/x11/ecore-x11/Makefile b/x11/ecore-x11/Makefile
new file mode 100644
index 000000000000..5b6c43d60f7e
--- /dev/null
+++ b/x11/ecore-x11/Makefile
@@ -0,0 +1,115 @@
+# New ports collection makefile for:	ecore-x11
+# Date created:				17 September 2007
+# Whom:					Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	x11
+PORTVERSION=	0.9.9.042
+PORTREVISION=	0
+CATEGORIES=	x11
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX=	ecore-
+DISTNAME=	ecore-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	Enlightenment core abstraction library (x11 module)
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_LDCONFIG=	yes
+USE_GETOPT_LONG=yes
+USE_EFL=	ecore
+USE_EFL_ECORE=	txt
+BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_x
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+XEXTDIR=	${LOCALBASE}/include/X11/extensions
+
+CONFIGURE_ARGS=	--disable-ecore-con \
+		--disable-ecore-config \
+		--disable-ecore-desktop \
+		--disable-ecore-directfb \
+		--disable-ecore-evas \
+		--disable-ecore-file \
+		--disable-ecore-ipc \
+		--disable-ecore-job \
+		--disable-ecore-sdl \
+		--disable-ecore-txt \
+		--enable-ecore-x \
+		--disable-ecore-imf \
+		--disable-ecore-imf_evas
+
+OPTIONS=	XDAMAGE		"Enable Xdamage support (requires X11)" on \
+		XDPMS		"Enable Xdpms support (requires X11)" on \
+		XFIXES		"Enable Xfixes support (requires X11)" on \
+		XINERAMA	"Enable Xinerama support (requires X11)" on \
+		XPRINT		"Enable Xprint support (requires X11)" on \
+		XRANDR		"Enable Xrandr support (requires X11)" on \
+		XRENDER		"Enable Xrender support (requires X11)" on \
+		XSS		"Enable Xscrnsaver support (requires X11)" on \
+		XCURSOR		"Enable Xcursor support (requires X11)" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_XDAMAGE) || exists(${XEXTDIR}/Xdamage.h)
+USE_XORG+=	xdamage
+WITH_X11=	yes
+.endif
+
+.if !defined(WITHOUT_XDPMS) || exists(${XEXTDIR}/dpms.h)
+USE_XORG+=	xextproto
+WITH_X11=	yes
+.endif
+
+.if !defined(WITHOUT_XFIXES) || exists(${XEXTDIR}/Xfixes.h)
+USE_XORG+=	xfixes
+WITH_X11=	yes
+.endif
+
+.if !defined(WITHOUT_XINERAMA) || exists(${XEXTDIR}/Xinerama.h)
+USE_XORG+=	xineramaproto
+WITH_X11=	yes
+.endif
+
+.if !defined(WITHOUT_XPRINT) || exists(${XEXTDIR}/Print.h)
+USE_XORG+=	printproto
+WITH_X11=	yes
+.endif
+
+.if !defined(WITHOUT_XRANDR) || exists(${XEXTDIR}/Xrandr.h)
+USE_XORG+=	xrandr
+WITH_X11=	yes
+.endif
+
+.if !defined(WITHOUT_XRENDER) || exists(${XEXTDIR}/Xrender.h)
+USE_XORG+=	xrender
+WITH_X11=	yes
+.endif
+
+.if !defined(WITHOUT_XSS) || exists(${XEXTDIR}/scrnsaver.h)
+USE_XORG+=	xscrnsaver
+WITH_X11=	yes
+.endif
+
+.if !defined(WITHOUT_XCURSOR) \
+	|| exists(${LOCALBASE}/include/X11/Xcursor/Xcursor.h)
+USE_XORG+=	xcursor
+WITH_X11=	yes
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore_txt/\.libs,${LOCALBASE}/lib,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore_txt/libecore_txt\.la,-lecore_txt,'\
+		${BUILD_WRKSRC}/Makefile.in
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/ecore-x.pc \
+		${PREFIX}/libdata/pkgconfig/
+
+.include <bsd.port.post.mk>
diff --git a/x11/ecore-x11/distinfo b/x11/ecore-x11/distinfo
new file mode 100644
index 000000000000..4672f6a1c167
--- /dev/null
+++ b/x11/ecore-x11/distinfo
@@ -0,0 +1,3 @@
+MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
+SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
+SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
diff --git a/x11/ecore-x11/pkg-descr b/x11/ecore-x11/pkg-descr
new file mode 100644
index 000000000000..2559668d0e57
--- /dev/null
+++ b/x11/ecore-x11/pkg-descr
@@ -0,0 +1,5 @@
+A core event abstracter layer and X abstraction layer that makes doing
+selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
+fast, optimised, and convenient.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Ecore/
diff --git a/x11/ecore-x11/pkg-plist b/x11/ecore-x11/pkg-plist
new file mode 100644
index 000000000000..acc2454607d3
--- /dev/null
+++ b/x11/ecore-x11/pkg-plist
@@ -0,0 +1,8 @@
+include/Ecore_X.h
+include/Ecore_X_Atoms.h
+include/Ecore_X_Cursor.h
+lib/libecore_x.a
+lib/libecore_x.la
+lib/libecore_x.so
+lib/libecore_x.so.9
+libdata/pkgconfig/ecore-x.pc
diff --git a/x11/ecore/Makefile b/x11/ecore/Makefile
deleted file mode 100644
index cbf530616cce..000000000000
--- a/x11/ecore/Makefile
+++ /dev/null
@@ -1,100 +0,0 @@
-# New ports collection makefile for:	ecore
-# Date created:				16 March 2001
-# Whom:					Jeremy Norris <ishmael27@home.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ecore
-PORTVERSION=	20070223
-PORTREVISION=	2
-PORTEPOCH=	1
-CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
-
-MAINTAINER=	stas@FreeBSD.org
-COMMENT=	A core event abstraction library
-
-GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
-USE_ICONV=	yes
-USE_GNOME=	gnomehack pkgconfig gnometarget
-USE_EFL=	evas
-USE_LDCONFIG=	yes
-USE_GETOPT_LONG=yes
-
-CONFIGURE_ARGS=	--disable-ecore-dfb
-
-OPTIONS=	DBUS		"Enable DBUS support" on \
-		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.4:${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=""
-.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.post.mk>
diff --git a/x11/ecore/distinfo b/x11/ecore/distinfo
deleted file mode 100644
index 3bfabbeb47d1..000000000000
--- a/x11/ecore/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (ecore-20070223.tar.bz2) = 7e96f780b7d72da8ff73b34d9bb0643a
-SHA256 (ecore-20070223.tar.bz2) = 32f62ea6d92a594cc1dc17203c38404fe75b5d006fc4374c47a3076f53884d26
-SIZE (ecore-20070223.tar.bz2) = 3652857
diff --git a/x11/ecore/pkg-plist b/x11/ecore/pkg-plist
deleted file mode 100644
index a4a3385f209b..000000000000
--- a/x11/ecore/pkg-plist
+++ /dev/null
@@ -1,63 +0,0 @@
-bin/ecore-config
-%%EET%%bin/ecore_config
-include/Ecore.h
-include/Ecore_Con.h
-%%EET%%include/Ecore_Config.h
-%%DBUS%%include/Ecore_DBus.h
-include/Ecore_Data.h
-include/Ecore_Desktop.h
-%%EVAS%%include/Ecore_Evas.h
-include/Ecore_File.h
-include/Ecore_Ipc.h
-include/Ecore_Job.h
-include/Ecore_Str.h
-include/Ecore_Txt.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
-lib/libecore.so.1
-lib/libecore_con.a
-lib/libecore_con.la
-lib/libecore_con.so
-lib/libecore_con.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
-lib/libecore_file.so.1
-lib/libecore_ipc.a
-lib/libecore_ipc.la
-lib/libecore_ipc.so
-lib/libecore_ipc.so.1
-lib/libecore_job.a
-lib/libecore_job.la
-lib/libecore_job.so
-lib/libecore_job.so.1
-lib/libecore_txt.a
-lib/libecore_txt.la
-lib/libecore_txt.so
-lib/libecore_txt.so.1
-%%X11%%lib/libecore_x.a
-%%X11%%lib/libecore_x.la
-%%X11%%lib/libecore_x.so
-%%X11%%lib/libecore_x.so.1
-libdata/pkgconfig/ecore.pc
-share/aclocal/ecore.m4
diff --git a/x11/efreet/Makefile b/x11/efreet/Makefile
new file mode 100644
index 000000000000..a62b9bd2d73e
--- /dev/null
+++ b/x11/efreet/Makefile
@@ -0,0 +1,27 @@
+# New ports collection makefile for:	efreet
+# Date created:				28 September 2007
+# Whom:					Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	efreet
+PORTVERSION=	0.0.3.042
+CATEGORIES=	x11
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	Freedesktop.org EFL compatiblity layer
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack gnometarget pkgconfig
+USE_EFL=	ecore
+USE_EFL_ECORE=	file
+USE_LDCONFIG=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -E -e 's,-g -O0,,g' ${WRKSRC}/src/lib/Makefile.in
+
+.include <bsd.port.mk>
diff --git a/x11/efreet/distinfo b/x11/efreet/distinfo
new file mode 100644
index 000000000000..ca14c8d1222b
--- /dev/null
+++ b/x11/efreet/distinfo
@@ -0,0 +1,3 @@
+MD5 (efreet-0.0.3.042.tar.bz2) = d6ff6e116a839ce81821359a1cc2924a
+SHA256 (efreet-0.0.3.042.tar.bz2) = 07f5830f68ebc29df76a73dc44a16f258b1dccaf999b96cf6aa580dda7d42e47
+SIZE (efreet-0.0.3.042.tar.bz2) = 272194
diff --git a/x11/efreet/pkg-descr b/x11/efreet/pkg-descr
new file mode 100644
index 000000000000..099f48017260
--- /dev/null
+++ b/x11/efreet/pkg-descr
@@ -0,0 +1,10 @@
+Efreet is an implementation of several specifications from freedesktop.org
+intended for use in Enlightenment DR17 (e17) and other applications using
+the Enlightenment Foundation Libraries (EFL). Currently, the following
+specifications are included:
+  o Base Directory
+  o Desktop Entry
+  o Icon Theme
+  o Menu
+
+WWW: http://www.enlightenment.org/
diff --git a/x11/efreet/pkg-plist b/x11/efreet/pkg-plist
new file mode 100644
index 000000000000..92ac4799ca01
--- /dev/null
+++ b/x11/efreet/pkg-plist
@@ -0,0 +1,37 @@
+bin/efreet_alloc
+bin/efreet_cache_test
+bin/efreet_menu_alloc
+bin/efreet_spec_test
+bin/efreet_test
+include/efreet/Efreet.h
+include/efreet/Efreet_Mime.h
+include/efreet/efreet_base.h
+include/efreet/efreet_desktop.h
+include/efreet/efreet_icon.h
+include/efreet/efreet_ini.h
+include/efreet/efreet_menu.h
+include/efreet/efreet_utils.h
+lib/libefreet.a
+lib/libefreet.la
+lib/libefreet.so
+lib/libefreet.so.0
+lib/libefreet_mime.a
+lib/libefreet_mime.la
+lib/libefreet_mime.so
+lib/libefreet_mime.so.0
+libdata/pkgconfig/efreet-mime.pc
+libdata/pkgconfig/efreet.pc
+%%DATADIR%%/test/entry
+%%DATADIR%%/test/entry.png
+%%DATADIR%%/test/long.ini
+%%DATADIR%%/test/preferences.menu
+%%DATADIR%%/test/sub/test.desktop
+%%DATADIR%%/test/test.desktop
+%%DATADIR%%/test/test.ini
+%%DATADIR%%/test/test.menu
+%%DATADIR%%/test/test_menu_slash_bad.menu
+%%DATADIR%%/test/test_type.desktop
+@dirrm %%DATADIR%%/test/sub
+@dirrm %%DATADIR%%/test
+@dirrm %%DATADIR%%
+@dirrm include/efreet
diff --git a/x11/elicit/Makefile b/x11/elicit/Makefile
index 4b8ca6638738..92f8024effd7 100644
--- a/x11/elicit/Makefile
+++ b/x11/elicit/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	elicit
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
@@ -19,8 +19,9 @@ GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget pkgconfig
-USE_EFL=	ecore edb eet edje evas imlib2
-USE_EFL_ESMART=	trans_x11
+USE_EFL=	ecore eet edje evas imlib2
+USE_EFL_ESMART=	draggies container
+USE_EFL_ECORE=	evas file config
 
 .include <bsd.port.pre.mk>
 .if ${ARCH} == "ia64"
diff --git a/x11/elicit/distinfo b/x11/elicit/distinfo
index b540de0e04cf..0ee5e4e51cdf 100644
--- a/x11/elicit/distinfo
+++ b/x11/elicit/distinfo
@@ -1,3 +1,3 @@
-MD5 (elicit-20070223.tar.bz2) = dbb76ba14f55983308096cb2b5af7525
-SHA256 (elicit-20070223.tar.bz2) = e2745d2b55012998d6b942338fe1d8f1afcd3f1afc645ed578ef001a817779c5
-SIZE (elicit-20070223.tar.bz2) = 460846
+MD5 (elicit-20080223.tar.bz2) = ee6e22c97be98b05b4f66f4ae23765ec
+SHA256 (elicit-20080223.tar.bz2) = 9f61a672b4d08eadb14daa5e5c8f199ec883cd7af126cca60f3d0242a7fc8ef3
+SIZE (elicit-20080223.tar.bz2) = 463346
diff --git a/x11/emprint/Makefile b/x11/emprint/Makefile
new file mode 100644
index 000000000000..e58744bf0b8d
--- /dev/null
+++ b/x11/emprint/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	efreet
+# Date created:				28 September 2007
+# Whom:					Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	emprint
+PORTVERSION=	20080223
+CATEGORIES=	x11
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	Utility for taking screenshots for E17
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack gnometarget pkgconfig
+USE_EFL=	ecore evas edje imlib2
+USE_EFL_ECORE=	file x11 evas
+
+.include <bsd.port.mk>
diff --git a/x11/emprint/distinfo b/x11/emprint/distinfo
new file mode 100644
index 000000000000..98eb8710cd66
--- /dev/null
+++ b/x11/emprint/distinfo
@@ -0,0 +1,3 @@
+MD5 (emprint-20080223.tar.bz2) = 380daace1a8b290f427661f58f084f18
+SHA256 (emprint-20080223.tar.bz2) = bc32d9cf11be8ae0eb8760fb3756d6c694fb3f97ea1cc5a534f5f247ac3dfa60
+SIZE (emprint-20080223.tar.bz2) = 217507
diff --git a/x11/emprint/pkg-descr b/x11/emprint/pkg-descr
new file mode 100644
index 000000000000..8778c32001da
--- /dev/null
+++ b/x11/emprint/pkg-descr
@@ -0,0 +1,4 @@
+Emprint is a utility for taking screenshots of the entire screen, a specific
+window, or a specific region.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11/emprint/pkg-plist b/x11/emprint/pkg-plist
new file mode 100644
index 000000000000..2cfe8acf698b
--- /dev/null
+++ b/x11/emprint/pkg-plist
@@ -0,0 +1,4 @@
+bin/emprint
+%%DATADIR%%/images/rect.png
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%
diff --git a/x11/enity/Makefile b/x11/enity/Makefile
index 644c7d07f164..1553ba8199df 100644
--- a/x11/enity/Makefile
+++ b/x11/enity/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	enity
-PORTVERSION=	20070223
-PORTREVISION=	2
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
diff --git a/x11/enity/distinfo b/x11/enity/distinfo
index 576959f023c8..c483604017a9 100644
--- a/x11/enity/distinfo
+++ b/x11/enity/distinfo
@@ -1,3 +1,3 @@
-MD5 (enity-20070223.tar.bz2) = a17a38719fb8e118dda824b13afa56a9
-SHA256 (enity-20070223.tar.bz2) = a2a147cee3fa682a09c42207b420856d0be3f092495dc7d17926794aed273c76
-SIZE (enity-20070223.tar.bz2) = 231111
+MD5 (enity-20080223.tar.bz2) = c2fb4e7e0b8fd576a827377ad3f73d20
+SHA256 (enity-20080223.tar.bz2) = 5f68effe8cb8e3edc6970283eaae1148c77141db55fc01c30f694844434c6cbc
+SIZE (enity-20080223.tar.bz2) = 233367
diff --git a/x11/enterminus/Makefile b/x11/enterminus/Makefile
index 97829af1a7a8..f1db7b3fba1d 100644
--- a/x11/enterminus/Makefile
+++ b/x11/enterminus/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	enterminus
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
@@ -19,6 +19,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
 USE_EFL=	evas ecore
+USE_EFL_ECORE=	evas job
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11/enterminus/distinfo b/x11/enterminus/distinfo
index c80c688406f5..e3143a6b3177 100644
--- a/x11/enterminus/distinfo
+++ b/x11/enterminus/distinfo
@@ -1,3 +1,3 @@
-MD5 (enterminus-20070223.tar.bz2) = d896c9273317a302692f5c6f0a864933
-SHA256 (enterminus-20070223.tar.bz2) = 061614ee1ba76b4def1cff86cb46118e3536a52848748384179cedb104d71c23
-SIZE (enterminus-20070223.tar.bz2) = 269142
+MD5 (enterminus-20080223.tar.bz2) = a36363be8042b66540e4bccbc2a4f543
+SHA256 (enterminus-20080223.tar.bz2) = 7a8ae2a2c14afe9d2de880bd25149c8a9816273c4e8451014fd2fce800e4fe1b
+SIZE (enterminus-20080223.tar.bz2) = 275665
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index ef0c52d8db27..94ab8305b9ef 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eterm
 PORTVERSION=	0.9.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES+=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,8 +17,7 @@ MAINTAINER?=	olgeni@FreeBSD.org
 COMMENT?=	X11 terminal emulator based on rxvt/xterm
 
 BUILD_DEPENDS=	man2html:${PORTSDIR}/textproc/man2html
-LIB_DEPENDS=	Imlib2.4:${PORTSDIR}/graphics/imlib2 \
-		ast.2:${PORTSDIR}/devel/libast
+LIB_DEPENDS=	ast.2:${PORTSDIR}/devel/libast
 
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
@@ -31,6 +30,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 OPTIONS=	MMX	"With MMX instruction set" off
 USE_XLIB=	yes
 USE_ICONV=	yes
+USE_EFL=	imlib2
 
 MAN1=		Eterm.1
 
diff --git a/x11/examine/Makefile b/x11/examine/Makefile
index d3c195da1644..b25ef941da5d 100644
--- a/x11/examine/Makefile
+++ b/x11/examine/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	examine
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
@@ -20,6 +20,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget pkgconfig
 USE_EFL=	ecore ewl
+USE_EFL_ECORE=	ipc config
 
 PLIST_FILES=	bin/examine bin/exsh
 
diff --git a/x11/examine/distinfo b/x11/examine/distinfo
index 2ff0cb40d240..9267173d4b72 100644
--- a/x11/examine/distinfo
+++ b/x11/examine/distinfo
@@ -1,3 +1,3 @@
-MD5 (examine-20070223.tar.bz2) = ba8357186142e80fda2c8c9a8ed4924f
-SHA256 (examine-20070223.tar.bz2) = e403fd35c538c41c3420e7e25376082a8087bd5dec2131fed96cd87cfba494dc
-SIZE (examine-20070223.tar.bz2) = 1260363
+MD5 (examine-20080223.tar.bz2) = f8d1d9311eba105edc605dcbfc140038
+SHA256 (examine-20080223.tar.bz2) = 22cd4deb28c803f388df3d99acdb967b0a90e52363bac09bfbe69c1a63a4ea66
+SIZE (examine-20080223.tar.bz2) = 1264243
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index 037c3d2951b3..56dd20959248 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fbdesk
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://fluxbox.sourceforge.net/download/ \
 		${MASTER_SITE_GENTOO} \
@@ -27,6 +28,7 @@ GNU_CONFIGURE=	yes
 
 PORTDOCS=	ChangeLog INSTALL README
 PLIST_FILES=	bin/fbdesk
+USE_EFL=	imlib2
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11/idesk/Makefile b/x11/idesk/Makefile
index 7476b543f525..044717f8dd92 100644
--- a/x11/idesk/Makefile
+++ b/x11/idesk/Makefile
@@ -15,11 +15,10 @@ MASTER_SITE_SUBDIR=	${PORTNAME}/
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Place launch icons and background directly on your desktop
 
-BUILD_DEPENDS=	imlib2-config:${PORTSDIR}/graphics/imlib2
-
 USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf:261
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11/ipager/Makefile b/x11/ipager/Makefile
index fdf803226311..0eae108ed68a 100644
--- a/x11/ipager/Makefile
+++ b/x11/ipager/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ipager
 PORTVERSION=	1.1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://useperl.ru/ipager/src/
 DISTNAME=	ipager-${PORTVERSION}
@@ -15,9 +15,8 @@ DISTNAME=	ipager-${PORTVERSION}
 MAINTAINER=	vlad@vlad.uz.ua
 COMMENT=	X11 pager program
 
-LIB_DEPENDS+=	Imlib2.4:${PORTSDIR}/graphics/imlib2
-
 USE_SCONS=	yes
+USE_EFL=	imlib2
 
 PLIST_FILES=	bin/ipager \
 		%%DATADIR%%/themes/atlantis.conf \
diff --git a/x11/wmmsg/Makefile b/x11/wmmsg/Makefile
index be6e7ed7246a..3c22e69dcbe1 100644
--- a/x11/wmmsg/Makefile
+++ b/x11/wmmsg/Makefile
@@ -14,14 +14,13 @@ MASTER_SITES=	http://mirror.israel.net/pub/FreeBSD/distfiles/
 MAINTAINER=	t.kempka@web.de
 COMMENT=	Dockapp that notifies you on ICQ, AIM and IRC events
 
-LIB_DEPENDS=	Imlib2.4:${PORTSDIR}/graphics/imlib2
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_GNOME=	gtk12
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
+USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
 
 MAN1=		wmmsg.1
author	Stanislav Sedov <stas@FreeBSD.org>	2008-03-11 21:13:53 +0000
committer	Stanislav Sedov <stas@FreeBSD.org>	2008-03-11 21:13:53 +0000
commit	9a2e4c8b780fc607dc4b4adabefb354c84401a96 (patch)
tree	f59767aed29b447d3d80ab987e898598663c27e3
parent	621c804e48a9fdddd6a00d78585fa8cb20c8460e (diff)
download	ports-9a2e4c8b780fc607dc4b4adabefb354c84401a96.tar.gz ports-9a2e4c8b780fc607dc4b4adabefb354c84401a96.zip