- Move to LOCALBASE

- Use new EFL framework - Update all e17 ports to the lates stable cvs snapshot - Add additional knobs/options to ports makefiles to control the feature set - Add a bunch of new e17 applications/libraries - Minor improvements/modification. Approved by: vanilla (old maintainer), sem (mentor)
author: Stanislav Sedov <stas@FreeBSD.org> 2006-10-08 13:48:37 +0000
committer: Stanislav Sedov <stas@FreeBSD.org> 2006-10-08 13:48:37 +0000
commit: ee774b0f4fa7f1842f6b4dfdfe60b22cbcf12442 (patch)
tree: 1bf12eadb5a7920766bf7a613174c0475b810d0d
parent: 32e98c797bd5b952894ff185e59df8a91844f4ab (diff)
download: ports-ee774b0f4fa7f1842f6b4dfdfe60b22cbcf12442.tar.gz
ports-ee774b0f4fa7f1842f6b4dfdfe60b22cbcf12442.zip
265 files changed, 3459 insertions, 1693 deletions
diff --git a/audio/emphasis/Makefile b/audio/emphasis/Makefile
new file mode 100644
index 000000000000..8f0a132a52cf
--- /dev/null
+++ b/audio/emphasis/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	emphasis
+# Date created:		2006-08-14
+# Whom:			Stanislav Sedov <ssedov@mbsd.msk.ru>
+#
+# $MBSDlabs$
+# $FreeBSD$
+#
+
+PORTNAME=	emphasis
+PORTVERSION=	20060926
+CATEGORIES=	audio
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+
+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
+GNU_CONFIGURE=	yes
+
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/audio/emphasis/distinfo b/audio/emphasis/distinfo
new file mode 100644
index 000000000000..d840d1d2d967
--- /dev/null
+++ b/audio/emphasis/distinfo
@@ -0,0 +1,3 @@
+MD5 (emphasis-20060926.tar.bz2) = ecc15f57ef069cc8e94866aee42d7a84
+SHA256 (emphasis-20060926.tar.bz2) = e7718857fa2f0e8b7cad7937603d75759f271d6539462c67cf3eb8264b0adbd4
+SIZE (emphasis-20060926.tar.bz2) = 332890
diff --git a/audio/emphasis/pkg-descr b/audio/emphasis/pkg-descr
new file mode 100644
index 000000000000..b8c83da30ba2
--- /dev/null
+++ b/audio/emphasis/pkg-descr
@@ -0,0 +1,5 @@
+Emphasis is a simple MPD (Music Player Daemon) client writen in C/Etk.
+It's a clone of MpcOS-X.
+
+Author:	Samuel 'lok' Mendes <heka.lok@gmail.com>
+WWW:	http://www.enlightenment.org/
diff --git a/audio/emphasis/pkg-plist b/audio/emphasis/pkg-plist
new file mode 100644
index 000000000000..c990aa58c71e
--- /dev/null
+++ b/audio/emphasis/pkg-plist
@@ -0,0 +1,14 @@
+bin/emphasis
+%%DATADIR%%/config.glade
+%%DATADIR%%/emphasis.glade
+%%DATADIR%%/images/haricot_musique-amor.png
+%%DATADIR%%/images/haricot_musique-grrrr.png
+%%DATADIR%%/images/haricot_musique-lalaa.png
+%%DATADIR%%/images/haricot_musique-mario.png
+%%DATADIR%%/images/haricot_musique-mooo.png
+%%DATADIR%%/images/haricot_musique.png
+%%DATADIR%%/images/note.png
+%%DATADIR%%/images/sound_high.png
+%%DATADIR%%/images/sound_low.png
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%
diff --git a/audio/euphoria/Makefile b/audio/euphoria/Makefile
index be5f498a4c28..2652be89a382 100644
--- a/audio/euphoria/Makefile
+++ b/audio/euphoria/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	euphoria
-PORTVERSION=	20062006
-PORTREVISION=	1
+PORTVERSION=	20061008
+PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	audio
-MASTER_SITES=	http://mbsd.msk.ru/dist/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	XMMS2 GUI frontend written with Enlightenment e17 libraries
 
 BUILD_DEPENDS=	rake:${PORTSDIR}/devel/rubygem-rake \
@@ -27,6 +27,7 @@ SADIR=		${RUBY_SITEARCHLIBDIR}
 
 USE_BZIP2=	yes
 USE_RUBY=	yes
+RUBY_SHEBANG_FILES=	${WRKSRC}/bin/euphoria
 
 .include <bsd.port.pre.mk>
 .if ${ARCH} == "ia64"
diff --git a/audio/euphoria/distinfo b/audio/euphoria/distinfo
index 1f073b1043f4..1eeeb0e0faa5 100644
--- a/audio/euphoria/distinfo
+++ b/audio/euphoria/distinfo
@@ -1,3 +1,3 @@
-MD5 (euphoria-20062006.tar.bz2) = 0ee671f7d39dc44f8a6c689d2b17d028
-SHA256 (euphoria-20062006.tar.bz2) = 27a8bf9d725ab91581fefc767cbf1932c1c31cda08b49e9b89160add45704bc6
-SIZE (euphoria-20062006.tar.bz2) = 1610111
+MD5 (euphoria-20061008.tar.bz2) = f147191da3ea4ab28fb64dc1a28a22c5
+SHA256 (euphoria-20061008.tar.bz2) = 22c463c1706e0038e5436495b60a307adde6835f57a863583c86c32f6ddbd089
+SIZE (euphoria-20061008.tar.bz2) = 1607870
diff --git a/audio/euphoria/files/patch-euphoria b/audio/euphoria/files/patch-euphoria
deleted file mode 100644
index e63fa35fa3f7..000000000000
--- a/audio/euphoria/files/patch-euphoria
+++ /dev/null
@@ -1,8 +0,0 @@
---- bin/euphoria.orig	Thu Jun 22 21:38:08 2006
-+++ bin/euphoria	Thu Jun 22 21:38:53 2006
-@@ -1,4 +1,4 @@
--#!/usr/bin/ruby -w
-+#!/usr/local/bin/ruby -w
- 
- # $Id: euphoria,v 1.38 2006/05/13 14:59:17 tilman Exp $
- 
diff --git a/audio/euphoria/files/patch-lib_playlist_item.rb b/audio/euphoria/files/patch-lib_playlist_item.rb
deleted file mode 100644
index 8ce8eaefc430..000000000000
--- a/audio/euphoria/files/patch-lib_playlist_item.rb
+++ /dev/null
@@ -1,19 +0,0 @@
---- lib/playlist_item.rb.orig	Mon Jul 10 11:30:20 2006
-+++ lib/playlist_item.rb	Mon Jul 10 11:31:08 2006
-@@ -1,4 +1,4 @@
--# $Id: playlist_item.rb,v 1.17 2005/12/14 20:02:14 tsauerbeck Exp $
-+# $Id: playlist_item.rb,v 1.19 2006/07/08 12:25:31 tilman Exp $
- 
- class PlaylistItem
- 	attr_reader :id, :edje, :position, :selected, :hilighted
-@@ -23,9 +23,7 @@
- 	end
- 
- 	def method_missing(method)
--		tmp = @props[method]
--
--		tmp || @props[:server][method] || "default"
-+		@props[method] || "default"
- 	end
- 
- 	def duration
diff --git a/audio/euphoria/pkg-plist b/audio/euphoria/pkg-plist
index 80441c2d16ac..120ef0047191 100644
--- a/audio/euphoria/pkg-plist
+++ b/audio/euphoria/pkg-plist
@@ -5,8 +5,12 @@ bin/euphoria
 %%RUBY_SITELIBDIR%%/euphoria/playlist_item.rb
 %%RUBY_SITELIBDIR%%/euphoria/playtime_updater.rb
 %%RUBY_SITELIBDIR%%/euphoria/slider.rb
+%%RUBY_SITELIBDIR%%/euphoria/volume_box.rb
 %%DATADIR%%/themes/iio.edj
 %%DATADIR%%/themes/winter.edj
 @dirrm %%RUBY_SITELIBDIR%%/euphoria
+@dirrmtry %%RUBY_SITELIBDIR%%
+@dirrmtry lib/ruby/site_ruby
+@dirrmtry lib/ruby
 @dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%
diff --git a/databases/edb/Makefile b/databases/edb/Makefile
index 69f20d10da6f..cc36beadd84a 100644
--- a/databases/edb/Makefile
+++ b/databases/edb/Makefile
@@ -6,16 +6,18 @@
 #
 
 PORTNAME=	edb
-PORTVERSION=	1.0.5.007
+PORTVERSION=	20060926
 PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	databases
-MASTER_SITES=	http://enlightenment.freedesktop.org/files/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	vanilla@FreeBSD.org
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Enlightenment Database Library
 
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/edb/distinfo b/databases/edb/distinfo
index 620110c70f2d..0d3dfe3e3b36 100644
--- a/databases/edb/distinfo
+++ b/databases/edb/distinfo
@@ -1,3 +1,3 @@
-MD5 (edb-1.0.5.007.tar.gz) = e5d8dcb5995913ae6b7f205e7ac28dbe
-SHA256 (edb-1.0.5.007.tar.gz) = 75a4861bf7dcc96a871611350276f10a87b0f7c44a1bbab1108374828bccf509
-SIZE (edb-1.0.5.007.tar.gz) = 660398
+MD5 (edb-20060926.tar.bz2) = e017b04cec7a0d98938de9210d48d010
+SHA256 (edb-20060926.tar.bz2) = 28bd18dea67bf613c512c4f19957dc7ed253aa1dfff2baf7d827113f93a65860
+SIZE (edb-20060926.tar.bz2) = 474149
diff --git a/databases/edb/pkg-plist b/databases/edb/pkg-plist
index 8795c8eebc44..fd183c658a63 100644
--- a/databases/edb/pkg-plist
+++ b/databases/edb/pkg-plist
@@ -1,6 +1,6 @@
+bin/edb-config
 bin/edb_ed
 bin/edb_vt_ed
-bin/edb-config
 include/Edb.h
 lib/libedb.a
 lib/libedb.la
diff --git a/deskutils/estickies/Makefile b/deskutils/estickies/Makefile
new file mode 100644
index 000000000000..1ffdcef58b05
--- /dev/null
+++ b/deskutils/estickies/Makefile
@@ -0,0 +1,25 @@
+# New ports collection makefile for:	estickies
+# Date created:		2006-08-14
+# Whom:			Stanislav Sedov <ssedov@mbsd.msk.ru>
+#
+# $MBSDlabs$
+# $FreeBSD$
+#
+
+PORTNAME=	estickies
+PORTVERSION=	20060926
+CATEGORIES=	deskutils
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	A sticky notes application that uses Etk
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_EFL=	etk eet
+GNU_CONFIGURE=	yes
+
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/deskutils/estickies/distinfo b/deskutils/estickies/distinfo
new file mode 100644
index 000000000000..32b041ca8e14
--- /dev/null
+++ b/deskutils/estickies/distinfo
@@ -0,0 +1,3 @@
+MD5 (estickies-20060926.tar.bz2) = cfad1d00d46c8a6213895bfed1c47394
+SHA256 (estickies-20060926.tar.bz2) = a5e6a644e8241728a6c384be7fc809538f39e3f519513aea2cbdb48d78a58200
+SIZE (estickies-20060926.tar.bz2) = 303607
diff --git a/deskutils/estickies/pkg-descr b/deskutils/estickies/pkg-descr
new file mode 100644
index 000000000000..b04054272011
--- /dev/null
+++ b/deskutils/estickies/pkg-descr
@@ -0,0 +1,5 @@
+Estickies is a sticky notes application that uses Etk. It uses Etk's runtime
+theming support to change the look and feel of the windows and buttons.
+
+Author:	Hisham 'CodeWarrior' Mardam Bey <hisham.mardambey@gmail.com>
+WWW:	http://www.enlightenment.org/
diff --git a/deskutils/estickies/pkg-plist b/deskutils/estickies/pkg-plist
new file mode 100644
index 000000000000..47cddb78f184
--- /dev/null
+++ b/deskutils/estickies/pkg-plist
@@ -0,0 +1,8 @@
+bin/estickies
+%%DATADIR%%/images/estickies.png
+%%DATADIR%%/themes/default.edj
+%%DATADIR%%/themes/mc.edj
+%%DATADIR%%/themes/postit.edj
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%
diff --git a/devel/eet/Makefile b/devel/eet/Makefile
index 2fec4dfd7ad3..1a2b9c29b4dc 100644
--- a/devel/eet/Makefile
+++ b/devel/eet/Makefile
@@ -6,26 +6,28 @@
 #
 
 PORTNAME=	eet
-PORTVERSION=	0.9.10.032
+PORTVERSION=	20060926
 PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	devel
-MASTER_SITES=	http://enlightenment.freedesktop.org/files/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	vanilla@FreeBSD.org
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Enlightenment Data Handling Library
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 502126
-IGNORE=		freebsd 3.*, 4.*, 5.0, 5.1 are not support
+IGNORE=		freebsd 3.*, 4.*, 5.0, 5.1 are not supported
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/eet/distinfo b/devel/eet/distinfo
index 32b1e4e62960..e6262894d918 100644
--- a/devel/eet/distinfo
+++ b/devel/eet/distinfo
@@ -1,3 +1,3 @@
-MD5 (eet-0.9.10.032.tar.gz) = 83597dff4508b46ba67f3d225b24b663
-SHA256 (eet-0.9.10.032.tar.gz) = 21dca22bc70791f36779585bf475e3573b71b45748f347eabbe0ebd238cacb1e
-SIZE (eet-0.9.10.032.tar.gz) = 358077
+MD5 (eet-20060926.tar.bz2) = 5d4e3aa7239ee2dd86b0be5977fe22c0
+SHA256 (eet-20060926.tar.bz2) = 2304db1a59b02242d60746a0f9846ec44e986c9f9223f2dddeb3dcc167177e85
+SIZE (eet-20060926.tar.bz2) = 1281777
diff --git a/devel/eet/pkg-plist b/devel/eet/pkg-plist
index 29a7bb92e1df..756dfa5aa503 100644
--- a/devel/eet/pkg-plist
+++ b/devel/eet/pkg-plist
@@ -2,8 +2,8 @@ bin/eet
 bin/eet-config
 bin/eet_bench
 include/Eet.h
-libdata/pkgconfig/eet.pc
 lib/libeet.a
 lib/libeet.la
 lib/libeet.so
 lib/libeet.so.9
+libdata/pkgconfig/eet.pc
diff --git a/devel/engrave/Makefile b/devel/engrave/Makefile
index 3f753e2d343b..9b41a2afe7dd 100644
--- a/devel/engrave/Makefile
+++ b/devel/engrave/Makefile
@@ -6,21 +6,20 @@
 #
 
 PORTNAME=	engrave
-PORTVERSION=	20060719
+PORTVERSION=	20060926
 CATEGORIES=	devel
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	A library for editing the contents of an edje .eet file
 
-LIB_DEPENDS=	ecore.1:${PORTSDIR}/x11/ecore \
-		evas.1:${PORTSDIR}/graphics/evas
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GNOME=	gnometarget pkgconfig gnomehack
+USE_EFL=	ecore evas
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/devel/engrave/distinfo b/devel/engrave/distinfo
index 0a45633b41f5..3fc8a2d65526 100644
--- a/devel/engrave/distinfo
+++ b/devel/engrave/distinfo
@@ -1,3 +1,3 @@
-MD5 (engrave-20060719.tar.bz2) = 8368beac427626356578c32898273c62
-SHA256 (engrave-20060719.tar.bz2) = 6c39c262be9a5eb14a1fd6e2c3aae5e0124628d9e5e5370c4f63449810170430
-SIZE (engrave-20060719.tar.bz2) = 241026
+MD5 (engrave-20060926.tar.bz2) = 8ed0a54ec6786d63dad3d0ae0950122d
+SHA256 (engrave-20060926.tar.bz2) = fca45ed87e7003cca8a96df69cc786e35e5b54efecd64e8efb6489bc9e941e52
+SIZE (engrave-20060926.tar.bz2) = 250455
diff --git a/devel/evfs/Makefile b/devel/evfs/Makefile
new file mode 100644
index 000000000000..2246b2fdd93b
--- /dev/null
+++ b/devel/evfs/Makefile
@@ -0,0 +1,62 @@
+# New ports collection makefile for:	evfs
+# Date created:		2006-08-14
+# Whom:			Stanislav Sedov <ssedov@mbsd.msk.ru>
+#
+# $MBSDlabs$
+# $FreeBSD$
+#
+
+PORTNAME=	evfs
+PORTVERSION=	20060926
+CATEGORIES=	devel
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	An extensible virtual file system library
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget libxml2
+USE_EFL=	ecore eet
+USE_LDCONFIG=	yes
+USE_SQLITE=	3
+
+OPTIONS=	SAMBA	"Build samba plugin" off \
+		FTP	"Build FTP plugin" on \
+		TAGLIB	"Use taglib for audio metadata extraction" on \
+		XTRACT "Enable extended metadata extraction via libextractor" on
+
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+
+.if defined(WITH_SAMBA)
+LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
+PLIST_SUB+=	SAMBA=""
+.else
+PLIST_SUB+=	SAMBA="@comment "
+CONFIGURE_ARGS+=--disable-samba
+.endif
+
+.if !defined(WITHOUT_FTP) || exists(${LOCALBASE}/lib/libcurl.so.3)
+LIB_DEPENDS+=	curl.3:${PORTSDIR}/ftp/curl
+PLIST_SUB+=	FTP=""
+.else
+PLIST_SUB+=	FTP="@comment "
+.endif
+
+.if !defined(WITHOUT_TAGLIB) || exists(${LOCALBASE}/lib/libtag.so.5)
+LIB_DEPENDS+=	tag.5:${PORTSDIR}/audio/taglib
+PLIST_SUB+=	TAGLIB=""
+.else
+PLIST_SUB+=	TAGLIB="@comment "
+.endif
+
+.if !defined(WITHOUT_XTRACT) || exists(${LOCALBASE}/lib/libextractor.so.2)
+LIB_DEPENDS+=	extractor.2:${PORTSDIR}/textproc/libextractor
+PLIST_SUB+=	XTRACT=""
+.else
+PLIST_SUB+=	XTRACT="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/evfs/distinfo b/devel/evfs/distinfo
new file mode 100644
index 000000000000..9bf74ff60704
--- /dev/null
+++ b/devel/evfs/distinfo
@@ -0,0 +1,3 @@
+MD5 (evfs-20060926.tar.bz2) = 99081406ea4aa6b90d9a84a6aa6a69c2
+SHA256 (evfs-20060926.tar.bz2) = c02a794fe09fe2275090fa5ebd21bb9399ef99a5b5585dd20b57a0ebb1ba84a2
+SIZE (evfs-20060926.tar.bz2) = 306055
diff --git a/devel/evfs/pkg-descr b/devel/evfs/pkg-descr
new file mode 100644
index 000000000000..48a5e5a0d3ad
--- /dev/null
+++ b/devel/evfs/pkg-descr
@@ -0,0 +1,7 @@
+EVFS is a comprehensive virtual filesystem library with plugin support. It was
+written for Enlightenment desktop, but can be used besides it.
+
+Authors:Alex Taylor <alex@logisticchaos.com>,
+	Christian Kreibich <cK@whoop.org>,
+	John Kha
+WWW:	http://www.enlightenment.org/
diff --git a/devel/evfs/pkg-plist b/devel/evfs/pkg-plist
new file mode 100644
index 000000000000..656ad17ebbd1
--- /dev/null
+++ b/devel/evfs/pkg-plist
@@ -0,0 +1,77 @@
+bin/evfs
+bin/evfs-config
+bin/evfscat
+bin/evfscopy
+bin/evfsdemo
+include/evfs/evfs.h
+include/evfs/evfs_cleanup.h
+include/evfs/evfs_client.h
+include/evfs/evfs_command.h
+include/evfs/evfs_commands.h
+include/evfs/evfs_common.h
+include/evfs/evfs_debug.h
+include/evfs/evfs_event.h
+include/evfs/evfs_event_helper.h
+include/evfs/evfs_filereference.h
+include/evfs/evfs_io.h
+include/evfs/evfs_macros.h
+include/evfs/evfs_metadata.h
+include/evfs/evfs_misc.h
+include/evfs/evfs_new.h
+include/evfs/evfs_operation.h
+include/evfs/evfs_operation_tasks.h
+include/evfs/evfs_plugin.h
+include/evfs/evfs_server.h
+include/evfs/evfs_server_handle.h
+include/evfs/evfs_trash.h
+include/evfs/evfs_vfolder.h
+include/evfs/tarpet.h
+lib/evfs/plugins/file/bzip2.a
+lib/evfs/plugins/file/bzip2.la
+lib/evfs/plugins/file/bzip2.so
+%%FTP%%lib/evfs/plugins/file/ftp.a
+%%FTP%%lib/evfs/plugins/file/ftp.la
+%%FTP%%lib/evfs/plugins/file/ftp.so
+lib/evfs/plugins/file/gzip.a
+lib/evfs/plugins/file/gzip.la
+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
+lib/evfs/plugins/file/sftp.a
+lib/evfs/plugins/file/sftp.la
+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/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/libevfs.a
+lib/libevfs.la
+lib/libevfs.so
+lib/libevfs.so.0
+@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/ruby-ecore/Makefile b/devel/ruby-ecore/Makefile
index ecbccba61193..0a259e79d6a0 100644
--- a/devel/ruby-ecore/Makefile
+++ b/devel/ruby-ecore/Makefile
@@ -6,30 +6,37 @@
 #
 
 PORTNAME=	ecore
-PORTVERSION=	20060516
+PORTVERSION=	20061008
+PORTREVISION=	0
 CATEGORIES=	devel ruby
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-ecore-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Ruby bindings for Ecore library
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake \
-		${RUBY_SITEARCHLIBDIR}/evas/rb_evas.h:${PORTSDIR}/graphics/ruby-evas
-LIB_DEPENDS=	ecore.1:${PORTSDIR}/x11/ecore
+		${RUBY_SA}/evas/rb_evas.h:${PORTSDIR}/graphics/ruby-evas
 
 USE_BZIP2=	yes
 USE_RUBY=	yes
+USE_EFL=	ecore
+
+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=${X11BASE} \
+	@(cd ${WRKSRC}; ${SETENV} ECORE_PREFIX=${LOCALBASE} \
 		${LOCALBASE}/bin/rake)
 
 do-install:
-	@(cd ${WRKSRC}; ${SETENV} ECORE_PREFIX=${X11BASE} \
+	@(cd ${WRKSRC}; ${SETENV} ECORE_PREFIX=${LOCALBASE} \
 		${LOCALBASE}/bin/rake install)
 
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
 .include <bsd.port.post.mk>
diff --git a/devel/ruby-ecore/distinfo b/devel/ruby-ecore/distinfo
index f99bed4bb76e..66380ad14d36 100644
--- a/devel/ruby-ecore/distinfo
+++ b/devel/ruby-ecore/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby-ecore-20060516.tar.bz2) = 98a7372297633d6ce6bc4216d4807673
-SHA256 (ruby-ecore-20060516.tar.bz2) = ca6ea98584c533804bfd333cad059294cb457c85322e77ea461513aeada2ad52
-SIZE (ruby-ecore-20060516.tar.bz2) = 23928
+MD5 (ruby-ecore-20061008.tar.bz2) = a54661c6c9ff982a80f231fb5456fa37
+SHA256 (ruby-ecore-20061008.tar.bz2) = de3477d05c25cba51345b8dca9564e751262452cd9fe775fc9b0583336d8e24b
+SIZE (ruby-ecore-20061008.tar.bz2) = 24053
diff --git a/devel/ruby-ecore/files/patch-Rakefile b/devel/ruby-ecore/files/patch-Rakefile
new file mode 100644
index 000000000000..d5c309404789
--- /dev/null
+++ b/devel/ruby-ecore/files/patch-Rakefile
@@ -0,0 +1,17 @@
+--- 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/graphics/edje/Makefile b/graphics/edje/Makefile
index 353de3496cd2..30574d1b01e4 100644
--- a/graphics/edje/Makefile
+++ b/graphics/edje/Makefile
@@ -6,26 +6,21 @@
 #
 
 PORTNAME=	edje
-PORTVERSION=	0.5.0.032
+PORTVERSION=	20060926
 PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://enlightenment.freedesktop.org/files/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	vanilla@FreeBSD.org
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Edje is a complex graphical design and layout engine
 
-LIB_DEPENDS=	embryo.9:${PORTSDIR}/lang/embryo \
-		eet.9:${PORTSDIR}/devel/eet \
-		Imlib2.3:${PORTSDIR}/graphics/imlib2 \
-		evas.1:${PORTSDIR}/graphics/evas \
-		ecore.1:${PORTSDIR}/x11/ecore
-
 GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
 USE_GCC=	3.4
 USE_GNOME=	gnomehack pkgconfig gnometarget
-INSTALLS_SHLIB=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+USE_EFL=	embryo eet evas ecore imlib2
+USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -34,7 +29,8 @@ IGNORE=	does not build on 4.X
 .endif
 
 .if ${ARCH} == "ia64"
-BROKEN=         edje is broken on ia64
+BROKEN=		edje is broken on ia64
 .endif
 
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
 .include <bsd.port.post.mk>
diff --git a/graphics/edje/distinfo b/graphics/edje/distinfo
index 59aae4ad69d9..b48081b17aca 100644
--- a/graphics/edje/distinfo
+++ b/graphics/edje/distinfo
@@ -1,3 +1,3 @@
-MD5 (edje-0.5.0.032.tar.gz) = 9d0350eb2139831c5889a050d28d5647
-SHA256 (edje-0.5.0.032.tar.gz) = a5544dab0c62b7a846514d5f7b7cf8b2ff02a340d17211ad12888b1cd993db26
-SIZE (edje-0.5.0.032.tar.gz) = 2152238
+MD5 (edje-20060926.tar.bz2) = ce4874d6b3324dd39abf196841f1d0c0
+SHA256 (edje-20060926.tar.bz2) = d9bc56e6d578abe90c55006e5802e6e69106ee431ceaac6f435fc9fd290d8f0a
+SIZE (edje-20060926.tar.bz2) = 3027081
diff --git a/graphics/edje/pkg-plist b/graphics/edje/pkg-plist
index 788a5b22f98b..86d560c46a66 100644
--- a/graphics/edje/pkg-plist
+++ b/graphics/edje/pkg-plist
@@ -167,19 +167,19 @@ libdata/pkgconfig/edje.pc
 %%DATADIR%%/data/test/images/item_title.png
 %%DATADIR%%/data/test/images/shadow.png
 %%DATADIR%%/include/edje.inc
-@dirrm %%DATADIR%%/include
-@dirrm %%DATADIR%%/data/test/images
-@dirrm %%DATADIR%%/data/test/fonts
-@dirrm %%DATADIR%%/data/test
-@dirrm %%DATADIR%%/data/template/programs
-@dirrm %%DATADIR%%/data/template/parts
-@dirrm %%DATADIR%%/data/template/macros
-@dirrm %%DATADIR%%/data/template/images
-@dirrm %%DATADIR%%/data/template/hashes
-@dirrm %%DATADIR%%/data/template/fonts
-@dirrm %%DATADIR%%/data/template/embryo
-@dirrm %%DATADIR%%/data/template
-@dirrm %%DATADIR%%/data/src
-@dirrm %%DATADIR%%/data/images
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%
+@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%%
diff --git a/graphics/edje_viewer/Makefile b/graphics/edje_viewer/Makefile
new file mode 100644
index 000000000000..e2cf803cba14
--- /dev/null
+++ b/graphics/edje_viewer/Makefile
@@ -0,0 +1,25 @@
+# New ports collection makefile for:	edje_viewer
+# Date created:		2006-08-14
+# Whom:			Stanislav Sedov <ssedov@mbsd.msk.ru>
+#
+# $MBSDlabs$
+# $FreeBSD$
+#
+
+PORTNAME=	edje_viewer
+PORTVERSION=	20060926
+CATEGORIES=	graphics
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	A simple viewer for .edj files
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_EFL=	evas ecore edje etk
+GNU_CONFIGURE=	yes
+
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/graphics/edje_viewer/distinfo b/graphics/edje_viewer/distinfo
new file mode 100644
index 000000000000..3c5d6b21ee28
--- /dev/null
+++ b/graphics/edje_viewer/distinfo
@@ -0,0 +1,3 @@
+MD5 (edje_viewer-20060926.tar.bz2) = d4a3bdb00af5b5c847178695aa8ccb04
+SHA256 (edje_viewer-20060926.tar.bz2) = 0fe339ac3e9c4a70fdb6d942a718abb2fe362abae3e1765978128cc99da4d671
+SIZE (edje_viewer-20060926.tar.bz2) = 263533
diff --git a/graphics/edje_viewer/pkg-descr b/graphics/edje_viewer/pkg-descr
new file mode 100644
index 000000000000..6cd01b42279d
--- /dev/null
+++ b/graphics/edje_viewer/pkg-descr
@@ -0,0 +1,5 @@
+A simple viewer for edj files. Should provide more ease of use than the edje
+viewer that comes with edje itself.
+
+Author:	urandom <vkojouharov@gmail.com>
+WWW:	http://www.enlightenment.otg/
diff --git a/graphics/edje_viewer/pkg-plist b/graphics/edje_viewer/pkg-plist
new file mode 100644
index 000000000000..68c7efe3f953
--- /dev/null
+++ b/graphics/edje_viewer/pkg-plist
@@ -0,0 +1,7 @@
+bin/edje_viewer
+%%DATADIR%%/data/images/bg.png
+%%DATADIR%%/data/images/border.png
+%%DATADIR%%/data/images/shadow.png
+@dirrm %%DATADIR%%/data/images
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%
diff --git a/graphics/entice/Makefile b/graphics/entice/Makefile
index 720981adf82f..ba37a3d3ca83 100644
--- a/graphics/entice/Makefile
+++ b/graphics/entice/Makefile
@@ -6,22 +6,22 @@
 #
 
 PORTNAME=	entice
-PORTVERSION=	0.9.3.004
-PORTREVISION=	2
+PORTVERSION=	20060926
+PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	vanilla
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	vanilla@FreeBSD.org
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An image viewer written using libraries for Enlightenment 0.17
 
 LIB_DEPENDS=	esmart_thumb.0:${PORTSDIR}/graphics/esmart
 
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnometarget
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+USE_BZIP2=	yes
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	imlib2 evas edb ecore edje epsilon
+USE_EFL_ESMART=	thumb
 
 .include <bsd.port.pre.mk>
 
@@ -29,4 +29,5 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 BROKEN=		does not install on ${ARCH}
 .endif
 
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
 .include <bsd.port.post.mk>
diff --git a/graphics/entice/distinfo b/graphics/entice/distinfo
index 4bec47d56329..ad0e2758c440 100644
--- a/graphics/entice/distinfo
+++ b/graphics/entice/distinfo
@@ -1,3 +1,3 @@
-MD5 (entice-0.9.3.004.tar.gz) = c5ffa01f6327b59b4fbbb3729e1e0867
-SHA256 (entice-0.9.3.004.tar.gz) = 9d61556fde304b544afbc2331fa4a694ae873a65fc314c320481e56883d43d19
-SIZE (entice-0.9.3.004.tar.gz) = 881544
+MD5 (entice-20060926.tar.bz2) = d2d786a9fd8bc26af51ff2a8d1aadb3d
+SHA256 (entice-20060926.tar.bz2) = c291eabf3ab361d486186055ee4aaac352a06f2197423fade5c853f4b675faf0
+SIZE (entice-20060926.tar.bz2) = 794085
diff --git a/graphics/epeg/Makefile b/graphics/epeg/Makefile
index dcaa7420a500..e021e8e08746 100644
--- a/graphics/epeg/Makefile
+++ b/graphics/epeg/Makefile
@@ -6,20 +6,22 @@
 #
 
 PORTNAME=	epeg
-PORTVERSION=	0.9.0.007
+PORTVERSION=	20060926
 PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://enlightenment.freedesktop.org/files/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	vanilla@FreeBSD.org
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An IMMENSELY FAST JPEG thumbnailer library API
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget
-USE_GETOPT_LONG=	yes
-INSTALLS_SHLIB=	yes
+USE_GETOPT_LONG=yes
+USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/epeg/distinfo b/graphics/epeg/distinfo
index 8c7088ea30e5..6feef53a100a 100644
--- a/graphics/epeg/distinfo
+++ b/graphics/epeg/distinfo
@@ -1,3 +1,3 @@
-MD5 (epeg-0.9.0.007.tar.gz) = 383db51e46d13d986966459e4918d236
-SHA256 (epeg-0.9.0.007.tar.gz) = bb12585b433fd0eca11865541bdb877166b9e53b0ea12624776f11cce3ce189b
-SIZE (epeg-0.9.0.007.tar.gz) = 318810
+MD5 (epeg-20060926.tar.bz2) = 33ee80c85c6859084c1164e8575e4b4a
+SHA256 (epeg-20060926.tar.bz2) = cb3ae987ce05865a65ab0c3f8a14784578f14b8d43987e226ad73507b142b1ec
+SIZE (epeg-20060926.tar.bz2) = 1263246
diff --git a/graphics/epsilon/Makefile b/graphics/epsilon/Makefile
index 82f1245a17de..f78bf13370cf 100644
--- a/graphics/epsilon/Makefile
+++ b/graphics/epsilon/Makefile
@@ -6,21 +6,49 @@
 #
 
 PORTNAME=	epsilon
-PORTVERSION=	0.3.0.007
+PORTVERSION=	20060926
 PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://enlightenment.freedesktop.org/files/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	vanilla@FreeBSD.org
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	A small, display independent, and quick thumbnailing library
 
-LIB_DEPENDS=	epeg.9:${PORTSDIR}/graphics/epeg \
-		edje.5:${PORTSDIR}/graphics/edje
-
 GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget
-INSTALLS_SHLIB=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+USE_EFL=	edje imlib2
+USE_LDCONFIG=	yes
+
+OPTIONS=	PNG	"Enable PNG thumbnailer" on \
+		EPEG	"Enable Epeg thumbnailer" on \
+		XINE	"Enable Xine thumbnailer" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_PNG) || exists(${LOCALBASE}/lib/libpng.so.5)
+LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
+PLIST_SUB+=	PNG=""
+.else
+PLIST_SUB+=	PNG="@comment "
+.endif
+
+.if defined(WITH_EPEG) || exists(${LOCALBASE}/lib/libepeg.so.9)
+USE_EFL+=	epeg
+PLIST_SUB+=	EPEG=""
+.else
+PLIST_SUB+=	EPEG="@comment "
+.endif
+
+.if defined(WITH_XINE)
+LIB_DEPENDS+=	xine.15:${PORTSDIR}/multimedia/libxine
+CONFIGURE_ARGS+=--enable-thumbnailer-xine
+PLIST_SUB+=	XINE=""
+.else
+CONFIGURE_ARGS+=--disable-thumbnailer-xine
+PLIST_SUB+=	XINE="@comment "
+.endif
 
-.include <bsd.port.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/graphics/epsilon/distinfo b/graphics/epsilon/distinfo
index 713b3142aee4..041dce9314c8 100644
--- a/graphics/epsilon/distinfo
+++ b/graphics/epsilon/distinfo
@@ -1,3 +1,3 @@
-MD5 (epsilon-0.3.0.007.tar.gz) = 408d3c63f9efa06e93e29a691c28985e
-SHA256 (epsilon-0.3.0.007.tar.gz) = 6f40962eb8d76e0e9d76ec9f461d62c6af8561028d194358aed001827cc418fc
-SIZE (epsilon-0.3.0.007.tar.gz) = 378638
+MD5 (epsilon-20060926.tar.bz2) = 796f188c4de29d43eb67625029659abe
+SHA256 (epsilon-20060926.tar.bz2) = 0efd02f9b1dfba97bebb1f44eeedd047a849289ef3f080378b3b53a299c07465
+SIZE (epsilon-20060926.tar.bz2) = 288795
diff --git a/graphics/epsilon/pkg-plist b/graphics/epsilon/pkg-plist
index c8b5061115e7..d6500f9108ff 100644
--- a/graphics/epsilon/pkg-plist
+++ b/graphics/epsilon/pkg-plist
@@ -1,11 +1,16 @@
 bin/epsilon
+bin/epsilon-config
 bin/epsilon_thumb_test
 bin/epsilon_thumbd
-bin/epsilon-config
 include/Epsilon.h
 include/Epsilon_Request.h
+%%XINE%%lib/epsilon/plugins/xine_thumbnailer.a
+%%XINE%%lib/epsilon/plugins/xine_thumbnailer.la
+%%XINE%%lib/epsilon/plugins/xine_thumbnailer.so
 lib/libepsilon.a
 lib/libepsilon.la
 lib/libepsilon.so
 lib/libepsilon.so.0
 libdata/pkgconfig/epsilon.pc
+@dirrm lib/epsilon/plugins
+@dirrm lib/epsilon
diff --git a/graphics/esmart/Makefile b/graphics/esmart/Makefile
index 050636d9e3d9..be6dadbb830b 100644
--- a/graphics/esmart/Makefile
+++ b/graphics/esmart/Makefile
@@ -6,22 +6,24 @@
 #
 
 PORTNAME=	esmart
-PORTVERSION=	0.9.0.007
+PORTVERSION=	20060926
 PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://enlightenment.freedesktop.org/files/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	vanilla@FreeBSD.org
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Evas smart objects development libraries
 
 LIB_DEPENDS=	epsilon.0:${PORTSDIR}/graphics/epsilon
 
-USE_X_PREFIX=	yes
-USE_AUTOTOOLS=	libltdl:15
 GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libltdl:15
+USE_BZIP2=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
-INSTALLS_SHLIB=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+USE_EFL=	ecore evas epsilon edje
+USE_LDCONFIG=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/graphics/esmart/distinfo b/graphics/esmart/distinfo
index 41f27697c76b..02e39e4587d6 100644
--- a/graphics/esmart/distinfo
+++ b/graphics/esmart/distinfo
@@ -1,3 +1,3 @@
-MD5 (esmart-0.9.0.007.tar.gz) = a65b4a08818ac9ef9de3dd9d4f20f148
-SHA256 (esmart-0.9.0.007.tar.gz) = 5df5b02c568f5e4b744252fbd62f5fae71bf0eddecc423d2b396a0ffbfe94465
-SIZE (esmart-0.9.0.007.tar.gz) = 396987
+MD5 (esmart-20060926.tar.bz2) = dd492859552858c7e21b7a89525503e7
+SHA256 (esmart-20060926.tar.bz2) = a23d92cadc5df8795b6a93caaf08080c16e4918573a9d45690b5ea093a6d3a5d
+SIZE (esmart-20060926.tar.bz2) = 294546
diff --git a/graphics/esmart/pkg-plist b/graphics/esmart/pkg-plist
index aea05eccbc9e..6c6f65d2b919 100644
--- a/graphics/esmart/pkg-plist
+++ b/graphics/esmart/pkg-plist
@@ -7,6 +7,15 @@ include/Esmart/Esmart_File_Dialog.h
 include/Esmart/Esmart_Text_Entry.h
 include/Esmart/Esmart_Thumb.h
 include/Esmart/Esmart_Trans_X11.h
+lib/esmart/layout/default.a
+lib/esmart/layout/default.la
+lib/esmart/layout/default.so
+lib/esmart/layout/engage.a
+lib/esmart/layout/engage.la
+lib/esmart/layout/engage.so
+lib/esmart/layout/entice.a
+lib/esmart/layout/entice.la
+lib/esmart/layout/entice.so
 lib/libesmart_container.a
 lib/libesmart_container.la
 lib/libesmart_container.so
@@ -31,15 +40,6 @@ lib/libesmart_trans_x11.a
 lib/libesmart_trans_x11.la
 lib/libesmart_trans_x11.so
 lib/libesmart_trans_x11.so.0
-lib/esmart/layout/default.a
-lib/esmart/layout/default.la
-lib/esmart/layout/default.so
-lib/esmart/layout/engage.a
-lib/esmart/layout/engage.la
-lib/esmart/layout/engage.so
-lib/esmart/layout/entice.a
-lib/esmart/layout/entice.la
-lib/esmart/layout/entice.so
 libdata/pkgconfig/esmart.pc
 %%DATADIR%%/esmart.png
 @dirrm %%DATADIR%%
diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile
index d8d63f789afd..912395599616 100644
--- a/graphics/evas/Makefile
+++ b/graphics/evas/Makefile
@@ -6,29 +6,36 @@
 #
 
 PORTNAME=	evas
-PORTVERSION=	0.9.9.032
+PORTVERSION=	20060926
 PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://enlightenment.freedesktop.org/files/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	vanilla@FreeBSD.org
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	A hardware-accelerated canvas API for X-Windows
 
-LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2 \
-		edb.1:${PORTSDIR}/databases/edb \
-		eet.9:${PORTSDIR}/devel/eet
-
-USE_X_PREFIX=	yes
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_FREETYPE2=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-OPTIONS=	GL "Enable GL support" off
 
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+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
 
 .include <bsd.port.pre.mk>
 
@@ -40,4 +47,134 @@ USE_GL=		yes
 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
+
+.if !defined(WITHOUT_BUFFER)
+CONFIGURE_ARGS+=	--enable-buffer
+PLIST_SUB+=	BUFFER=""
+.else
+CONFIGURE_ARGS+=	--disable-buffer
+PLIST_SUB+=	BUFFER="@comment "
+.endif
+
+.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
+
+.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
+
+.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
+
+.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
+
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
 .include <bsd.port.post.mk>
diff --git a/graphics/evas/distinfo b/graphics/evas/distinfo
index 7f6995ea2e58..6ac8c2bbc653 100644
--- a/graphics/evas/distinfo
+++ b/graphics/evas/distinfo
@@ -1,3 +1,3 @@
-MD5 (evas-0.9.9.032.tar.gz) = f7cedd3e75290bc8a8220b8081a14018
-SHA256 (evas-0.9.9.032.tar.gz) = 4b7dd45bc5851fef30361f95922e40796aa6b0b38611ba100dd5e439335ae9a1
-SIZE (evas-0.9.9.032.tar.gz) = 1728982
+MD5 (evas-20060926.tar.bz2) = 4cf57ca17141e52679ead8bb61e9772e
+SHA256 (evas-20060926.tar.bz2) = 029cd028b6925c4b6b99bc79247dc1fb73bd24e7747761f0126f7eb041dfe6e5
+SIZE (evas-20060926.tar.bz2) = 4343022
diff --git a/graphics/evas/files/patch-src_bin_evas_directfb_window.c b/graphics/evas/files/patch-src_bin_evas_directfb_window.c
new file mode 100644
index 000000000000..b3c9e11854f0
--- /dev/null
+++ b/graphics/evas/files/patch-src_bin_evas_directfb_window.c
@@ -0,0 +1,11 @@
+--- src/bin/evas_directfb_window.c.orig	Wed Sep 27 00:21:47 2006
++++ src/bin/evas_directfb_window.c	Wed Sep 27 00:22:37 2006
+@@ -35,7 +35,7 @@
+ #include <time.h>
+ 
+ #include <directfb/directfb.h>
+-#include <directfb/directfb_version.h>
++#include <directfb-internal/directfb_version.h>
+ 
+ #include "config.h"
+ #include "Evas.h"
diff --git a/graphics/evas/pkg-plist b/graphics/evas/pkg-plist
index 4a103b171268..8e95e353e86d 100644
--- a/graphics/evas/pkg-plist
+++ b/graphics/evas/pkg-plist
@@ -1,67 +1,79 @@
 bin/evas-config
-bin/evas_buffer_test
+%%BUFFER%%bin/evas_buffer_test
+%%DIRECTFB%%bin/evas_directfb_test
+%%DIRECTFB%%bin/evas_directfb_window
 %%WITH_GL%%bin/evas_gl_x11_test
-bin/evas_software_x11_perf_load
-bin/evas_software_x11_perf_test
-bin/evas_software_x11_test
-bin/evas_xrender_x11_test
+%%SOFTX11%%bin/evas_software_x11_perf_load
+%%SOFTX11%%bin/evas_software_x11_perf_test
+%%SOFTX11%%bin/evas_software_x11_test
+%%XRENDER%%bin/evas_xrender_x11_test
 include/Evas.h
-include/Evas_Engine_Buffer.h
+%%BUFFER%%include/Evas_Engine_Buffer.h
+%%DIRECTFB%%include/Evas_Engine_DirectFB.h
 %%WITH_GL%%include/Evas_Engine_GL_X11.h
-include/Evas_Engine_Software_X11.h
-include/Evas_Engine_XRender_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
-lib/evas/modules/engines/buffer/%%MODULE_ARCH%%/module.a
-lib/evas/modules/engines/buffer/%%MODULE_ARCH%%/module.la
-lib/evas/modules/engines/buffer/%%MODULE_ARCH%%/module.so
-%%WITH_GL%%lib/evas/modules/engines/gl_x11/%%MODULE_ARCH%%/module.a
-%%WITH_GL%%lib/evas/modules/engines/gl_x11/%%MODULE_ARCH%%/module.la
-%%WITH_GL%%lib/evas/modules/engines/gl_x11/%%MODULE_ARCH%%/module.so
-lib/evas/modules/engines/software_generic/%%MODULE_ARCH%%/module.a
-lib/evas/modules/engines/software_generic/%%MODULE_ARCH%%/module.la
-lib/evas/modules/engines/software_generic/%%MODULE_ARCH%%/module.so
-lib/evas/modules/engines/software_x11/%%MODULE_ARCH%%/module.a
-lib/evas/modules/engines/software_x11/%%MODULE_ARCH%%/module.la
-lib/evas/modules/engines/software_x11/%%MODULE_ARCH%%/module.so
-lib/evas/modules/engines/xrender_x11/%%MODULE_ARCH%%/module.a
-lib/evas/modules/engines/xrender_x11/%%MODULE_ARCH%%/module.la
-lib/evas/modules/engines/xrender_x11/%%MODULE_ARCH%%/module.so
-lib/evas/modules/loaders/edb/%%MODULE_ARCH%%/module.a
-lib/evas/modules/loaders/edb/%%MODULE_ARCH%%/module.la
-lib/evas/modules/loaders/edb/%%MODULE_ARCH%%/module.so
-lib/evas/modules/loaders/eet/%%MODULE_ARCH%%/module.a
-lib/evas/modules/loaders/eet/%%MODULE_ARCH%%/module.la
-lib/evas/modules/loaders/eet/%%MODULE_ARCH%%/module.so
-lib/evas/modules/loaders/gif/%%MODULE_ARCH%%/module.a
-lib/evas/modules/loaders/gif/%%MODULE_ARCH%%/module.la
-lib/evas/modules/loaders/gif/%%MODULE_ARCH%%/module.so
-lib/evas/modules/loaders/jpeg/%%MODULE_ARCH%%/module.a
-lib/evas/modules/loaders/jpeg/%%MODULE_ARCH%%/module.la
-lib/evas/modules/loaders/jpeg/%%MODULE_ARCH%%/module.so
-lib/evas/modules/loaders/png/%%MODULE_ARCH%%/module.a
-lib/evas/modules/loaders/png/%%MODULE_ARCH%%/module.la
-lib/evas/modules/loaders/png/%%MODULE_ARCH%%/module.so
-lib/evas/modules/loaders/tiff/%%MODULE_ARCH%%/module.a
-lib/evas/modules/loaders/tiff/%%MODULE_ARCH%%/module.la
-lib/evas/modules/loaders/tiff/%%MODULE_ARCH%%/module.so
-lib/evas/modules/savers/edb/%%MODULE_ARCH%%/module.a
-lib/evas/modules/savers/edb/%%MODULE_ARCH%%/module.la
-lib/evas/modules/savers/edb/%%MODULE_ARCH%%/module.so
-lib/evas/modules/savers/eet/%%MODULE_ARCH%%/module.a
-lib/evas/modules/savers/eet/%%MODULE_ARCH%%/module.la
-lib/evas/modules/savers/eet/%%MODULE_ARCH%%/module.so
-lib/evas/modules/savers/jpeg/%%MODULE_ARCH%%/module.a
-lib/evas/modules/savers/jpeg/%%MODULE_ARCH%%/module.la
-lib/evas/modules/savers/jpeg/%%MODULE_ARCH%%/module.so
-lib/evas/modules/savers/png/%%MODULE_ARCH%%/module.a
-lib/evas/modules/savers/png/%%MODULE_ARCH%%/module.la
-lib/evas/modules/savers/png/%%MODULE_ARCH%%/module.so
-lib/evas/modules/savers/tiff/%%MODULE_ARCH%%/module.a
-lib/evas/modules/savers/tiff/%%MODULE_ARCH%%/module.la
-lib/evas/modules/savers/tiff/%%MODULE_ARCH%%/module.so
 libdata/pkgconfig/evas.pc
 %%DATADIR%%/Vera.ttf
 %%DATADIR%%/VeraBI.ttf
@@ -85,40 +97,46 @@ libdata/pkgconfig/evas.pc
 %%DATADIR%%/t2.png
 %%DATADIR%%/test_pattern.png
 @dirrm %%DATADIR%%
-@dirrm lib/evas/modules/savers/tiff/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/savers/tiff
-@dirrm lib/evas/modules/savers/png/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/savers/png
-@dirrm lib/evas/modules/savers/jpeg/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/savers/jpeg
-@dirrm lib/evas/modules/savers/eet/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/savers/eet
-@dirrm lib/evas/modules/savers/edb/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/savers/edb
+%%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
-@dirrm lib/evas/modules/loaders/tiff/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/loaders/tiff
-@dirrm lib/evas/modules/loaders/png/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/loaders/png
-@dirrm lib/evas/modules/loaders/jpeg/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/loaders/jpeg
-@dirrm lib/evas/modules/loaders/gif/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/loaders/gif
-@dirrm lib/evas/modules/loaders/eet/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/loaders/eet
-@dirrm lib/evas/modules/loaders/edb/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/loaders/edb
+%%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
-@dirrm lib/evas/modules/engines/xrender_x11/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/engines/xrender_x11
-@dirrm lib/evas/modules/engines/software_x11/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/engines/software_x11
-@dirrm lib/evas/modules/engines/software_generic/%%MODULE_ARCH%%
+%%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/%%MODULE_ARCH%%
+%%WITH_GL%%@dirrm lib/evas/modules/engines/gl_x11/%%E17_ARCH%%
 %%WITH_GL%%@dirrm lib/evas/modules/engines/gl_x11
-@dirrm lib/evas/modules/engines/buffer/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/engines/buffer
+%%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
new file mode 100644
index 000000000000..b9eedadbf1c7
--- /dev/null
+++ b/graphics/exhibit/Makefile
@@ -0,0 +1,45 @@
+# New ports collection makefile for:	exhibit
+# Date created:		2006-08-15
+# Whom:			Stanislav Sedov <ssedov@mbsd.msk.ru>
+#
+# $MBSDlabs$
+# $FreeBSD$
+#
+
+PORTNAME=	exhibit
+PORTVERSION=	20060926
+CATEGORIES=	graphics
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+
+MAINTAINER=	stas@FreeBSD.org
+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
+WANT_EFL=	yes
+GNU_CONFIGURE=	yes
+
+OPTIONS=	ENGRAVE "Enable E17 desktop wallpaper support" on \
+		ENLIGHTENMENT "Enable e17 desktop integration" off
+
+PLIST_FILES=	bin/exhibit %%DATADIR%%/gui.edj
+PLIST_DIRS=	%%DATADIR%%
+
+.include <bsd.port.pre.mk>
+BEFOREPORTMK=	yes
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.undef BEFOREPORTMK
+
+.if !defined(WITHOUT_ENGRAVE) || ${HAVE_EFL:Mengrave}
+USE_EFL+=	engrave
+.endif
+
+.if defined(WITH_ENLIGHTENMENT) || exists(${X11BASE}/bin/enlightenment_remote)
+BUILD_DEPENDS+=	enlightenment_remote:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS+=	enlightenment_remote:${PORTSDIR}/x11-wm/enlightenment-devel
+.endif
+
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/graphics/exhibit/distinfo b/graphics/exhibit/distinfo
new file mode 100644
index 000000000000..4fce8851f7c2
--- /dev/null
+++ b/graphics/exhibit/distinfo
@@ -0,0 +1,3 @@
+MD5 (exhibit-20060926.tar.bz2) = 0057914c0640932fff612435177e0d44
+SHA256 (exhibit-20060926.tar.bz2) = 6ed79409af59b396b8a9765cae91f6940fadbdc5a1849aafd662a87d79a5b041
+SIZE (exhibit-20060926.tar.bz2) = 276307
diff --git a/graphics/exhibit/pkg-descr b/graphics/exhibit/pkg-descr
new file mode 100644
index 000000000000..d56ff135a098
--- /dev/null
+++ b/graphics/exhibit/pkg-descr
@@ -0,0 +1,7 @@
+Exhibit is an image viewer that uses Etk as its toolkit. Exhibit supports
+image previews for image types supported by Evas and allows for directory
+changing using a point and click interface or a text input box with tab
+autocompletion support.
+
+Author:	Hisham 'CodeWarrior' Mardambey <hisham.mardambey@gmail.com>
+WWW:	http://www.enlightenment.org/
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 2104e4e9a2cb..14032312beca 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -6,27 +6,31 @@
 #
 
 PORTNAME=	imlib2
-PORTVERSION=	1.2.2.001
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://enlightenment.freedesktop.org/files/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	vanilla@FreeBSD.org
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	The next generation graphic library for enlightenment package
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		ungif.5:${PORTSDIR}/graphics/libungif \
-		png.5:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		id3tag.0:${PORTSDIR}/audio/libid3tag \
-		freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
-USE_AUTOTOOLS=	autoconf:259 libltdl:15 libtool:15
-USE_GNOME=	gnomehack pkgconfig gnometarget
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib"
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 USE_LDCONFIG=	yes
 
+OPTIONS=	JPEG	"Enable jpeg image support"	on \
+		PNG	"Enable png image support"	on \
+		TIFF	"Enable tiff image support"	on \
+		GIF	"Enable GIF image support"	on \
+		ID3	"Enable IDv3 tags support"	on \
+		X11	"Enable X11 support"		on
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_MMX) && (${ARCH} == "i386")
@@ -46,12 +50,50 @@ USE_XLIB=	yes
 PLIST_SUB=	X11=""
 .endif
 
+.if !defined(WITHOUT_JPEG)
+LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
+PLIST_SUB+=	JPEG=""
+.else
+CONFIGURE_ARGS+=	--without-jpeg
+PLIST_SUB+=	JPEG="@comment "
+.endif
+
+.if !defined(WITHOUT_PNG)
+LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
+PLIST_SUB+=	PNG=""
+.else
+CONFIGURE_ARGS+=	--without-png
+PLIST_SUB+=	PNG="@comment "
+.endif
+
+.if !defined(WITHOUT_TIFF)
+LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
+PLIST_SUB+=	TIFF=""
+.else
+CONFIGURE_ARGS+=	--without-tiff
+PLIST_SUB+=	TIFF="@comment "
+.endif
+
+.if !defined(WITHOUT_GIF)
+LIB_DEPENDS+=	ungif.5:${PORTSDIR}/graphics/libungif
+PLIST_SUB+=	GIF=""
+.else
+CONFIGURE_ARGS+=	--without-gif
+PLIST_SUB+=	GIF="@comment "
+.endif
+
+.if !defined(WITHOUT_ID3)
+LIB_DEPENDS+=	id3tag.0:${PORTSDIR}/audio/libid3tag
+PLIST_SUB+=	ID3=""
+.else
+CONFIGURE_ARGS+=	--without-id3
+PLIST_SUB+=	ID3="@comment "
+.endif
+
 post-patch:
+.if ${OSVERSION} < 503000
 	@${REINPLACE_CMD} -e \
 		's|round|rint|g' ${WRKSRC}/src/lib/color_helpers.c
-
-# Kludge to keep it from touching Makefile.in files (configure.in is newer)
-post-configure:
-	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${TOUCH}
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index 6ff0c53efc26..2bf8dcfdc996 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1,3 +1,3 @@
-MD5 (imlib2-1.2.2.001.tar.gz) = ca9ad2142464f34a5716990aa162c94f
-SHA256 (imlib2-1.2.2.001.tar.gz) = beb929f4ceff865375a9e56c0156ffbfb197dff82299071bdb641bb60299f84b
-SIZE (imlib2-1.2.2.001.tar.gz) = 944824
+MD5 (imlib2-20060926.tar.bz2) = 506262e1d17b1e402ade868010ddf465
+SHA256 (imlib2-20060926.tar.bz2) = 137f78b1de8c3c834ff836974ac05b14feb8707ee7af5458553a2b330396a86e
+SIZE (imlib2-20060926.tar.bz2) = 841866
diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist
index c681c2b4f487..9e59bb39bb93 100644
--- a/graphics/imlib2/pkg-plist
+++ b/graphics/imlib2/pkg-plist
@@ -1,3 +1,4 @@
+bin/imlib2-config
 %%X11%%bin/imlib2_bumpmap
 %%X11%%bin/imlib2_colorspace
 bin/imlib2_conv
@@ -6,12 +7,7 @@ bin/imlib2_conv
 %%X11%%bin/imlib2_show
 %%X11%%bin/imlib2_test
 %%X11%%bin/imlib2_view
-bin/imlib2-config
 include/Imlib2.h
-lib/libImlib2.a
-lib/libImlib2.la
-lib/libImlib2.so
-lib/libImlib2.so.3
 lib/imlib2/filters/bumpmap.a
 lib/imlib2/filters/bumpmap.la
 lib/imlib2/filters/bumpmap.so
@@ -30,36 +26,40 @@ lib/imlib2/loaders/bmp.so
 lib/imlib2/loaders/bz2.a
 lib/imlib2/loaders/bz2.la
 lib/imlib2/loaders/bz2.so
-lib/imlib2/loaders/gif.a
-lib/imlib2/loaders/gif.la
-lib/imlib2/loaders/gif.so
-lib/imlib2/loaders/jpeg.a
-lib/imlib2/loaders/jpeg.la
-lib/imlib2/loaders/jpeg.so
-lib/imlib2/loaders/id3.a
-lib/imlib2/loaders/id3.la
-lib/imlib2/loaders/id3.so
+%%GIF%%lib/imlib2/loaders/gif.a
+%%GIF%%lib/imlib2/loaders/gif.la
+%%GIF%%lib/imlib2/loaders/gif.so
+%%ID3%%lib/imlib2/loaders/id3.a
+%%ID3%%lib/imlib2/loaders/id3.la
+%%ID3%%lib/imlib2/loaders/id3.so
+%%JPEG%%lib/imlib2/loaders/jpeg.a
+%%JPEG%%lib/imlib2/loaders/jpeg.la
+%%JPEG%%lib/imlib2/loaders/jpeg.so
 lib/imlib2/loaders/lbm.a
 lib/imlib2/loaders/lbm.la
 lib/imlib2/loaders/lbm.so
-lib/imlib2/loaders/png.a
-lib/imlib2/loaders/png.la
-lib/imlib2/loaders/png.so
+%%PNG%%lib/imlib2/loaders/png.a
+%%PNG%%lib/imlib2/loaders/png.la
+%%PNG%%lib/imlib2/loaders/png.so
 lib/imlib2/loaders/pnm.a
 lib/imlib2/loaders/pnm.la
 lib/imlib2/loaders/pnm.so
 lib/imlib2/loaders/tga.a
 lib/imlib2/loaders/tga.la
 lib/imlib2/loaders/tga.so
-lib/imlib2/loaders/tiff.a
-lib/imlib2/loaders/tiff.la
-lib/imlib2/loaders/tiff.so
+%%TIFF%%lib/imlib2/loaders/tiff.a
+%%TIFF%%lib/imlib2/loaders/tiff.la
+%%TIFF%%lib/imlib2/loaders/tiff.so
 lib/imlib2/loaders/xpm.a
 lib/imlib2/loaders/xpm.la
 lib/imlib2/loaders/xpm.so
 lib/imlib2/loaders/zlib.a
 lib/imlib2/loaders/zlib.la
 lib/imlib2/loaders/zlib.so
+lib/libImlib2.a
+lib/libImlib2.la
+lib/libImlib2.so
+lib/libImlib2.so.3
 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 2e2b70c0e070..dbe0c30cc762 100644
--- a/graphics/imlib2_loaders/Makefile
+++ b/graphics/imlib2_loaders/Makefile
@@ -6,12 +6,13 @@
 #
 
 PORTNAME=	imlib2_loaders
-PORTVERSION=	1.2.2.001
+PORTVERSION=	20060926
 PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://enlightenment.freedesktop.org/files/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	vanilla@FreeBSD.org
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Extra image loader plugins for Imlib 2
 
 LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2 \
@@ -19,8 +20,37 @@ LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2 \
 		eet.9:${PORTSDIR}/devel/eet
 
 GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget
-CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include" \
-		LIBS="-L${PREFIX}/lib"
 
-.include <bsd.port.mk>
+OPTIONS=	EDB	"Enable edb loader" on \
+		EET	"Enable eet loader" on \
+		XCF	"Enable XCF loader" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_EDB)
+USE_EFL+=	edb
+PLIST_SUB+=	EDB=""
+.else
+CONFIGURE_ARGS+=	--disable-edb
+PLIST_SUB+=	EDB="@comment "
+.endif
+
+.if !defined(WITHOUT_EET)
+USE_EFL+=	eet
+PLIST_SUB+=	EET=""
+.else
+CONFIGURE_ARGS+=	--disable-eet
+PLIST_SUB+=	EET="@comment "
+.endif
+
+.if !defined(WITHOUT_XCF)
+PLIST_SUB+=	XCF=""
+.else
+CONFIGURE_ARGS+=	--disable-xcf
+PLIST_SUB+=	XCF="@comment "
+.endif
+
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/graphics/imlib2_loaders/distinfo b/graphics/imlib2_loaders/distinfo
index 87f55cef7bca..c2dd1711461d 100644
--- a/graphics/imlib2_loaders/distinfo
+++ b/graphics/imlib2_loaders/distinfo
@@ -1,3 +1,3 @@
-MD5 (imlib2_loaders-1.2.2.001.tar.gz) = 553e2a8ee55d42159e9f4797d08e9f9d
-SHA256 (imlib2_loaders-1.2.2.001.tar.gz) = 2195a46b4160fd10fbdf5b202bcb531bd82d7c1ec9a8046a8a5bdb40c69044ed
-SIZE (imlib2_loaders-1.2.2.001.tar.gz) = 339224
+MD5 (imlib2_loaders-20060926.tar.bz2) = 452b7661ed24be80ebf1d8755e5bbfa4
+SHA256 (imlib2_loaders-20060926.tar.bz2) = e70e057076013f20dd37645bf55ea0740f0ff5905847be50e57f20216583f192
+SIZE (imlib2_loaders-20060926.tar.bz2) = 242000
diff --git a/graphics/imlib2_loaders/pkg-plist b/graphics/imlib2_loaders/pkg-plist
index ad43c152d48a..5a873f8db68a 100644
--- a/graphics/imlib2_loaders/pkg-plist
+++ b/graphics/imlib2_loaders/pkg-plist
@@ -1,15 +1,17 @@
 lib/imlib2/loaders/ani.a
 lib/imlib2/loaders/ani.la
 lib/imlib2/loaders/ani.so
-lib/imlib2/loaders/db.a
-lib/imlib2/loaders/db.la
-lib/imlib2/loaders/db.so
-lib/imlib2/loaders/eet.a
-lib/imlib2/loaders/eet.la
-lib/imlib2/loaders/eet.so
+%%EDB%%lib/imlib2/loaders/db.a
+%%EDB%%lib/imlib2/loaders/db.la
+%%EDB%%lib/imlib2/loaders/db.so
+%%EET%%lib/imlib2/loaders/eet.a
+%%EET%%lib/imlib2/loaders/eet.la
+%%EET%%lib/imlib2/loaders/eet.so
 lib/imlib2/loaders/ico.a
 lib/imlib2/loaders/ico.la
 lib/imlib2/loaders/ico.so
-lib/imlib2/loaders/xcf.a
-lib/imlib2/loaders/xcf.la
-lib/imlib2/loaders/xcf.so
+%%XCF%%lib/imlib2/loaders/xcf.a
+%%XCF%%lib/imlib2/loaders/xcf.la
+%%XCF%%lib/imlib2/loaders/xcf.so
+@dirrmtry lib/imlib2/loaders
+@dirrmtry lib/imlib2
diff --git a/graphics/ruby-edje/Makefile b/graphics/ruby-edje/Makefile
index 7b94f3c3884b..04a81e3b865a 100644
--- a/graphics/ruby-edje/Makefile
+++ b/graphics/ruby-edje/Makefile
@@ -6,21 +6,24 @@
 #
 
 PORTNAME=	edje
-PORTVERSION=	20060516
+PORTVERSION=	20061008
+PORTREVISION=	0
 CATEGORIES=	graphics ruby
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-edje-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Ruby bindings for Edje library
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake \
-		${RUBY_SITEARCHLIBDIR}/evas/rb_evas.h:${PORTSDIR}/graphics/ruby-evas
-LIB_DEPENDS=	edje.5:${PORTSDIR}/graphics/edje
+		${RUBY_SA}/evas/rb_evas.h:${PORTSDIR}/graphics/ruby-evas
 
 USE_BZIP2=	yes
 USE_RUBY=	yes
+USE_EFL=	edje
+
+RUBY_SA=	${RUBY_SITEARCHLIBDIR}
 
 .include <bsd.port.pre.mk>
 
@@ -35,4 +38,5 @@ do-install:
 	@(cd ${WRKSRC}; ${SETENV} EDJE_PREFIX=${LOCALBASE} \
 		${LOCALBASE}/bin/rake install)
 
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
 .include <bsd.port.post.mk>
diff --git a/graphics/ruby-edje/distinfo b/graphics/ruby-edje/distinfo
index f920a5c35879..5afe8038c43c 100644
--- a/graphics/ruby-edje/distinfo
+++ b/graphics/ruby-edje/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby-edje-20060516.tar.bz2) = 3e4207718683f92cf832fbba838b542d
-SHA256 (ruby-edje-20060516.tar.bz2) = dbf4d89a30cc9113039bc364d5528fa56da4f81f91c15eb84ec8b1add7f74eb7
-SIZE (ruby-edje-20060516.tar.bz2) = 15607
+MD5 (ruby-edje-20061008.tar.bz2) = 3fef78c3bd655b9836c5b8906b3ec643
+SHA256 (ruby-edje-20061008.tar.bz2) = b1a9aba5d36a88024e2bc889aeceb7798522b3c25f2cc8ab7e497a4e2c8369b6
+SIZE (ruby-edje-20061008.tar.bz2) = 15623
diff --git a/graphics/ruby-esmart/Makefile b/graphics/ruby-esmart/Makefile
index 95168d5fd91c..9bf2ca496d9e 100644
--- a/graphics/ruby-esmart/Makefile
+++ b/graphics/ruby-esmart/Makefile
@@ -6,31 +6,35 @@
 #
 
 PORTNAME=	esmart
-PORTVERSION=	20060516
+PORTVERSION=	20061008
+PORTREVISION=	0
 CATEGORIES=	graphics ruby
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-esmart-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Ruby bindings for Esmart library
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake \
-		${RUBY_SITEARCHLIBDIR}/evas/rb_evas.h:${PORTSDIR}/graphics/ruby-evas \
-		${RUBY_SITEARCHLIBDIR}/ecore/rb_window.h:${PORTSDIR}/devel/ruby-ecore
-LIB_DEPENDS=	esmart_trans_x11.0:${PORTSDIR}/graphics/esmart
+		${RUBY_SA}/evas/rb_evas.h:${PORTSDIR}/graphics/ruby-evas \
+		${RUBY_SA}/ecore/rb_window.h:${PORTSDIR}/devel/ruby-ecore
 
 USE_BZIP2=	yes
 USE_RUBY=	yes
+USE_EFL_ESMART=	trans_x11
+
+RUBY_SA=	${RUBY_SITEARCHLIBDIR}
 
 .include <bsd.port.pre.mk>
 
 do-build:
-	@(cd ${WRKSRC}; ${SETENV} ESMART_PREFIX=${X11BASE} \
+	@(cd ${WRKSRC}; ${SETENV} ESMART_PREFIX=${LOCALBASE} \
 		${LOCALBASE}/bin/rake)
 
 do-install:
-	@(cd ${WRKSRC}; ${SETENV} ESMART_PREFIX=${X11BASE} \
+	@(cd ${WRKSRC}; ${SETENV} ESMART_PREFIX=${LOCALBASE} \
 		${LOCALBASE}/bin/rake install)
 
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
 .include <bsd.port.post.mk>
diff --git a/graphics/ruby-esmart/distinfo b/graphics/ruby-esmart/distinfo
index 94a83885d7c7..fcfdb9fd8f4d 100644
--- a/graphics/ruby-esmart/distinfo
+++ b/graphics/ruby-esmart/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby-esmart-20060516.tar.bz2) = 527887651038820ceea8e0695df625cf
-SHA256 (ruby-esmart-20060516.tar.bz2) = 1e4ed48b1fd9f505fb7f124ebf284549e61bd98f63525a3544ffedb0c582575d
-SIZE (ruby-esmart-20060516.tar.bz2) = 13379
+MD5 (ruby-esmart-20061008.tar.bz2) = 61cdc7b6594805247efaee74e3577886
+SHA256 (ruby-esmart-20061008.tar.bz2) = 276cd71d194c8c6a6825f56ce00aaaf62355fa838a3c1ecbdb31caef1890a69f
+SIZE (ruby-esmart-20061008.tar.bz2) = 13383
diff --git a/graphics/ruby-evas/Makefile b/graphics/ruby-evas/Makefile
index 2f783053e24e..522c89d801e0 100644
--- a/graphics/ruby-evas/Makefile
+++ b/graphics/ruby-evas/Makefile
@@ -6,29 +6,31 @@
 #
 
 PORTNAME=	evas
-PORTVERSION=	20060516
+PORTVERSION=	20061008
+PORTREVISION=	0
 CATEGORIES=	graphics ruby
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-evas-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Ruby bindings for Evas library
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake
-LIB_DEPENDS=	evas.1:${PORTSDIR}/graphics/evas
 
 USE_BZIP2=	yes
 USE_RUBY=	yes
+USE_EFL=	evas
 
 .include <bsd.port.pre.mk>
 
 do-build:
-	@(cd ${WRKSRC}; ${SETENV} EVAS_PREFIX=${X11BASE} \
+	@(cd ${WRKSRC}; ${SETENV} EVAS_PREFIX=${LOCALBASE} \
 		${LOCALBASE}/bin/rake)
 
 do-install:
-	@(cd ${WRKSRC}; ${SETENV} EVAS_PREFIX=${X11BASE} \
+	@(cd ${WRKSRC}; ${SETENV} EVAS_PREFIX=${LOCALBASE} \
 		${LOCALBASE}/bin/rake install)
 
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
 .include <bsd.port.post.mk>
diff --git a/graphics/ruby-evas/distinfo b/graphics/ruby-evas/distinfo
index 021d5dd6cafa..828ef55cc56f 100644
--- a/graphics/ruby-evas/distinfo
+++ b/graphics/ruby-evas/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby-evas-20060516.tar.bz2) = dbbce157078a238bf6c5fccdaf861f81
-SHA256 (ruby-evas-20060516.tar.bz2) = 5764ece99e6bb3fa67c77966de18f5db5c8f8a65d8374f53584f1360fa95fb4f
-SIZE (ruby-evas-20060516.tar.bz2) = 19583
+MD5 (ruby-evas-20061008.tar.bz2) = 4e47eb2ac2405d6ade439f5ef32d5c5b
+SHA256 (ruby-evas-20061008.tar.bz2) = d52308616c746049c8eb80abcfc9ad9fbd2733ce9f6a600985b39ae5a1beff3d
+SIZE (ruby-evas-20061008.tar.bz2) = 19689
diff --git a/lang/embryo/Makefile b/lang/embryo/Makefile
index 9a8f5358ef4c..c5ba2c12889b 100644
--- a/lang/embryo/Makefile
+++ b/lang/embryo/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	embryo
-PORTVERSION=	0.9.1.032
+PORTVERSION=	20060926
 PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	lang
-MASTER_SITES=	http://enlightenment.freedesktop.org/files/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	vanilla@FreeBSD.org
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	A C like scripting language used in parts of the Enlightenment
 
 GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
-INSTALLS_SHLIB=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/lang/embryo/distinfo b/lang/embryo/distinfo
index e2db07ea3063..e801d8c76e8a 100644
--- a/lang/embryo/distinfo
+++ b/lang/embryo/distinfo
@@ -1,3 +1,3 @@
-MD5 (embryo-0.9.1.032.tar.gz) = 41e81058f1b839575a29ef4ac2157a35
-SHA256 (embryo-0.9.1.032.tar.gz) = bb0a895e65cd64607f96f8a9e357d0cc28e0572072f13bb5600a1f9db85b0a3f
-SIZE (embryo-0.9.1.032.tar.gz) = 477640
+MD5 (embryo-20060926.tar.bz2) = 6e17b8f3b46151b012e84710e1ba35c0
+SHA256 (embryo-20060926.tar.bz2) = c96f8c8a4a2b88c330a78708e2c92ba23e1804d86f7683b00f99ca897f1f89e8
+SIZE (embryo-20060926.tar.bz2) = 1383757
diff --git a/lang/embryo/pkg-plist b/lang/embryo/pkg-plist
index 4184145acf10..a4c22e0b89be 100644
--- a/lang/embryo/pkg-plist
+++ b/lang/embryo/pkg-plist
@@ -1,19 +1,19 @@
 bin/embryo
-bin/embryo_cc
 bin/embryo-config
+bin/embryo_cc
 include/Embryo.h
 lib/libembryo.a
 lib/libembryo.la
 lib/libembryo.so
 lib/libembryo.so.9
 libdata/pkgconfig/embryo.pc
-%%DATADIR%%/include/default.inc
 %%DATADIR%%/examples/example.inc
 %%DATADIR%%/examples/example.sma
 %%DATADIR%%/examples/recurse.inc
 %%DATADIR%%/examples/recurse.sma
 %%DATADIR%%/examples/test.inc
 %%DATADIR%%/examples/test.sma
-@dirrm %%DATADIR%%/examples
+%%DATADIR%%/include/default.inc
 @dirrm %%DATADIR%%/include
+@dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%
diff --git a/multimedia/eclair/Makefile b/multimedia/eclair/Makefile
index 00faf3e32891..c4f62a12d0e6 100644
--- a/multimedia/eclair/Makefile
+++ b/multimedia/eclair/Makefile
@@ -7,27 +7,23 @@
 #
 
 PORTNAME=	eclair
-PORTVERSION=	20060719
+PORTVERSION=	20060926
 CATEGORIES=	multimedia
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An EFL powered media player
 
-LIB_DEPENDS=	ecore.1:${PORTSDIR}/x11/ecore \
-		edje.5:${PORTSDIR}/graphics/edje \
-		emotion.0:${PORTSDIR}/multimedia/emotion \
-		esmart_trans_x11.0:${PORTSDIR}/graphics/esmart \
-		evas.1:${PORTSDIR}/graphics/evas \
-		tag.5:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	tag.5:${PORTSDIR}/audio/taglib
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_GNOME=	pkgconfig libxml2
+USE_GNOME=	gnometarget pkgconfig libxml2
+USE_EFL=	ecore edje evas emotion
+USE_EFL_ESMART=	trans_x11
 USE_SQLITE=	3
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/multimedia/eclair/distinfo b/multimedia/eclair/distinfo
index 8c263cb5157c..f9e7657641de 100644
--- a/multimedia/eclair/distinfo
+++ b/multimedia/eclair/distinfo
@@ -1,3 +1,3 @@
-MD5 (eclair-20060719.tar.bz2) = bffffd12d303bcd87e6cb581962d2378
-SHA256 (eclair-20060719.tar.bz2) = 5cd78965239fff3f527d59a97c58ec35a6ca2d4f0cda4bb6f778c9a02eba4201
-SIZE (eclair-20060719.tar.bz2) = 630780
+MD5 (eclair-20060926.tar.bz2) = 41ae9ab91f36e1fc98230903f64d0848
+SHA256 (eclair-20060926.tar.bz2) = 7b68e45df6ebfd66c009c76c0f522f6a84a6a3c06c103f6cd350cad626f41afc
+SIZE (eclair-20060926.tar.bz2) = 628890
diff --git a/multimedia/eclair/pkg-plist b/multimedia/eclair/pkg-plist
index 0d8b4944c8d6..766ef707545c 100644
--- a/multimedia/eclair/pkg-plist
+++ b/multimedia/eclair/pkg-plist
@@ -22,9 +22,9 @@ bin/eclair_wsz2edj
 %%DATADIR%%/themes/swallow_me.edj
 %%DATADIR%%/widget_themes/default.edj
 %%DATADIR%%/wsz2edj/wsz2edj_edc.tar.gz
-@dirrmtry %%DATADIR%%/wsz2edj
-@dirrmtry %%DATADIR%%/widget_themes
-@dirrmtry %%DATADIR%%/themes
-@dirrmtry %%DATADIR%%/icons
-@dirrmtry %%DATADIR%%/fonts
-@dirrmtry %%DATADIR%%
+@dirrm %%DATADIR%%/wsz2edj
+@dirrm %%DATADIR%%/widget_themes
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%
diff --git a/multimedia/emotion/Makefile b/multimedia/emotion/Makefile
index 5b92ee78f15b..3887cd6ca4f8 100644
--- a/multimedia/emotion/Makefile
+++ b/multimedia/emotion/Makefile
@@ -7,31 +7,25 @@
 #
 
 PORTNAME=	emotion
-PORTVERSION=	20060719
+PORTVERSION=	20060926
 CATEGORIES=	multimedia
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Video playback wrapper library for e17
 
-LIB_DEPENDS=	ecore.1:${PORTSDIR}/x11/ecore \
-		edje.5:${PORTSDIR}/graphics/edje \
-		eet.9:${PORTSDIR}/devel/eet \
-		embryo.9:${PORTSDIR}/lang/embryo \
-		evas.1:${PORTSDIR}/graphics/evas
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_EFL=	ecore edje eet embryo evas
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 OPTIONS=	XINE "Build Xine module" on \
 		GST "Build GStreamer module" on
 
 .include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
 
 .if defined(WITHOUT_XINE) && defined(WITHOUT_GST)
 IGNORE=	is useless without playback library. Please run 'make config' and choose one of XINE and GST
@@ -39,14 +33,19 @@ IGNORE=	is useless without playback library. Please run 'make config' and choose
 
 .if defined(WITH_XINE)
 LIB_DEPENDS+=	xine.15:${PORTSDIR}/multimedia/libxine
+CONFIGURE_ARGS+=--enable-xine
 PLIST_SUB+=	XINE=""
 .else
+CONFIGURE_ARGS+=--disable-xine
 PLIST_SUB+=	XINE="@comment "
 .endif
+
 .if defined(WITH_GST)
 USE_GSTREAMER=	ffmpeg good
+CONFIGURE_ARGS+=--enable-gstreamer
 PLIST_SUB+=	GST=""
 .else
+CONFIGURE_ARGS+=--disable-gstreamer
 PLIST_SUB+=	GST="@comment "
 .endif
 
diff --git a/multimedia/emotion/distinfo b/multimedia/emotion/distinfo
index dcc2f9a24be8..b601eba58e91 100644
--- a/multimedia/emotion/distinfo
+++ b/multimedia/emotion/distinfo
@@ -1,3 +1,3 @@
-MD5 (emotion-20060719.tar.bz2) = e5536468ace9cd02c31ae7994eca7c1d
-SHA256 (emotion-20060719.tar.bz2) = 6ec5c3e8e07df8358ef34117eeb90a278d0cab12ffdae0e06c6171c81f439668
-SIZE (emotion-20060719.tar.bz2) = 1425051
+MD5 (emotion-20060926.tar.bz2) = 20b25be2a8ae59b704dbb6b3e37100df
+SHA256 (emotion-20060926.tar.bz2) = 4e007b703cb7c2f2d52336e661968d647df9f40dcc54f5694a0e59f51b1c5886
+SIZE (emotion-20060926.tar.bz2) = 1434266
diff --git a/multimedia/emotion/files/patch-configure b/multimedia/emotion/files/patch-configure
index e032d84c6ce1..ce8584392d2d 100644
--- a/multimedia/emotion/files/patch-configure
+++ b/multimedia/emotion/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue Jul 18 17:40:53 2006
-+++ configure	Tue Jul 18 17:41:01 2006
-@@ -21861,27 +21861,6 @@
+--- configure.orig	Wed Sep 27 19:06:08 2006
++++ configure	Wed Sep 27 19:08:36 2006
+@@ -22241,27 +22241,6 @@
  _ACEOF
  
  
@@ -25,6 +25,6 @@
 -
 -
 -
- # Check whether --with-eet-prefix or --without-eet-prefix was given.
+ # Check whether --with-eet-prefix was given.
  if test "${with_eet_prefix+set}" = set; then
-   withval="$with_eet_prefix"
+   withval=$with_eet_prefix; eet_config_prefix="$withval"
diff --git a/multimedia/emotion/pkg-plist b/multimedia/emotion/pkg-plist
index 405cc4bd2aab..da6dcdb15dea 100644
--- a/multimedia/emotion/pkg-plist
+++ b/multimedia/emotion/pkg-plist
@@ -13,6 +13,6 @@ lib/libemotion.so
 lib/libemotion.so.0
 libdata/pkgconfig/emotion.pc
 %%DATADIR%%/data/theme.edj
-@dirrmtry share/emotion/data
-@dirrmtry share/emotion
-@dirrmtry lib/emotion
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%
+@dirrm lib/emotion
diff --git a/sysutils/empower/Makefile b/sysutils/empower/Makefile
new file mode 100644
index 000000000000..bd91787a1ca9
--- /dev/null
+++ b/sysutils/empower/Makefile
@@ -0,0 +1,47 @@
+# New ports collection makefile for:	empower
+# Date created:		2006-08-14
+# Whom:			Stanislav Sedov <ssedov@mbsd.msk.ru>
+#
+# $MBSDlabs$
+# $FreeBSD$
+#
+
+PORTNAME=	empower
+PORTVERSION=	20060926
+CATEGORIES=	sysutils
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+
+MAINTAINER=	stas@FreeBSD.org
+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
+WANT_EFL=	yes
+GNU_CONFIGURE=	yes
+
+OPTIONS=	EWL "Build EWL backend" on \
+		ETK "Build ETK backed" off
+
+.include <bsd.port.pre.mk>
+BEFOREPORTMK=	yes
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.undef BEFOREPORTMK
+
+.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 "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/sysutils/empower/distinfo b/sysutils/empower/distinfo
new file mode 100644
index 000000000000..4f3509e578a3
--- /dev/null
+++ b/sysutils/empower/distinfo
@@ -0,0 +1,3 @@
+MD5 (empower-20060926.tar.bz2) = 7f6facf3800cd4617796e7f5ba1728b3
+SHA256 (empower-20060926.tar.bz2) = e413700b54541d543ffdb50d6e9b658c821d763c47e048d955363d41ae821701
+SIZE (empower-20060926.tar.bz2) = 214607
diff --git a/sysutils/empower/pkg-descr b/sysutils/empower/pkg-descr
new file mode 100644
index 000000000000..018d4aefe4e2
--- /dev/null
+++ b/sysutils/empower/pkg-descr
@@ -0,0 +1,4 @@
+Empower - A graphical sudo tool based on the Enlightenment Foundation Libraries.
+
+Author:	Mekius_ (Nick Hughart) <mekius@gmail.com>
+WWW:	http://www.enlightenment.org/
diff --git a/sysutils/extrackt/Makefile b/sysutils/extrackt/Makefile
new file mode 100644
index 000000000000..ac1a6d5d1530
--- /dev/null
+++ b/sysutils/extrackt/Makefile
@@ -0,0 +1,25 @@
+# New ports collection makefile for:	extrackt
+# Date created:		2006-08-15
+# Whom:			Stanislav Sedov <ssedov@mbsd.msk.ru>
+#
+# $MBSDlabs$
+# $FreeBSD$
+#
+
+PORTNAME=	extrackt
+PORTVERSION=	20060926
+CATEGORIES=	sysutils
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	Audio CD ripper and encoder
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_EFL=	evas ecore eet etk enhance
+GNU_CONFIGURE=	yes
+
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/sysutils/extrackt/distinfo b/sysutils/extrackt/distinfo
new file mode 100644
index 000000000000..bc3f5153608f
--- /dev/null
+++ b/sysutils/extrackt/distinfo
@@ -0,0 +1,3 @@
+MD5 (extrackt-20060926.tar.bz2) = 1c737fbf85feec5870c07af8c5b4b32e
+SHA256 (extrackt-20060926.tar.bz2) = 8281ed20c351196153b408ea7ca0748e3098eb959d84049f353d19fbdde5aa1e
+SIZE (extrackt-20060926.tar.bz2) = 351885
diff --git a/sysutils/extrackt/pkg-descr b/sysutils/extrackt/pkg-descr
new file mode 100644
index 000000000000..7d5da79959a1
--- /dev/null
+++ b/sysutils/extrackt/pkg-descr
@@ -0,0 +1,9 @@
+Extrackt is essentially an audio CD ripper and encoder. It allows you to
+choose your ripper and encoder based on templates which give Extrackt the
+ability to use multiple built in and user defined ones. Extrackt is logically
+split into a frontend (gui) and a backend (ripping / encoding / cddb etc).
+and allows for frontends to be written using any toolkit like Etk, Ewl, Gtk,
+or even pure Evas / Edje (not to mention ncurses or simlpe shell ones).
+
+Author:	Hisham 'CodeWarrior' Mardam Bey
+WWW:	http://www.enlightenment.org/
diff --git a/sysutils/extrackt/pkg-plist b/sysutils/extrackt/pkg-plist
new file mode 100644
index 000000000000..3b4b31ad66fa
--- /dev/null
+++ b/sysutils/extrackt/pkg-plist
@@ -0,0 +1,7 @@
+bin/extrackt
+%%DATADIR%%/etk_fe/etk_fe.edj
+%%DATADIR%%/etk_fe/extrackt.glade
+%%DATADIR%%/images/extrackt_icon.png
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/etk_fe
+@dirrm %%DATADIR%%
diff --git a/textproc/exml/Makefile b/textproc/exml/Makefile
index 71261ec17f78..ed057ef63596 100644
--- a/textproc/exml/Makefile
+++ b/textproc/exml/Makefile
@@ -6,20 +6,19 @@
 #
 
 PORTNAME=	exml
-PORTVERSION=	20060707
+PORTVERSION=	20060926
 CATEGORIES=	textproc
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	EXML is an abstracted, generalized interface to libxml
 
-LIB_DEPENDS=	ecore.1:${PORTSDIR}/x11/ecore
-
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GNOME=	libxml2 gnomehack gnometarget
-INSTALLS_SHLIB=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+USE_GNOME=	libxml2 libxslt gnomehack gnometarget pkgconfig
+USE_EFL=	ecore
+USE_LDCONFIG=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/textproc/exml/distinfo b/textproc/exml/distinfo
index b28c42996f33..3c58efe2cfca 100644
--- a/textproc/exml/distinfo
+++ b/textproc/exml/distinfo
@@ -1,3 +1,3 @@
-MD5 (exml-20060707.tar.bz2) = 82a4426fb88a6e82d4c4d0d0caf35eb1
-SHA256 (exml-20060707.tar.bz2) = c04a8ead6809730c1b6ccb91b256b143c259f138821cf13c905df1a2b34c2e0c
-SIZE (exml-20060707.tar.bz2) = 210135
+MD5 (exml-20060926.tar.bz2) = bd602db3cd8ce68733a95be6854b4034
+SHA256 (exml-20060926.tar.bz2) = 670908adc3b77df84f9146435127032e38ffc3b91fdde299d19b6094f11b350d
+SIZE (exml-20060926.tar.bz2) = 224804
diff --git a/x11-fm/entropyfm/Makefile b/x11-fm/entropyfm/Makefile
new file mode 100644
index 000000000000..8a163f8f100a
--- /dev/null
+++ b/x11-fm/entropyfm/Makefile
@@ -0,0 +1,47 @@
+# New ports collection makefile for:	entropy
+# Date created:		2006-08-14
+# Whom:			Stanislav Sedov <ssedov@mbsd.msk.ru>
+#
+# $MBSDlabs$
+# $FreeBSD$
+#
+
+PORTNAME=	entropyfm
+PORTVERSION=	20060926
+CATEGORIES=	x11-fm
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+DISTNAME=	${PORTNAME:S,fm$,,}-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	An EFL-based file manager
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_EFL=	ecore etk ewl evfs imlib2 epsilon
+GNU_CONFIGURE=	yes
+
+CFLAGS+=	"-L${LOCALBASE}/lib"
+
+OPTIONS=	XTRACT "Enable metadata extraction via libextractor" on \
+		PNG	"Enable png thumbnailing" on
+
+DATADIR=	${PREFIX}/share/entropy
+
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+
+.if !defined(WITHOUT_XTRACT)
+LIB_DEPENDS+=	extractor.2:${PORTSDIR}/textproc/libextractor
+CONFIGURE_ARGS+=--enable-plugin-extractor
+PLIST_SUB+=	EXTRACT=""
+.else
+CONFIGURE_ARGS+=--disable-plugin-extractor
+PLIST_SUB+=	EXTRACT="@comment "
+.endif
+
+.if !defined(WITHOUT_PNG) || exists(${LOCALBASE}/lib/libpng.so.5)
+LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11-fm/entropyfm/distinfo b/x11-fm/entropyfm/distinfo
new file mode 100644
index 000000000000..1c34b9587a4d
--- /dev/null
+++ b/x11-fm/entropyfm/distinfo
@@ -0,0 +1,3 @@
+MD5 (entropy-20060926.tar.bz2) = e15bba87db5b3d92eb56aca4950f9e26
+SHA256 (entropy-20060926.tar.bz2) = 2f5d21d972b4dcc45217983e0ae634d1dd1ebdf1fa7bee174d47c16de4c9670b
+SIZE (entropy-20060926.tar.bz2) = 480435
diff --git a/x11-fm/entropyfm/pkg-descr b/x11-fm/entropyfm/pkg-descr
new file mode 100644
index 000000000000..3d99173b6839
--- /dev/null
+++ b/x11-fm/entropyfm/pkg-descr
@@ -0,0 +1,4 @@
+An Enlightenment File Manager.
+
+Author:	ch4os <alex@logisticchaos.com>
+WWW:	http://www.enlightenment.org/
diff --git a/x11-fm/entropyfm/pkg-plist b/x11-fm/entropyfm/pkg-plist
new file mode 100644
index 000000000000..facc906ead50
--- /dev/null
+++ b/x11-fm/entropyfm/pkg-plist
@@ -0,0 +1,95 @@
+bin/entropy
+%%DATADIR%%/icons/bz2.png
+%%DATADIR%%/icons/c.png
+%%DATADIR%%/icons/default.png
+%%DATADIR%%/icons/default_bg.jpg
+%%DATADIR%%/icons/document.png
+%%DATADIR%%/icons/e17_button_detail_copy.png
+%%DATADIR%%/icons/e17_button_detail_cut.png
+%%DATADIR%%/icons/e17_button_detail_delete.png
+%%DATADIR%%/icons/e17_button_detail_new_dir.png
+%%DATADIR%%/icons/e17_button_detail_paste.png
+%%DATADIR%%/icons/e17_button_detail_properties.png
+%%DATADIR%%/icons/e17_button_detail_rename.png
+%%DATADIR%%/icons/entropy.png
+%%DATADIR%%/icons/folder.png
+%%DATADIR%%/icons/folder_structure.png
+%%DATADIR%%/icons/hint_audio.png
+%%DATADIR%%/icons/hint_image.png
+%%DATADIR%%/icons/hint_videos.png
+%%DATADIR%%/icons/html.png
+%%DATADIR%%/icons/jar.png
+%%DATADIR%%/icons/java.png
+%%DATADIR%%/icons/local-system.png
+%%DATADIR%%/icons/mp3.png
+%%DATADIR%%/icons/mpeg.png
+%%DATADIR%%/icons/pdf.png
+%%DATADIR%%/icons/perl.png
+%%DATADIR%%/icons/samba-system.png
+%%DATADIR%%/icons/sftp-system.png
+%%DATADIR%%/icons/spreadsheet.png
+%%DATADIR%%/icons/tar.png
+%%DATADIR%%/icons/tgz.png
+%%DATADIR%%/icons/tip.png
+%%DATADIR%%/icons/txt.png
+%%DATADIR%%/icons/vfolder-system.png
+%%DATADIR%%/icons/video.png
+%%DATADIR%%/icons/wmv.png
+%%DATADIR%%/icons/xml.png
+%%DATADIR%%/plugins/action_simple.a
+%%DATADIR%%/plugins/action_simple.la
+%%DATADIR%%/plugins/action_simple.so
+%%DATADIR%%/plugins/distrib_thumbnailer.a
+%%DATADIR%%/plugins/distrib_thumbnailer.la
+%%DATADIR%%/plugins/distrib_thumbnailer.so
+%%DATADIR%%/plugins/etk_iconbox.a
+%%DATADIR%%/plugins/etk_iconbox.la
+%%DATADIR%%/plugins/etk_iconbox.so
+%%DATADIR%%/plugins/etk_list.a
+%%DATADIR%%/plugins/etk_list.la
+%%DATADIR%%/plugins/etk_list.so
+%%DATADIR%%/plugins/etk_metadata.a
+%%DATADIR%%/plugins/etk_metadata.la
+%%DATADIR%%/plugins/etk_metadata.so
+%%DATADIR%%/plugins/etk_structure_viewer.a
+%%DATADIR%%/plugins/etk_structure_viewer.la
+%%DATADIR%%/plugins/etk_structure_viewer.so
+%%DATADIR%%/plugins/etk_trackback.a
+%%DATADIR%%/plugins/etk_trackback.la
+%%DATADIR%%/plugins/etk_trackback.so
+%%DATADIR%%/plugins/ewl_list.a
+%%DATADIR%%/plugins/ewl_list.la
+%%DATADIR%%/plugins/ewl_list.so
+%%DATADIR%%/plugins/ewl_local_icon.a
+%%DATADIR%%/plugins/ewl_local_icon.la
+%%DATADIR%%/plugins/ewl_local_icon.so
+%%DATADIR%%/plugins/imlib_thumbnailer.a
+%%DATADIR%%/plugins/imlib_thumbnailer.la
+%%DATADIR%%/plugins/imlib_thumbnailer.so
+%%DATADIR%%/plugins/layout_etk_simple.a
+%%DATADIR%%/plugins/layout_etk_simple.la
+%%DATADIR%%/plugins/layout_etk_simple.so
+%%DATADIR%%/plugins/layout_ewl_simple.a
+%%DATADIR%%/plugins/layout_ewl_simple.la
+%%DATADIR%%/plugins/layout_ewl_simple.so
+%%EXTRACT%%%%DATADIR%%/plugins/metadata_extract.a
+%%EXTRACT%%%%DATADIR%%/plugins/metadata_extract.la
+%%EXTRACT%%%%DATADIR%%/plugins/metadata_extract.so
+%%DATADIR%%/plugins/mime.a
+%%DATADIR%%/plugins/mime.la
+%%DATADIR%%/plugins/mime.so
+%%DATADIR%%/plugins/posix.a
+%%DATADIR%%/plugins/posix.la
+%%DATADIR%%/plugins/posix.so
+%%DATADIR%%/plugins/remote_thumbnailer.a
+%%DATADIR%%/plugins/remote_thumbnailer.la
+%%DATADIR%%/plugins/remote_thumbnailer.so
+%%DATADIR%%/plugins/structure_viewer.a
+%%DATADIR%%/plugins/structure_viewer.la
+%%DATADIR%%/plugins/structure_viewer.so
+%%DATADIR%%/plugins/system_thumbnailer.a
+%%DATADIR%%/plugins/system_thumbnailer.la
+%%DATADIR%%/plugins/system_thumbnailer.so
+@dirrm %%DATADIR%%/plugins
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
diff --git a/x11-themes/e17-splash-azul/Makefile b/x11-themes/e17-splash-azul/Makefile
index c8b5dcdbbee6..0bc6fa0d93cb 100644
--- a/x11-themes/e17-splash-azul/Makefile
+++ b/x11-themes/e17-splash-azul/Makefile
@@ -8,18 +8,19 @@
 
 PORTNAME=	azul
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/Startup/_files/
+MASTER_SITES=	http://www0.get-e.org/Themes/Startup/_files/ \
+		http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-splash-
 DISTNAME=	init_azul
 EXTRACT_SUFX=	.edj
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Azul splash screen for e17 window manager
 
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
 
-USE_X_PREFIX=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/x11-themes/e17-splash-blue/Makefile b/x11-themes/e17-splash-blue/Makefile
index fe160e1e6475..79cceef2b512 100644
--- a/x11-themes/e17-splash-blue/Makefile
+++ b/x11-themes/e17-splash-blue/Makefile
@@ -8,18 +8,19 @@
 
 PORTNAME=	blue
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/Startup/_files/
+MASTER_SITES=	http://www0.get-e.org/Themes/Startup/_files/ \
+		http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-splash-
 DISTNAME=	init_blue
 EXTRACT_SUFX=	.edj
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Blue splash screen for e17 window manager
 
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
 
-USE_X_PREFIX=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/x11-themes/e17-splash-fortune/Makefile b/x11-themes/e17-splash-fortune/Makefile
index 07fc1c9766f3..047b5ec2911a 100644
--- a/x11-themes/e17-splash-fortune/Makefile
+++ b/x11-themes/e17-splash-fortune/Makefile
@@ -8,18 +8,19 @@
 
 PORTNAME=	fortune
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/Startup/_files/
+MASTER_SITES=	http://www0.get-e.org/Themes/Startup/_files/ \
+		http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-splash-
 DISTNAME=	init_fortune
 EXTRACT_SUFX=	.edj
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Fortune splash screen for e17 window manager
 
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
 
-USE_X_PREFIX=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/x11-themes/e17-splash-logo/Makefile b/x11-themes/e17-splash-logo/Makefile
index 26339880f793..d1bfd39476c8 100644
--- a/x11-themes/e17-splash-logo/Makefile
+++ b/x11-themes/e17-splash-logo/Makefile
@@ -8,18 +8,19 @@
 
 PORTNAME=	logo
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/Startup/_files/
+MASTER_SITES=	http://www0.get-e.org/Themes/Startup/_files/ \
+		http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-splash-
 DISTNAME=	init_logo
 EXTRACT_SUFX=	.edj
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Logo splash screen for e17 window manager
 
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
 
-USE_X_PREFIX=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/x11-themes/e17-splash-shiny/Makefile b/x11-themes/e17-splash-shiny/Makefile
index 17d3a9a20d4c..ca416329a002 100644
--- a/x11-themes/e17-splash-shiny/Makefile
+++ b/x11-themes/e17-splash-shiny/Makefile
@@ -8,18 +8,19 @@
 
 PORTNAME=	shiny
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/Startup/_files/
+MASTER_SITES=	http://www0.get-e.org/Themes/Startup/_files/ \
+		http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-splash-
 DISTNAME=	init_shiny_reflection
 EXTRACT_SUFX=	.edj
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Shiny splash screen for e17 window manager
 
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
 
-USE_X_PREFIX=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/x11-themes/e17-splash-takara/Makefile b/x11-themes/e17-splash-takara/Makefile
index df046d2a16de..4a5bed64f71f 100644
--- a/x11-themes/e17-splash-takara/Makefile
+++ b/x11-themes/e17-splash-takara/Makefile
@@ -8,18 +8,19 @@
 
 PORTNAME=	takara
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-themes
-MASTER_SITES=	http://www0.get-e.org/Themes/Startup/_files/
+MASTER_SITES=	http://www0.get-e.org/Themes/Startup/_files/ \
+		http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-splash-
 DISTNAME=	init_takara_v${PORTVERSION}
 EXTRACT_SUFX=	.edj
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Takara splash screen for e17 window manager
 
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
 
-USE_X_PREFIX=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/x11-themes/e17-theme-blokkie/Makefile b/x11-themes/e17-theme-blokkie/Makefile
index 15512ab79586..9918d9e21b5e 100644
--- a/x11-themes/e17-theme-blokkie/Makefile
+++ b/x11-themes/e17-theme-blokkie/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	e17-theme-
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.edj
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Blokkie theme for use with e17 window manager
 
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
@@ -25,6 +25,10 @@ NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	share/enlightenment/data/themes/blokkie.edj
 
+IGNORE=		doesn't work with recent e17
+DEPRECATED=	${IGNORE}
+EXPIRATION_DATE=2006-11-01
+
 do-extract:
 	${MKDIR} ${WRKDIR}
 	${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}
diff --git a/x11-themes/e17-theme-blue_default/Makefile b/x11-themes/e17-theme-blue_default/Makefile
index 84dfad9ad4a4..f584e5ceb186 100644
--- a/x11-themes/e17-theme-blue_default/Makefile
+++ b/x11-themes/e17-theme-blue_default/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	e17-theme-
 DISTNAME=	bluedefault-1.0
 EXTRACT_SUFX=	.edj
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Blue default theme for use with e17 window manager
 
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
@@ -25,6 +25,10 @@ NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	share/enlightenment/data/themes/bluedefault-1.0.edj
 
+IGNORE=		doesn't work with recent e17
+DEPRECATED=	${IGNORE}
+EXPIRATION_DATE=2006-11-01
+
 do-extract:
 	${MKDIR} ${WRKDIR}
 	${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}
diff --git a/x11-themes/e17-theme-blue_eyed/Makefile b/x11-themes/e17-theme-blue_eyed/Makefile
index 41a575d1fbd5..b931d373d2a3 100644
--- a/x11-themes/e17-theme-blue_eyed/Makefile
+++ b/x11-themes/e17-theme-blue_eyed/Makefile
@@ -7,19 +7,19 @@
 
 PORTNAME=	blue_eyed
 PORTVERSION=	0.6.5.3
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
-		http://mbsd.msk.ru/dist/
+		http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-theme-
 DISTNAME=	blue_eyed_0.6.5.g_i
 EXTRACT_SUFX=	.edj
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	BlueEyed theme for use with e17 window manager
 
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
 
-USE_X_PREFIX=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/x11-themes/e17-theme-carbon/Makefile b/x11-themes/e17-theme-carbon/Makefile
index aa88c696ef3b..7700ba24619e 100644
--- a/x11-themes/e17-theme-carbon/Makefile
+++ b/x11-themes/e17-theme-carbon/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	e17-theme-
 DISTNAME=	carbon_themes_pack
 EXTRACT_SUFX=	.zip
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Carbon theme for use with e17 window manager
 
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
@@ -26,6 +26,10 @@ NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	share/enlightenment/data/themes/Carbon-14.edj
 
+IGNORE=		doesn't work with recent e17
+DEPRECATED=	${IGNORE}
+EXPIRATION_DATE=2006-11-01
+
 do-install:
 	${MKDIR} ${PREFIX}/share/enlightenment/data/themes
 	${INSTALL_DATA} ${WRKSRC}/carbon_themes_pack/e17/Carbon-14.edj \
diff --git a/x11-themes/e17-theme-cthulhain/Makefile b/x11-themes/e17-theme-cthulhain/Makefile
index eb15a7e124df..6973cb7863d1 100644
--- a/x11-themes/e17-theme-cthulhain/Makefile
+++ b/x11-themes/e17-theme-cthulhain/Makefile
@@ -6,24 +6,23 @@
 #
 
 PORTNAME=	cthulhain
-PORTVERSION=	0.3.2
+PORTVERSION=	0.3.5
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
-		http://mbsd.msk.ru/dist/
+		http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-theme-
-DISTNAME=	cthulhain-0.3pre2
+DISTNAME=	cthulhain-0.3pre5
 EXTRACT_SUFX=	.edj
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Cthulhain theme for use with e17 window manager
 
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
 
-USE_X_PREFIX=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-PLIST_FILES=	share/enlightenment/data/themes/cthulhain-0.3pre2.edj
+PLIST_FILES=	share/enlightenment/data/themes/${DISTNAME}${EXTRACT_SUFX}
 
 do-extract:
 	${MKDIR} ${WRKDIR}
diff --git a/x11-themes/e17-theme-cthulhain/distinfo b/x11-themes/e17-theme-cthulhain/distinfo
index 33a5c9c5578f..49e722a0b727 100644
--- a/x11-themes/e17-theme-cthulhain/distinfo
+++ b/x11-themes/e17-theme-cthulhain/distinfo
@@ -1,3 +1,3 @@
-MD5 (cthulhain-0.3pre2.edj) = 1ab3c816e9d607118371bcb9d30e9433
-SHA256 (cthulhain-0.3pre2.edj) = e70e4477bc778ed589a89fc9d523ce89f03889eab31b2d13911e9ff020356b25
-SIZE (cthulhain-0.3pre2.edj) = 2061793
+MD5 (cthulhain-0.3pre5.edj) = c5def2aca3fa2e2ac100b727bcf8230b
+SHA256 (cthulhain-0.3pre5.edj) = fc9731f9df69aabe1a507dfdb6f0d4e1ecd615c184bc422616e97cbae0e394b1
+SIZE (cthulhain-0.3pre5.edj) = 2267583
diff --git a/x11-themes/e17-theme-darkness/Makefile b/x11-themes/e17-theme-darkness/Makefile
index 79c3f528eafc..260ec245900f 100644
--- a/x11-themes/e17-theme-darkness/Makefile
+++ b/x11-themes/e17-theme-darkness/Makefile
@@ -6,21 +6,20 @@
 #
 
 PORTNAME=	darkness
-PORTVERSION=	0.99.032.3
+PORTVERSION=	0.99.032.4
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
 		http://www5.get-e.org/Themes/E17/_files/ \
-		http://mbsd.msk.ru/dist/
+		http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-theme-
 DISTNAME=	${PORTNAME}_${PORTVERSION:S,.,_,g}
 EXTRACT_SUFX=	.edj
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Darkness theme for use with e17 window manager
 
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
 
-USE_X_PREFIX=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/x11-themes/e17-theme-darkness/distinfo b/x11-themes/e17-theme-darkness/distinfo
index 74847322e4c8..5cb38c0253fb 100644
--- a/x11-themes/e17-theme-darkness/distinfo
+++ b/x11-themes/e17-theme-darkness/distinfo
@@ -1,3 +1,3 @@
-MD5 (darkness_0_99_032_3.edj) = b620aba8ca7380d3bd008a7fb92aaaa8
-SHA256 (darkness_0_99_032_3.edj) = 9ba3382d286b638e9e2eed3feb43e4ee6b8d03a874c795b37f90d89e249a663e
-SIZE (darkness_0_99_032_3.edj) = 4347509
+MD5 (darkness_0_99_032_4.edj) = d194ce6caa4e5518ecf3c804d040eed9
+SHA256 (darkness_0_99_032_4.edj) = 5e7725356f3f3fdb1ec14758f0d050b53fcdddb85d9dd7cd0e64c4338ab1b1ea
+SIZE (darkness_0_99_032_4.edj) = 4410272
diff --git a/x11-themes/e17-theme-detour/Makefile b/x11-themes/e17-theme-detour/Makefile
index c65643b56530..c11ffa540ebd 100644
--- a/x11-themes/e17-theme-detour/Makefile
+++ b/x11-themes/e17-theme-detour/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	e17-theme-
 DISTNAME=	detour-pre4.2
 EXTRACT_SUFX=	.edj
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Detour theme for use with e17 window manager
 
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
@@ -25,6 +25,10 @@ NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	share/enlightenment/data/themes/detour-pre4.2.edj
 
+IGNORE=		doesn't work with recent e17
+DEPRECATED=	${IGNORE}
+EXPIRATION_DATE=2006-11-01
+
 do-extract:
 	${MKDIR} ${WRKDIR}
 	${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}
diff --git a/x11-themes/e17-theme-gant/Makefile b/x11-themes/e17-theme-gant/Makefile
index 02f4ac1f1b65..effd76ace2c5 100644
--- a/x11-themes/e17-theme-gant/Makefile
+++ b/x11-themes/e17-theme-gant/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	e17-theme-
 DISTNAME=	gant
 EXTRACT_SUFX=	.edj
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	GANT theme for use with e17 window manager
 
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
@@ -25,6 +25,10 @@ NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	share/enlightenment/data/themes/gant.edj
 
+IGNORE=		doesn't work with recent e17
+DEPRECATED=	${IGNORE}
+EXPIRATION_DATE=2006-11-01
+
 do-extract:
 	${MKDIR} ${WRKDIR}
 	${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}
diff --git a/x11-themes/e17-theme-grey/Makefile b/x11-themes/e17-theme-grey/Makefile
index 87f118461e03..68df9d0dea04 100644
--- a/x11-themes/e17-theme-grey/Makefile
+++ b/x11-themes/e17-theme-grey/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	e17-theme-
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.edj
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Modified default E17 theme using grey-ish colors
 
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
@@ -25,6 +25,10 @@ NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	share/enlightenment/data/themes/grey.edj
 
+IGNORE=		doesn't work with recent e17
+DEPRECATED=	${IGNORE}
+EXPIRATION_DATE=2006-11-01
+
 do-extract:
 	${MKDIR} ${WRKDIR}
 	${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}
diff --git a/x11-themes/e17-theme-japan2007/Makefile b/x11-themes/e17-theme-japan2007/Makefile
index da42b8709164..cb30fd6ed2d5 100644
--- a/x11-themes/e17-theme-japan2007/Makefile
+++ b/x11-themes/e17-theme-japan2007/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	e17-theme-
 DISTNAME=	japan2007
 EXTRACT_SUFX=	.edj
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Japan2007 theme for use with e17 window manager
 
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
@@ -25,6 +25,10 @@ NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	share/enlightenment/data/themes/japan2007.edj
 
+IGNORE=		doesn't work with recent e17
+DEPRECATED=	${IGNORE}
+EXPIRATION_DATE=2006-11-01
+
 do-extract:
 	${MKDIR} ${WRKDIR}
 	${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}
diff --git a/x11-themes/e17-theme-kor/Makefile b/x11-themes/e17-theme-kor/Makefile
new file mode 100644
index 000000000000..c5e634262b91
--- /dev/null
+++ b/x11-themes/e17-theme-kor/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for:	e17-theme-kor
+# Date created:		22 August 2006
+# Whom:			Stanislav Sedov <ssedov@mbsd.msk.ru>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	kor
+PORTVERSION=	0.0.3.1
+CATEGORIES=	x11-themes
+MASTER_SITES=	http://www0.get-e.org/Themes/E17/_files/ \
+		http://www5.get-e.org/Themes/E17/_files/ \
+		http://sunner.elcomnet.ru/~stas/
+PKGNAMEPREFIX=	e17-theme-
+DISTNAME=	${PORTNAME}
+EXTRACT_SUFX=	.edj
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	A fresh sunny theme for use with e17 window manager
+
+RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
+
+NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
+
+PLIST_FILES=	share/enlightenment/data/themes/${DISTNAME}${EXTRACT_SUFX}
+
+do-extract:
+	${MKDIR} ${WRKDIR}
+	${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}
+
+do-install:
+	${MKDIR} ${PREFIX}/share/enlightenment/data/themes
+	${INSTALL_DATA} ${WRKSRC}/${DISTFILES} \
+		${PREFIX}/share/enlightenment/data/themes
+
+.include <bsd.port.mk>
diff --git a/x11-themes/e17-theme-kor/distinfo b/x11-themes/e17-theme-kor/distinfo
new file mode 100644
index 000000000000..d436bfae5efb
--- /dev/null
+++ b/x11-themes/e17-theme-kor/distinfo
@@ -0,0 +1,3 @@
+MD5 (kor.edj) = eab5b312d5c12b66b841a7ba217c609e
+SHA256 (kor.edj) = 68314127f17a6e394a3a478e1688b075f5f76c0bd86739ee1357d33b6974ab19
+SIZE (kor.edj) = 2731613
diff --git a/x11-themes/e17-theme-kor/pkg-descr b/x11-themes/e17-theme-kor/pkg-descr
new file mode 100644
index 000000000000..b5842963c1c4
--- /dev/null
+++ b/x11-themes/e17-theme-kor/pkg-descr
@@ -0,0 +1,4 @@
+A fresh sunny holiday theme for e17 window manager.
+
+Author: Gregory 'kalidor' Charbonneau <kalidoor@gmail.com>
+WWW: http://www.get-e.org/Themes/E17/
diff --git a/x11-themes/e17-theme-mclaren/Makefile b/x11-themes/e17-theme-mclaren/Makefile
index 45838ca156c2..451bce65ce5a 100644
--- a/x11-themes/e17-theme-mclaren/Makefile
+++ b/x11-themes/e17-theme-mclaren/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	e17-theme-
 DISTNAME=	McLaren-0.1.0
 EXTRACT_SUFX=	.edj
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	McLaren theme for use with e17 window manager
 
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
@@ -25,6 +25,10 @@ NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	share/enlightenment/data/themes/McLaren-0.1.0.edj
 
+IGNORE=		doesn't work with recent e17
+DEPRECATED=	${IGNORE}
+EXPIRATION_DATE=2006-11-01
+
 do-extract:
 	${MKDIR} ${WRKDIR}
 	${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}
diff --git a/x11-themes/e17-theme-milky/Makefile b/x11-themes/e17-theme-milky/Makefile
index e446c7962cf5..121628607aa9 100644
--- a/x11-themes/e17-theme-milky/Makefile
+++ b/x11-themes/e17-theme-milky/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	e17-theme-
 DISTNAME=	Milky
 EXTRACT_SUFX=	.edj
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Milky's theme for use with e17 window manager
 
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
@@ -25,6 +25,10 @@ NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	share/enlightenment/data/themes/Milky.edj
 
+IGNORE=		doesn't work with recent e17
+DEPRECATED=	${IGNORE} 
+EXPIRATION_DATE=2006-11-01
+
 do-extract:
 	${MKDIR} ${WRKDIR}
 	${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}
diff --git a/x11-themes/e17-theme-neptun/Makefile b/x11-themes/e17-theme-neptun/Makefile
index 47cb772205cb..0ad0fda40a70 100644
--- a/x11-themes/e17-theme-neptun/Makefile
+++ b/x11-themes/e17-theme-neptun/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	e17-theme-
 DISTNAME=	neptune-${PORTVERSION}
 EXTRACT_SUFX=	.edj
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Neptun theme for use with e17 window manager
 
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
@@ -25,6 +25,10 @@ NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	share/enlightenment/data/themes/neptune-0.5.edj
 
+IGNORE=		doesn't work with recent e17
+DEPRECATED=	${IGNORE}
+EXPIRATION_DATE=2006-11-01
+
 do-extract:
 	${MKDIR} ${WRKDIR}
 	${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}
diff --git a/x11-themes/e17-theme-simply_white/Makefile b/x11-themes/e17-theme-simply_white/Makefile
index 2805cbdf862e..34a81ade938c 100644
--- a/x11-themes/e17-theme-simply_white/Makefile
+++ b/x11-themes/e17-theme-simply_white/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	e17-theme-
 DISTNAME=	Simply-white-${PORTVERSION}
 EXTRACT_SUFX=	.edj
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Simply White theme for use with e17 window manager
 
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
@@ -25,6 +25,10 @@ NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	share/enlightenment/data/themes/Simply-white-0.3.edj
 
+IGNORE=		doesn't work with recent e17
+DEPRECATED=	${IGNORE}
+EXPIRATION_DATE=2006-11-01
+
 do-extract:
 	${MKDIR} ${WRKDIR}
 	${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}
diff --git a/x11-themes/e17-theme-winter/Makefile b/x11-themes/e17-theme-winter/Makefile
index c628646b270c..7c9a138793d4 100644
--- a/x11-themes/e17-theme-winter/Makefile
+++ b/x11-themes/e17-theme-winter/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	e17-theme-
 DISTNAME=	winter-e17
 EXTRACT_SUFX=	.edj
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Winter theme for use with e17 window manager
 
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
@@ -25,6 +25,10 @@ NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	share/enlightenment/data/themes/winter-e17.edj
 
+IGNORE=		doesn't work with recent e17
+DEPRECATED=	${IGNORE}
+EXPIRATION_DATE=2006-11-01
+
 do-extract:
 	${MKDIR} ${WRKDIR}
 	${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}
diff --git a/x11-toolkits/enhance/Makefile b/x11-toolkits/enhance/Makefile
new file mode 100644
index 000000000000..bd71a7c79795
--- /dev/null
+++ b/x11-toolkits/enhance/Makefile
@@ -0,0 +1,27 @@
+# New ports collection makefile for:	enhance
+# Date created:		2006-08-14
+# Whom:			Stanislav Sedov <ssedov@mbsd.msk.ru>
+#
+# $MBSDlabs$
+# $FreeBSD$
+#
+
+PORTNAME=	enhance
+PORTVERSION=	20060926
+CATEGORIES=	x11-toolkits
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	A library for rapid application development with ETK/Glade
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_X_PREFIX=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_LDCONFIG=	yes
+USE_EFL=	ecore etk exml
+GNU_CONFIGURE=	yes
+
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/enhance/distinfo b/x11-toolkits/enhance/distinfo
new file mode 100644
index 000000000000..e3e028685952
--- /dev/null
+++ b/x11-toolkits/enhance/distinfo
@@ -0,0 +1,3 @@
+MD5 (enhance-20060926.tar.bz2) = de0c203141359e0e98a9378f3696b779
+SHA256 (enhance-20060926.tar.bz2) = 2c2ddc21e3d4c991e0695db896999c1e5257a5b55f60daff2ae78e2f519d8dc4
+SIZE (enhance-20060926.tar.bz2) = 246930
diff --git a/x11-toolkits/enhance/pkg-descr b/x11-toolkits/enhance/pkg-descr
new file mode 100644
index 000000000000..457ff0b83658
--- /dev/null
+++ b/x11-toolkits/enhance/pkg-descr
@@ -0,0 +1,15 @@
+Enhance is a library that takes advantage of Glade's .glade XML files, EXML,
+and Etk to easy application GUI development and cut down on its time.
+
+After using Glade to design a GUI, you can save generate the .glade XML file
+that describes the interface design and use it in Enhance to generate an Etk
+equivalent. Enhance works at runtime, ie, it does not generate C code. It
+will parse the XML at application launch and will do the appropriate work to
+create the GUI and the required callbacks for you. There are several examples
+in the examples directory for you to take a look at.
+
+Please note that Etk does not support all of the GTK+ widgets. As widgets are
+added to Etk, Enhance will be updated to support those new widgets.
+
+Author:	Hisham 'CodeWarrior' Mardam Bey <hisham.mardambey@gmail.com>
+WWW:	http://www.enlightenment.org/
diff --git a/x11-toolkits/enhance/pkg-plist b/x11-toolkits/enhance/pkg-plist
new file mode 100644
index 000000000000..d9cdc08fc335
--- /dev/null
+++ b/x11-toolkits/enhance/pkg-plist
@@ -0,0 +1,6 @@
+bin/enhance-config
+include/Enhance.h
+lib/libenhance.a
+lib/libenhance.la
+lib/libenhance.so
+lib/libenhance.so.0
diff --git a/x11-toolkits/etk/Makefile b/x11-toolkits/etk/Makefile
new file mode 100644
index 000000000000..29ed7a285b26
--- /dev/null
+++ b/x11-toolkits/etk/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	etk
+# Date created:		2006-08-14
+# Whom:			Stanislav Sedov <ssedov@mbsd.msk.ru>
+#
+# $MBSDlabs$
+# $FreeBSD$
+#
+
+PORTNAME=	etk
+PORTVERSION=	20060926
+CATEGORIES=	x11-toolkits
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	A comprehensive toolkit based on the EFL
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_EFL=	evas ecore edje
+USE_LDCONFIG=	yes
+# NLS is mandatory
+USE_GETTEXT=	yes
+LDFLAGS=	"-lintl"
+
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/etk/distinfo b/x11-toolkits/etk/distinfo
new file mode 100644
index 000000000000..d05dab5532ed
--- /dev/null
+++ b/x11-toolkits/etk/distinfo
@@ -0,0 +1,3 @@
+MD5 (etk-20060926.tar.bz2) = a544d60e21714cfbd5267c17f7f8fe77
+SHA256 (etk-20060926.tar.bz2) = d16fbe1632dc9b20ee2102adc57945bef2df795a6c149cb777f9fa8d44bf5e9f
+SIZE (etk-20060926.tar.bz2) = 2171623
diff --git a/x11-toolkits/etk/files/patch-configure b/x11-toolkits/etk/files/patch-configure
new file mode 100644
index 000000000000..3de7e5ab2bc2
--- /dev/null
+++ b/x11-toolkits/etk/files/patch-configure
@@ -0,0 +1,30 @@
+--- 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-descr b/x11-toolkits/etk/pkg-descr
new file mode 100644
index 000000000000..3c9fef388c9b
--- /dev/null
+++ b/x11-toolkits/etk/pkg-descr
@@ -0,0 +1,4 @@
+EFL is a comprehensive toolkit based on the EFL.
+
+Author:	Simon Treny (MoOm) <simon.treny@laposte.net>
+WWW:	http://www.enlightenment.org/
diff --git a/x11-toolkits/etk/pkg-plist b/x11-toolkits/etk/pkg-plist
new file mode 100644
index 000000000000..721f7e4ab74c
--- /dev/null
+++ b/x11-toolkits/etk/pkg-plist
@@ -0,0 +1,118 @@
+bin/etk-config
+bin/etk_prefs
+bin/etk_test
+include/Etk_Engine_Ecore_Evas.h
+include/Etk_Engine_Ecore_Evas_X11.h
+include/etk/Etk.h
+include/etk/etk_alignment.h
+include/etk/etk_argument.h
+include/etk/etk_bin.h
+include/etk/etk_box.h
+include/etk/etk_button.h
+include/etk/etk_cache.h
+include/etk/etk_canvas.h
+include/etk/etk_check_button.h
+include/etk/etk_clipboard.h
+include/etk/etk_colorpicker.h
+include/etk/etk_combobox.h
+include/etk/etk_config.h
+include/etk/etk_container.h
+include/etk/etk_dialog.h
+include/etk/etk_dnd.h
+include/etk/etk_drag.h
+include/etk/etk_editable.h
+include/etk/etk_embed.h
+include/etk/etk_engine.h
+include/etk/etk_entry.h
+include/etk/etk_event.h
+include/etk/etk_filechooser_widget.h
+include/etk/etk_frame.h
+include/etk/etk_iconbox.h
+include/etk/etk_image.h
+include/etk/etk_label.h
+include/etk/etk_main.h
+include/etk/etk_marshallers.h
+include/etk/etk_menu.h
+include/etk/etk_menu_bar.h
+include/etk/etk_menu_item.h
+include/etk/etk_menu_shell.h
+include/etk/etk_message_dialog.h
+include/etk/etk_notebook.h
+include/etk/etk_object.h
+include/etk/etk_paned.h
+include/etk/etk_popup_window.h
+include/etk/etk_progress_bar.h
+include/etk/etk_property.h
+include/etk/etk_radio_button.h
+include/etk/etk_range.h
+include/etk/etk_scrollbar.h
+include/etk/etk_scrolled_view.h
+include/etk/etk_selection.h
+include/etk/etk_separator.h
+include/etk/etk_signal.h
+include/etk/etk_signal_callback.h
+include/etk/etk_slider.h
+include/etk/etk_statusbar.h
+include/etk/etk_stock.h
+include/etk/etk_string.h
+include/etk/etk_table.h
+include/etk/etk_text_view.h
+include/etk/etk_textblock.h
+include/etk/etk_theme.h
+include/etk/etk_toggle_button.h
+include/etk/etk_tool_button.h
+include/etk/etk_toolbar.h
+include/etk/etk_tooltips.h
+include/etk/etk_toplevel_widget.h
+include/etk/etk_tree.h
+include/etk/etk_tree_model.h
+include/etk/etk_type.h
+include/etk/etk_types.h
+include/etk/etk_utils.h
+include/etk/etk_viewport.h
+include/etk/etk_widget.h
+include/etk/etk_window.h
+lib/etk/engines/ecore_evas.a
+lib/etk/engines/ecore_evas.la
+lib/etk/engines/ecore_evas.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_x11.a
+lib/etk/engines/ecore_evas_x11.la
+lib/etk/engines/ecore_evas_x11.so
+lib/libetk.a
+lib/libetk.la
+lib/libetk.so
+lib/libetk.so.1
+libdata/pkgconfig/etk.pc
+%%DATADIR%%/fonts/Vera.COPYING
+%%DATADIR%%/fonts/Vera.ttf
+%%DATADIR%%/fonts/VeraBI.ttf
+%%DATADIR%%/fonts/VeraBd.ttf
+%%DATADIR%%/fonts/VeraIt.ttf
+%%DATADIR%%/fonts/fonts.alias
+%%DATADIR%%/fonts/fonts.dir
+%%DATADIR%%/icons/default.edj
+%%DATADIR%%/images/1star.png
+%%DATADIR%%/images/2stars.png
+%%DATADIR%%/images/3stars.png
+%%DATADIR%%/images/backdrop.png
+%%DATADIR%%/images/e_icon.png
+%%DATADIR%%/images/e_logo.png
+%%DATADIR%%/images/panel.png
+%%DATADIR%%/images/panel_shadow.png
+%%DATADIR%%/images/panel_top.png
+%%DATADIR%%/images/test.png
+%%DATADIR%%/pointers/default_pointer.png
+%%DATADIR%%/themes/default.edj
+share/locale/fr/LC_MESSAGES/etk.mo
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/pointers
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%
+@dirrm lib/etk/engines
+@dirrm lib/etk
+@dirrm include/etk
diff --git a/x11-toolkits/etox/Makefile b/x11-toolkits/etox/Makefile
index 12c99e4e8150..c47dd7c2794a 100644
--- a/x11-toolkits/etox/Makefile
+++ b/x11-toolkits/etox/Makefile
@@ -26,4 +26,8 @@ INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
+IGNORE=		doesn't work with recent e17 and obsoleted
+DEPRECATED=	${IGNORE} 
+EXPIRATION_DATE=2006-11-01
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/ewl/Makefile b/x11-toolkits/ewl/Makefile
index 737e4dafb158..89ba1f660298 100644
--- a/x11-toolkits/ewl/Makefile
+++ b/x11-toolkits/ewl/Makefile
@@ -6,32 +6,54 @@
 #
 
 PORTNAME=	ewl
-PORTVERSION=	0.0.4.007
+PORTVERSION=	20060926
 PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://enlightenment.freedesktop.org/files/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	vanilla@FreeBSD.org
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Enlightened Widget Library
 
-LIB_DEPENDS=	embryo.9:${PORTSDIR}/lang/embryo \
-		edb.1:${PORTSDIR}/databases/edb \
-		evas.1:${PORTSDIR}/graphics/evas \
-		edje.5:${PORTSDIR}/graphics/edje \
-		ecore.1:${PORTSDIR}/x11/ecore
-
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
-INSTALLS_SHLIB=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+USE_EFL=	embryo edb evas edje ecore
+WANT_EFL=	yes
+USE_LDCONFIG=	yes
+
+OPTIONS=	EPSILON	"Enable Epsilon Support for Ewl_Image" on \
+		EMOTION "Enable Emotion Support for Ewl_Media" on
 
 .include <bsd.port.pre.mk>
+BEFOREPORTMK=	yes
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.undef BEFOREPORTMK
 
 .if ${ARCH} == ia64
 BROKEN=		does not compile on ${ARCH}
 .endif
 
+.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=""
+.else
+PLIST_SUB+=	EMOTION="@comment "
+.endif
+
+.if exists(${LOCALBASE}/include/Evas_Engine_GL_X11.h)
+PLIST_SUB+=	EVAS_GL=""
+.else
+PLIST_SUB+=	EVAS_GL="@comment "
+.endif
+
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/ewl/distinfo b/x11-toolkits/ewl/distinfo
index 3dbb81d5a3f9..ae973e40f546 100644
--- a/x11-toolkits/ewl/distinfo
+++ b/x11-toolkits/ewl/distinfo
@@ -1,3 +1,3 @@
-MD5 (ewl-0.0.4.007.tar.gz) = 29bc8aec80b53480c2ea53aea1796e15
-SHA256 (ewl-0.0.4.007.tar.gz) = 0a0dba00517013082b8e094b4b7753162cf5fb71a170eb54cbc2eaa35717d5f6
-SIZE (ewl-0.0.4.007.tar.gz) = 2369311
+MD5 (ewl-20060926.tar.bz2) = ef842f223c93a90ca314052214fffa32
+SHA256 (ewl-20060926.tar.bz2) = 386b010159e16dfee0517ba77e5910414d7cee37ce6016bcffd9f17d2e9ac82e
+SIZE (ewl-20060926.tar.bz2) = 2790917
diff --git a/x11-toolkits/ewl/pkg-plist b/x11-toolkits/ewl/pkg-plist
index 80d9b5fd1174..3c374bfb91a2 100644
--- a/x11-toolkits/ewl/pkg-plist
+++ b/x11-toolkits/ewl/pkg-plist
@@ -3,16 +3,17 @@ bin/ewl_embed_test
 bin/ewl_simple_test
 bin/ewl_test
 include/ewl/Ewl.h
+include/ewl/Ewl_Test.h
 include/ewl/ewl_attach.h
 include/ewl/ewl_border.h
 include/ewl/ewl_box.h
 include/ewl/ewl_button.h
 include/ewl/ewl_calendar.h
 include/ewl/ewl_callback.h
-include/ewl/ewl_colordialog.h
 include/ewl/ewl_cell.h
 include/ewl/ewl_check.h
 include/ewl/ewl_checkbutton.h
+include/ewl/ewl_colordialog.h
 include/ewl/ewl_colorpicker.h
 include/ewl/ewl_combo.h
 include/ewl/ewl_config.h
@@ -22,19 +23,28 @@ include/ewl/ewl_debug.h
 include/ewl/ewl_dialog.h
 include/ewl/ewl_dnd.h
 include/ewl/ewl_embed.h
+include/ewl/ewl_engines.h
 include/ewl/ewl_entry.h
 include/ewl/ewl_enums.h
 include/ewl/ewl_events.h
 include/ewl/ewl_filedialog.h
-include/ewl/ewl_fileselector.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_filepicker.h
 include/ewl/ewl_floater.h
 include/ewl/ewl_freebox.h
 include/ewl/ewl_grid.h
+include/ewl/ewl_histogram.h
 include/ewl/ewl_icon.h
+include/ewl/ewl_icon_theme.h
 include/ewl/ewl_iconbox.h
 include/ewl/ewl_image.h
 include/ewl/ewl_imenu.h
+include/ewl/ewl_io_manager.h
 include/ewl/ewl_label.h
+include/ewl/ewl_list.h
 include/ewl/ewl_macros.h
 include/ewl/ewl_media.h
 include/ewl/ewl_menu.h
@@ -43,6 +53,7 @@ include/ewl/ewl_menu_item.h
 include/ewl/ewl_menubar.h
 include/ewl/ewl_misc.h
 include/ewl/ewl_model.h
+include/ewl/ewl_mvc.h
 include/ewl/ewl_notebook.h
 include/ewl/ewl_object.h
 include/ewl/ewl_overlay.h
@@ -50,11 +61,13 @@ include/ewl/ewl_paned.h
 include/ewl/ewl_password.h
 include/ewl/ewl_progressbar.h
 include/ewl/ewl_radiobutton.h
+include/ewl/ewl_range.h
 include/ewl/ewl_row.h
 include/ewl/ewl_scrollbar.h
 include/ewl/ewl_scrollpane.h
 include/ewl/ewl_seeker.h
 include/ewl/ewl_separator.h
+include/ewl/ewl_shadow.h
 include/ewl/ewl_spacer.h
 include/ewl/ewl_spectrum.h
 include/ewl/ewl_spinner.h
@@ -64,9 +77,33 @@ include/ewl/ewl_text.h
 include/ewl/ewl_theme.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_view.h
 include/ewl/ewl_widget.h
 include/ewl/ewl_window.h
+lib/ewl/engines/evas.a
+lib/ewl/engines/evas.la
+lib/ewl/engines/evas.so
+%%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_xrender_x11.a
+lib/ewl/engines/evas_xrender_x11.la
+lib/ewl/engines/evas_xrender_x11.so
+lib/ewl/engines/x11.a
+lib/ewl/engines/x11.la
+lib/ewl/engines/x11.so
+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_plugin.a
+lib/ewl/plugins/ewl_io_manager_text_plugin.la
+lib/ewl/plugins/ewl_io_manager_text_plugin.so
 lib/ewl/tests/ewl_border.a
 lib/ewl/tests/ewl_border.la
 lib/ewl/tests/ewl_border.so
@@ -88,39 +125,66 @@ 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_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_fileselector.a
-lib/ewl/tests/ewl_fileselector.la
-lib/ewl/tests/ewl_fileselector.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_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_iconbox.a
 lib/ewl/tests/ewl_iconbox.la
 lib/ewl/tests/ewl_iconbox.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_imenu.a
 lib/ewl/tests/ewl_imenu.la
 lib/ewl/tests/ewl_imenu.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
@@ -181,6 +245,15 @@ 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/ewl/tests/fullscreen.a
+lib/ewl/tests/fullscreen.la
+lib/ewl/tests/fullscreen.so
+lib/ewl/tests/modal.a
+lib/ewl/tests/modal.la
+lib/ewl/tests/modal.so
+lib/ewl/tests/puzzle.a
+lib/ewl/tests/puzzle.la
+lib/ewl/tests/puzzle.so
 lib/libewl.a
 lib/libewl.la
 lib/libewl.so
@@ -195,17 +268,26 @@ share/aclocal/ewl.m4
 %%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_entry.c
 %%DATADIR%%/examples/ewl_filedialog.c
-%%DATADIR%%/examples/ewl_fileselector.c
+%%DATADIR%%/examples/ewl_filepicker.c
 %%DATADIR%%/examples/ewl_floater.c
 %%DATADIR%%/examples/ewl_freebox.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_iconbox.c
 %%DATADIR%%/examples/ewl_image.c
+%%DATADIR%%/examples/ewl_image_thumbnail.c
 %%DATADIR%%/examples/ewl_imenu.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
@@ -219,6 +301,7 @@ share/aclocal/ewl.m4
 %%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
@@ -226,7 +309,10 @@ share/aclocal/ewl.m4
 %%DATADIR%%/examples/ewl_tree.c
 %%DATADIR%%/examples/ewl_tree2.c
 %%DATADIR%%/examples/ewl_widget.c
+%%DATADIR%%/examples/fullscreen.c
 %%DATADIR%%/examples/main.c
+%%DATADIR%%/examples/modal.c
+%%DATADIR%%/examples/puzzle.c
 %%DATADIR%%/images/Draw.png
 %%DATADIR%%/images/End.png
 %%DATADIR%%/images/NewBCard.png
@@ -234,6 +320,21 @@ share/aclocal/ewl.m4
 %%DATADIR%%/images/Package.png
 %%DATADIR%%/images/World.png
 %%DATADIR%%/images/banner-top.png
+%%DATADIR%%/images/e-logo-0.png
+%%DATADIR%%/images/e-logo-1.png
+%%DATADIR%%/images/e-logo-10.png
+%%DATADIR%%/images/e-logo-11.png
+%%DATADIR%%/images/e-logo-12.png
+%%DATADIR%%/images/e-logo-13.png
+%%DATADIR%%/images/e-logo-14.png
+%%DATADIR%%/images/e-logo-2.png
+%%DATADIR%%/images/e-logo-3.png
+%%DATADIR%%/images/e-logo-4.png
+%%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-9.png
 %%DATADIR%%/images/e-logo.png
 %%DATADIR%%/images/elicit.png
 %%DATADIR%%/images/elicit1.png
@@ -255,10 +356,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%%/themes
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%
 @dirrm lib/ewl/tests
+@dirrm lib/ewl/plugins
+@dirrm lib/ewl/engines
 @dirrm lib/ewl
 @dirrm include/ewl
diff --git a/x11-wm/e17-module-calendar/Makefile b/x11-wm/e17-module-calendar/Makefile
index a0c387313007..96735db318aa 100644
--- a/x11-wm/e17-module-calendar/Makefile
+++ b/x11-wm/e17-module-calendar/Makefile
@@ -6,27 +6,28 @@
 #
 
 PORTNAME=	calendar
-PORTVERSION=	23062006
-PORTREVISION=	2
+PORTVERSION=	20060926
+PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Nice calendar module for e17
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	ecore evas edje eet
+USE_EFL_ESMART=	trans_x11
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+IGNORE=		doesn't compile with recent e17
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +37,10 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e s,`${PRINTF} '\r'`,,g ${WRKSRC}/src/*.[ch]
+
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-wm/e17-module-calendar/distinfo b/x11-wm/e17-module-calendar/distinfo
index 3e641ac6c035..492ca7b8e1dc 100644
--- a/x11-wm/e17-module-calendar/distinfo
+++ b/x11-wm/e17-module-calendar/distinfo
@@ -1,3 +1,3 @@
-MD5 (calendar-23062006.tar.bz2) = 161a388d25c7abd9a73142aad0792f4b
-SHA256 (calendar-23062006.tar.bz2) = 3c96faa84c4776c9a1d970962ade1b36113d2226ed657ee0290fc98328f90e4d
-SIZE (calendar-23062006.tar.bz2) = 554819
+MD5 (calendar-20060926.tar.bz2) = a7c47f3efc02a2688ce4b8cc3fe2a659
+SHA256 (calendar-20060926.tar.bz2) = cdfaa4277375994287149310cf3b2a4be224cd38304ff3909f99006c55ec9331
+SIZE (calendar-20060926.tar.bz2) = 552639
diff --git a/x11-wm/e17-module-calendar/files/patch-src_e_mod_main.c b/x11-wm/e17-module-calendar/files/patch-src_e_mod_main.c
deleted file mode 100644
index 1425a4ef7ec1..000000000000
--- a/x11-wm/e17-module-calendar/files/patch-src_e_mod_main.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/e_mod_main.c.orig	Thu Jul  6 23:11:37 2006
-+++ src/e_mod_main.c	Thu Jul  6 23:13:48 2006
-@@ -47,7 +47,7 @@
-       
-      {
-         
-e_error_dialog_show 
--           ("Module API Error", 
-"Error initializing Module: calendar\n" 
-+           (module, "Module API Error", 
-"Error initializing Module: calendar\n" 
-             "It requires a minimum module API version of: %i.\n" 
-             "The module API advertized by Enlightenment is: %i.\n" 
-             "Aborting module.", 
-E_MODULE_API_VERSION, module->api->version);
-@@ -102,7 +102,7 @@
- EAPI int 
- e_modapi_about(E_Module *module) 
- {
--   
-e_error_dialog_show(D_("Enlightenment calendar Module"), 
-D_("A simple module to give E17 a desktop calendar "));
-+   
-e_error_dialog_show(module, D_("Enlightenment calendar Module"), 
-D_("A simple module to give E17 a desktop calendar "));
-    
-return 1;
- 
-}
- 
diff --git a/x11-wm/e17-module-cpu/Makefile b/x11-wm/e17-module-cpu/Makefile
index fa8c0da18c55..015ecef1a6cb 100644
--- a/x11-wm/e17-module-cpu/Makefile
+++ b/x11-wm/e17-module-cpu/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	cpu
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module which allows users to monitor cpu load
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +33,6 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-wm/e17-module-cpu/distinfo b/x11-wm/e17-module-cpu/distinfo
index 5b0ebc87a26d..7a0ddda8eeeb 100644
--- a/x11-wm/e17-module-cpu/distinfo
+++ b/x11-wm/e17-module-cpu/distinfo
@@ -1,3 +1,3 @@
-MD5 (cpu-20060707.tar.bz2) = c4f763fc3cf8bcac6da1fb90a54c60ac
-SHA256 (cpu-20060707.tar.bz2) = 8b81a3acae9a48613ef4d10ef0f037687e084f572f4f1c7e023739fd7d4acac7
-SIZE (cpu-20060707.tar.bz2) = 298803
+MD5 (cpu-20060926.tar.bz2) = 1cd0a1463cb4e30bcc1bcb65416ed54b
+SHA256 (cpu-20060926.tar.bz2) = a66b516bfb10e0b9094bbc4bc6fdc3c34946cf0873142e7eb151a952e704ab0d
+SIZE (cpu-20060926.tar.bz2) = 261091
diff --git a/x11-wm/e17-module-cpu/files/patch-e_mod_main.c b/x11-wm/e17-module-cpu/files/patch-e_mod_main.c
deleted file mode 100644
index 79b3a8ba3412..000000000000
--- a/x11-wm/e17-module-cpu/files/patch-e_mod_main.c
+++ /dev/null
@@ -1,93 +0,0 @@
---- e_mod_main.c.orig	Sun Jul  9 14:15:46 2006
-+++ e_mod_main.c	Sun Jul  9 15:58:09 2006
-@@ -3,6 +3,12 @@
- #include "e_mod_config.h"
- #include "config.h"
- 
-+#if defined(__FreeBSD__)
-+# include <sys/types.h>
-+# include <sys/sysctl.h>
-+# include <sys/resource.h>
-+#endif
-+
- static Cpu *_cpu_init(E_Module *m);
- static void _cpu_shutdown(Cpu *n);
- static void _cpu_config_menu_new(Cpu *n);
-@@ -460,31 +466,66 @@
-    FILE *f;
-    int cpu = -1;
- 
-+#if defined(__FreeBSD__)
-+   cpu = 1; /* We can't retrive per-cpu statistics, so we'll assume UP arch*/
-+#else
-    if (!(f = fopen("/proc/stat", "r")))
-       return -1;
- 
-    while (fscanf(f, "cp%s %*u %*u %*u %*u %*u %*u %*u %*u\n", (char *)&tmp) == 1)
-       cpu++;
--
-    fclose(f);
-+#endif
-+
-    return cpu;
- }
- 
- static void
- _cpu_face_get_load(Cpu_Face *cf)
- {
-+   int cpu_count;
-+   Edje_Message_Float msg;
-+#if defined(__FreeBSD__)
-+   long cp_time[CPUSTATES];
-+   static long old_used, old_tot;
-+   long new_used, new_tot;
-+   size_t len;
-+#else
-    static unsigned long old_u[4], old_n[4], old_s[4], old_i[4], old_wa[4], old_hi[4], old_si[4];
-    unsigned long new_u, new_n, new_s, new_i, new_wa = 0, new_hi = 0, new_si = 0, ticks_past;
-    int tmp_u, tmp_n, tmp_s, tmp_i;
-    char dummy[16];
-    FILE *stat;
--   int cpu_count;
--   Edje_Message_Float msg;
-+#endif
- 
-    cpu_count = _cpu_face_get_cpu_count(cf);
-    if (cpu_count == -1)
-       return;
- 
-+#if defined(__FreeBSD__)
-+   len = sizeof(cp_time);
-+
-+   if (sysctlbyname("kern.cp_time", &cp_time, &len, NULL, 0) < 0) {
-+	warn("sysctl()");
-+	return;
-+   }
-+
-+   new_used = cp_time[CP_USER] + cp_time[CP_NICE] + cp_time[CP_SYS];
-+   new_tot = new_used + cp_time[CP_IDLE];
-+
-+   if (new_tot == old_tot)
-+	msg.val = 0;
-+   else
-+	msg.val = 100 * (float)(new_used - old_used) / (float)(new_tot - old_tot);
-+
-+   cpu_stats[0] = msg.val;
-+   edje_object_message_send(cf->cpu_obj, EDJE_MESSAGE_FLOAT, 0, &msg);
-+
-+   old_tot = new_tot;
-+   old_used = new_used;
-+
-+#else
-+
-    if (!(stat = fopen("/proc/stat", "r")))
-       return;
- 
-@@ -537,6 +578,7 @@
-         i++;
-      }
-    fclose(stat);
-+#endif
- }
- 
- static void
diff --git a/x11-wm/e17-module-cpu/pkg-plist b/x11-wm/e17-module-cpu/pkg-plist
index 33b6656b67a2..42144630fef3 100644
--- a/x11-wm/e17-module-cpu/pkg-plist
+++ b/x11-wm/e17-module-cpu/pkg-plist
@@ -1,15 +1,11 @@
 lib/enlightenment/modules/cpu/cpu.edj
-lib/enlightenment/modules/cpu/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/cpu/module.eap
-lib/enlightenment/modules/cpu/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/cpu/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/cpu/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/cpu/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/cpu/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/cpu/module.desktop
+lib/enlightenment/modules/cpu/module.edj
 lib/enlightenment/modules/cpu/module_icon.png
-%%NLS%%share/locale/bg/LC_MESSAGES/cpu.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/cpu.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/cpu.mo
-%%NLS%%share/locale/it/LC_MESSAGES/cpu.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/cpu.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/cpu.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/cpu.mo
-@dirrm lib/enlightenment/modules/cpu/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/cpu/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/cpu
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-deskshow/Makefile b/x11-wm/e17-module-deskshow/Makefile
index bf966ed69126..3bd1342191c7 100644
--- a/x11-wm/e17-module-deskshow/Makefile
+++ b/x11-wm/e17-module-deskshow/Makefile
@@ -6,26 +6,25 @@
 #
 
 PORTNAME=	deskshow
-PORTVERSION=	20060728
+PORTVERSION=	20060926
 PORTREVISION=	0
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	E17 module that minimizes all windows to show the desktop
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-wm/e17-module-deskshow/distinfo b/x11-wm/e17-module-deskshow/distinfo
index bbc3c00c9a13..7bf5af25b44c 100644
--- a/x11-wm/e17-module-deskshow/distinfo
+++ b/x11-wm/e17-module-deskshow/distinfo
@@ -1,3 +1,3 @@
-MD5 (deskshow-20060728.tar.bz2) = cb2041f4bc2d5a0bdaf03c85f9efe3ea
-SHA256 (deskshow-20060728.tar.bz2) = c56e569e92d462a87350c67f884ebc23f0dcf390e8f7da1ba03b5662bc44e609
-SIZE (deskshow-20060728.tar.bz2) = 572628
+MD5 (deskshow-20060926.tar.bz2) = ca9f52acca54fb00923bc83344b38349
+SHA256 (deskshow-20060926.tar.bz2) = a689ee52663c4180b8d506a83d35b713fe9f328273627d03c6def55635b6230b
+SIZE (deskshow-20060926.tar.bz2) = 279254
diff --git a/x11-wm/e17-module-deskshow/pkg-plist b/x11-wm/e17-module-deskshow/pkg-plist
index 8e21b5eb7c54..a5528559f717 100644
--- a/x11-wm/e17-module-deskshow/pkg-plist
+++ b/x11-wm/e17-module-deskshow/pkg-plist
@@ -1,8 +1,11 @@
 lib/enlightenment/modules/deskshow/deskshow.edj
-lib/enlightenment/modules/deskshow/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/deskshow/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/deskshow/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/deskshow/module.eap
+lib/enlightenment/modules/deskshow/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/deskshow/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/deskshow/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/deskshow/module.desktop
+lib/enlightenment/modules/deskshow/module.edj
 lib/enlightenment/modules/deskshow/module_icon.png
-@dirrm lib/enlightenment/modules/deskshow/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/deskshow/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/deskshow
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-flame/Makefile b/x11-wm/e17-module-flame/Makefile
index 52927d0fd452..f41380ec4e8f 100644
--- a/x11-wm/e17-module-flame/Makefile
+++ b/x11-wm/e17-module-flame/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	flame
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module which draws flames on your desktop
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +33,6 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-wm/e17-module-flame/distinfo b/x11-wm/e17-module-flame/distinfo
index 1a1e925dc9a8..e2b2a353bafc 100644
--- a/x11-wm/e17-module-flame/distinfo
+++ b/x11-wm/e17-module-flame/distinfo
@@ -1,3 +1,3 @@
-MD5 (flame-20060707.tar.bz2) = 7fe367c4ace70b7add9a8448664dcf45
-SHA256 (flame-20060707.tar.bz2) = 0e0825c9a0208eedf4d48831ce10bbf4eed0c8bbd0125124f52240b3484bb413
-SIZE (flame-20060707.tar.bz2) = 244132
+MD5 (flame-20060926.tar.bz2) = e7ebdd2606517342e0a35ebfbb996c62
+SHA256 (flame-20060926.tar.bz2) = 3aa971dcbd72023ad14a491d0a338f337a5d1509f1e47e5c0cff9cbfefff6fe5
+SIZE (flame-20060926.tar.bz2) = 250902
diff --git a/x11-wm/e17-module-flame/pkg-plist b/x11-wm/e17-module-flame/pkg-plist
index 9ed88f7d9756..716fee610674 100644
--- a/x11-wm/e17-module-flame/pkg-plist
+++ b/x11-wm/e17-module-flame/pkg-plist
@@ -1,11 +1,16 @@
-lib/enlightenment/modules/flame/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/flame/module.eap
-lib/enlightenment/modules/flame/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/flame/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/flame/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/flame/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/flame/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/flame/module.desktop
+lib/enlightenment/modules/flame/module.edj
 lib/enlightenment/modules/flame/module_icon.png
 %%NLS%%share/locale/eo/LC_MESSAGES/flame.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/flame.mo
 %%NLS%%share/locale/it/LC_MESSAGES/flame.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/flame.mo
-@dirrm lib/enlightenment/modules/flame/%%MODULE_ARCH%%
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+@dirrm lib/enlightenment/modules/flame/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/flame
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-language/Makefile b/x11-wm/e17-module-language/Makefile
index 593b48b4e9ea..25ddecefa9d3 100644
--- a/x11-wm/e17-module-language/Makefile
+++ b/x11-wm/e17-module-language/Makefile
@@ -6,27 +6,26 @@
 #
 
 PORTNAME=	language
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module to switch XKB input language
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-LIB_DEPENDS=	exml.1:${PORTSDIR}/textproc/exml
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje exml
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-wm/e17-module-language/distinfo b/x11-wm/e17-module-language/distinfo
index bcc0a4c24107..385ea90a9d6f 100644
--- a/x11-wm/e17-module-language/distinfo
+++ b/x11-wm/e17-module-language/distinfo
@@ -1,3 +1,3 @@
-MD5 (language-20060707.tar.bz2) = 23ddc1567ef8c3cded46e69faca53b88
-SHA256 (language-20060707.tar.bz2) = 6a21fa661476c265898e1a952a65b574dfa91353c5d04e84b278a2e89195908f
-SIZE (language-20060707.tar.bz2) = 394068
+MD5 (language-20060926.tar.bz2) = 701d7dddddfa4ed4fcc0a11422cd5fb0
+SHA256 (language-20060926.tar.bz2) = f7ff47aa19a5015046bea49d6ac999bd9b8eba513856242f86614efc2d9d77fb
+SIZE (language-20060926.tar.bz2) = 422313
diff --git a/x11-wm/e17-module-language/pkg-plist b/x11-wm/e17-module-language/pkg-plist
index c2b6e7a54141..b4a26ed34c97 100644
--- a/x11-wm/e17-module-language/pkg-plist
+++ b/x11-wm/e17-module-language/pkg-plist
@@ -1,6 +1,6 @@
-lib/enlightenment/modules/language/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/language/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/language/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/language/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/language/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/language/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/language/images/AFG_flag.png
 lib/enlightenment/modules/language/images/ALB_flag.png
 lib/enlightenment/modules/language/images/AND_flag.png
@@ -72,11 +72,14 @@ lib/enlightenment/modules/language/images/UZB_flag.png
 lib/enlightenment/modules/language/images/VNM_flag.png
 lib/enlightenment/modules/language/images/ZAR_flag.png
 lib/enlightenment/modules/language/images/unknown_flag.png
-lib/enlightenment/modules/language/language.edc
 lib/enlightenment/modules/language/language.edj
-lib/enlightenment/modules/language/module.eap
+lib/enlightenment/modules/language/module.desktop
+lib/enlightenment/modules/language/module.edj
+share/locale/eo/LC_MESSAGES/language.mo
+share/locale/it/LC_MESSAGES/language.mo
+share/locale/sv/LC_MESSAGES/language.mo
 @dirrm lib/enlightenment/modules/language/images
-@dirrm lib/enlightenment/modules/language/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/language/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/language
 @dirrmtry lib/enlightenment/modules
 @dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-mail/Makefile b/x11-wm/e17-module-mail/Makefile
index 0740274cc5e6..d002958813c8 100644
--- a/x11-wm/e17-module-mail/Makefile
+++ b/x11-wm/e17-module-mail/Makefile
@@ -6,26 +6,26 @@
 #
 
 PORTNAME=	mail
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module to check your mailboxes (like xbiff does)
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-wm/e17-module-mail/distinfo b/x11-wm/e17-module-mail/distinfo
index ee79645fe7e4..ef41257f2c56 100644
--- a/x11-wm/e17-module-mail/distinfo
+++ b/x11-wm/e17-module-mail/distinfo
@@ -1,3 +1,3 @@
-MD5 (mail-20060707.tar.bz2) = 5fb424681cf466841f647dba0cec2c5c
-SHA256 (mail-20060707.tar.bz2) = 6c726c376672a30bd43e94eb5ad216b41897d6b27f8ceb0f51eef6a854ad58e6
-SIZE (mail-20060707.tar.bz2) = 269002
+MD5 (mail-20060926.tar.bz2) = d63660b2e38d82a212684420024458bb
+SHA256 (mail-20060926.tar.bz2) = b526a1d4d3cbb5b0e54d22b9cc87b4462d0bda6ba9a06450f7e8a1d95885d898
+SIZE (mail-20060926.tar.bz2) = 309337
diff --git a/x11-wm/e17-module-mail/pkg-plist b/x11-wm/e17-module-mail/pkg-plist
index e9882ccdf3f9..d32b8e0e82c8 100644
--- a/x11-wm/e17-module-mail/pkg-plist
+++ b/x11-wm/e17-module-mail/pkg-plist
@@ -1,9 +1,12 @@
+lib/enlightenment/modules/mail/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/mail/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/mail/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/mail/mail.edj
-lib/enlightenment/modules/mail/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/mail/module.eap
-lib/enlightenment/modules/mail/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/mail/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/mail/module.desktop
+lib/enlightenment/modules/mail/module.edj
 lib/enlightenment/modules/mail/module_icon.png
-lib/enlightenment/modules/mail/newmail.png
-@dirrm lib/enlightenment/modules/mail/%%MODULE_ARCH%%
+share/locale/it/LC_MESSAGES/mail.mo
+@dirrm lib/enlightenment/modules/mail/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/mail
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-mem/Makefile b/x11-wm/e17-module-mem/Makefile
index ae7c42ca79ed..623362f4038e 100644
--- a/x11-wm/e17-module-mem/Makefile
+++ b/x11-wm/e17-module-mem/Makefile
@@ -6,27 +6,25 @@
 #
 
 PORTNAME=	mem
-PORTVERSION=	23062006
-PORTREVISION=	2
+PORTVERSION=	20060926
+PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 memory monitoring module
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +34,6 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-wm/e17-module-mem/distinfo b/x11-wm/e17-module-mem/distinfo
index 9d89499b0331..cf64d06cdfc1 100644
--- a/x11-wm/e17-module-mem/distinfo
+++ b/x11-wm/e17-module-mem/distinfo
@@ -1,3 +1,3 @@
-MD5 (mem-23062006.tar.bz2) = dff9e3cad99d050232dc4d0df0a9c201
-SHA256 (mem-23062006.tar.bz2) = c0466c3d9449fd85c935c99ab38d470bfd0ff62d8e30cb37fd23765bad6978dd
-SIZE (mem-23062006.tar.bz2) = 426819
+MD5 (mem-20060926.tar.bz2) = 8cb953cc229a1864336ea6e4e547aef1
+SHA256 (mem-20060926.tar.bz2) = eed0876ef948eeabf15c67bfdb8e08d6ba9b6a5479b1ffd60cd29adb69793c49
+SIZE (mem-20060926.tar.bz2) = 389496
diff --git a/x11-wm/e17-module-mem/files/patch-e_mod_main.c b/x11-wm/e17-module-mem/files/patch-e_mod_main.c
deleted file mode 100644
index 045b3ea456f8..000000000000
--- a/x11-wm/e17-module-mem/files/patch-e_mod_main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- e_mod_main.c.orig	Thu Jul  6 22:43:05 2006
-+++ e_mod_main.c	Thu Jul  6 22:43:18 2006
-@@ -339,7 +339,7 @@
- EAPI int
- e_modapi_about(E_Module *m) 
- {
--   e_module_dialog_show(D_("Enlightenment Mem Monitor Module"), 
-+   e_module_dialog_show(m, D_("Enlightenment Mem Monitor Module"), 
- 			D_("This module is used to monitor memory."));
-    return 1;   
- }
diff --git a/x11-wm/e17-module-mem/pkg-plist b/x11-wm/e17-module-mem/pkg-plist
index 6614afa2ae08..aae66c519dca 100644
--- a/x11-wm/e17-module-mem/pkg-plist
+++ b/x11-wm/e17-module-mem/pkg-plist
@@ -1,38 +1,19 @@
-lib/enlightenment/modules/mem/DejaVuSansMono.ttf
-lib/enlightenment/modules/mem/mem.edc
+lib/enlightenment/modules/mem/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/mem/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/mem/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/mem/mem.edj
-lib/enlightenment/modules/mem/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/mem/module.eap
-lib/enlightenment/modules/mem/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/mem/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/mem/module.desktop
+lib/enlightenment/modules/mem/module.edj
 lib/enlightenment/modules/mem/module_icon.png
-lib/enlightenment/modules/mem/real_00.png
-lib/enlightenment/modules/mem/real_01.png
-lib/enlightenment/modules/mem/real_02.png
-lib/enlightenment/modules/mem/real_03.png
-lib/enlightenment/modules/mem/real_04.png
-lib/enlightenment/modules/mem/real_05.png
-lib/enlightenment/modules/mem/real_06.png
-lib/enlightenment/modules/mem/real_07.png
-lib/enlightenment/modules/mem/real_08.png
-lib/enlightenment/modules/mem/real_09.png
-lib/enlightenment/modules/mem/real_10.png
-lib/enlightenment/modules/mem/swap_00.png
-lib/enlightenment/modules/mem/swap_01.png
-lib/enlightenment/modules/mem/swap_02.png
-lib/enlightenment/modules/mem/swap_03.png
-lib/enlightenment/modules/mem/swap_04.png
-lib/enlightenment/modules/mem/swap_05.png
-lib/enlightenment/modules/mem/swap_06.png
-lib/enlightenment/modules/mem/swap_07.png
-lib/enlightenment/modules/mem/swap_08.png
-lib/enlightenment/modules/mem/swap_09.png
-lib/enlightenment/modules/mem/swap_10.png
 %%NLS%%share/locale/eo/LC_MESSAGES/mem.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/mem.mo
 %%NLS%%share/locale/it/LC_MESSAGES/mem.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/mem.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/mem.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/mem.mo
-@dirrm lib/enlightenment/modules/mem/%%MODULE_ARCH%%
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+@dirrm lib/enlightenment/modules/mem/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/mem
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-mixer/Makefile b/x11-wm/e17-module-mixer/Makefile
new file mode 100644
index 000000000000..c979be1591a9
--- /dev/null
+++ b/x11-wm/e17-module-mixer/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	e17-module-mixer
+# Date created:		30 September 2006
+# Whom:			Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	mixer
+PORTVERSION=	20060926
+CATEGORIES=	x11
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+PKGNAMEPREFIX=	e17-module-
+DISTNAME=	${PORTNAME}-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	An e17 module to adjust audio mixer settings
+
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
+GNU_CONFIGURE=	yes
+
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-wm/e17-module-mixer/distinfo b/x11-wm/e17-module-mixer/distinfo
new file mode 100644
index 000000000000..058aebf14405
--- /dev/null
+++ b/x11-wm/e17-module-mixer/distinfo
@@ -0,0 +1,3 @@
+MD5 (mixer-20060926.tar.bz2) = 3652211f1b7fe321440de97d8801f5d0
+SHA256 (mixer-20060926.tar.bz2) = 0bbacb948166eb5324c602ffd741d1597aea07c69e51c2061d84fcb6638d2a1d
+SIZE (mixer-20060926.tar.bz2) = 289454
diff --git a/x11-wm/e17-module-mixer/pkg-descr b/x11-wm/e17-module-mixer/pkg-descr
new file mode 100644
index 000000000000..f631d3706434
--- /dev/null
+++ b/x11-wm/e17-module-mixer/pkg-descr
@@ -0,0 +1,4 @@
+This e17 module allows users to adjust the sound mixer settings.
+
+Author:	Christopher 'devilhorns' Michael <devilhorns@comcast.net>
+WWW:	http://www.enlightenment.org
diff --git a/x11-wm/e17-module-mixer/pkg-plist b/x11-wm/e17-module-mixer/pkg-plist
new file mode 100644
index 000000000000..7b5d44decf2c
--- /dev/null
+++ b/x11-wm/e17-module-mixer/pkg-plist
@@ -0,0 +1,9 @@
+lib/enlightenment/modules/mixer/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/mixer/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/mixer/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/mixer/mixer.edj
+lib/enlightenment/modules/mixer/module.eap
+@dirrm lib/enlightenment/modules/mixer/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/mixer
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-moon/Makefile b/x11-wm/e17-module-moon/Makefile
index aaeb04b9a162..f442da8955c6 100644
--- a/x11-wm/e17-module-moon/Makefile
+++ b/x11-wm/e17-module-moon/Makefile
@@ -6,27 +6,25 @@
 #
 
 PORTNAME=	moon
-PORTVERSION=	23062006
-PORTREVISION=	2
+PORTVERSION=	20060926
+PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 Moon Clock module
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +34,6 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-wm/e17-module-moon/distinfo b/x11-wm/e17-module-moon/distinfo
index 8a1a8789bb68..872df226239c 100644
--- a/x11-wm/e17-module-moon/distinfo
+++ b/x11-wm/e17-module-moon/distinfo
@@ -1,3 +1,3 @@
-MD5 (moon-23062006.tar.bz2) = 6db65094f895971195fb1a1e5c792cf1
-SHA256 (moon-23062006.tar.bz2) = 83a7a52e60e9a603b53a1eef0c5798e1953a13951188a2a9691c9026c931c78b
-SIZE (moon-23062006.tar.bz2) = 646800
+MD5 (moon-20060926.tar.bz2) = f967701d2f031631d3b0a63b58df76c3
+SHA256 (moon-20060926.tar.bz2) = 3319d37fcd7fdfe0bf65aeb5d9016e3660e730263a97d18538e397ea5e2d50c0
+SIZE (moon-20060926.tar.bz2) = 672466
diff --git a/x11-wm/e17-module-moon/files/patch-src__e_mod_main.c b/x11-wm/e17-module-moon/files/patch-src__e_mod_main.c
deleted file mode 100644
index 1b64751d1dbd..000000000000
--- a/x11-wm/e17-module-moon/files/patch-src__e_mod_main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/e_mod_main.c.orig	Sat Jun  3 12:35:27 2006
-+++ src/e_mod_main.c	Thu Jul  6 23:01:10 2006
-@@ -124,7 +124,7 @@
- 
-    snprintf(title, sizeof(title), "%s %s", D_("Moon Clock Module"), 
- 	 PACKAGE_VERSION);
--   e_module_dialog_show(title, 
-+   e_module_dialog_show(module, title, 
- 	 D_("Display current phase of the moon ala e16 E-MoonClock")); 
-    return 1;
- }
diff --git a/x11-wm/e17-module-moon/pkg-plist b/x11-wm/e17-module-moon/pkg-plist
index 3c1c40aadf35..9e45a173c835 100644
--- a/x11-wm/e17-module-moon/pkg-plist
+++ b/x11-wm/e17-module-moon/pkg-plist
@@ -1,11 +1,14 @@
-lib/enlightenment/modules/moon/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/moon/module.eap
-lib/enlightenment/modules/moon/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/moon/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/moon/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/moon/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/moon/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/moon/module.desktop
+lib/enlightenment/modules/moon/module.edj
 lib/enlightenment/modules/moon/moon.edj
 %%NLS%%share/locale/eo/LC_MESSAGES/moon.mo
 %%NLS%%share/locale/it/LC_MESSAGES/moon.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/moon.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/moon.mo
-@dirrm lib/enlightenment/modules/moon/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/moon/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/moon
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-rain/Makefile b/x11-wm/e17-module-rain/Makefile
index 2bf4b5f17222..77f5f19018dc 100644
--- a/x11-wm/e17-module-rain/Makefile
+++ b/x11-wm/e17-module-rain/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	rain
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module which draws raindrops on your screen
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +33,6 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-wm/e17-module-rain/distinfo b/x11-wm/e17-module-rain/distinfo
index 84ba93d6b7e8..1df8e3b07846 100644
--- a/x11-wm/e17-module-rain/distinfo
+++ b/x11-wm/e17-module-rain/distinfo
@@ -1,3 +1,3 @@
-MD5 (rain-20060707.tar.bz2) = 603ae7f4c58b27d0be633030fbbb88cb
-SHA256 (rain-20060707.tar.bz2) = 0901114c5c4477f4c60480d4c03475a2e8558930bc60668a08897b77ad2712a0
-SIZE (rain-20060707.tar.bz2) = 309011
+MD5 (rain-20060926.tar.bz2) = 4505ab2f405c09191fb3dace3160ef88
+SHA256 (rain-20060926.tar.bz2) = 5f7b172c99518b1bee0d9a79c150e25cdbf289e1506bedf72bbe0f2c0eee212f
+SIZE (rain-20060926.tar.bz2) = 315366
diff --git a/x11-wm/e17-module-rain/pkg-plist b/x11-wm/e17-module-rain/pkg-plist
index 7d2e9998e063..fad84f556792 100644
--- a/x11-wm/e17-module-rain/pkg-plist
+++ b/x11-wm/e17-module-rain/pkg-plist
@@ -2,10 +2,11 @@ lib/enlightenment/modules/rain/cloud.png
 lib/enlightenment/modules/rain/drop-l.png
 lib/enlightenment/modules/rain/drop-m.png
 lib/enlightenment/modules/rain/drop-s.png
-lib/enlightenment/modules/rain/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/rain/module.eap
-lib/enlightenment/modules/rain/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/rain/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/rain/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/rain/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/rain/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/rain/module.desktop
+lib/enlightenment/modules/rain/module.edj
 lib/enlightenment/modules/rain/module_icon.png
 %%NLS%%share/locale/eo/LC_MESSAGES/rain.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/rain.mo
@@ -13,5 +14,9 @@ lib/enlightenment/modules/rain/module_icon.png
 %%NLS%%share/locale/it/LC_MESSAGES/rain.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/rain.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/rain.mo
-@dirrm lib/enlightenment/modules/rain/%%MODULE_ARCH%%
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+@dirrm lib/enlightenment/modules/rain/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/rain
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-screenshot/Makefile b/x11-wm/e17-module-screenshot/Makefile
index aaddd8aacd42..42347fec4de2 100644
--- a/x11-wm/e17-module-screenshot/Makefile
+++ b/x11-wm/e17-module-screenshot/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	screenshot
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module which allows users to take screenshots
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
 OPTIONS=	IMAGIC "Use ImageMagick" on \
 		SCROT "Use Scrot" off
@@ -34,10 +31,12 @@ OPTIONS=	IMAGIC "Use ImageMagick" on \
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_IMAGIC)
+BUILD_DEPENDS+=	import:${PORTSDIR}/graphics/ImageMagick
 RUN_DEPENDS+=	import:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 .if defined(WITH_SCROT)
+BUILD_DEPENDS+=	scrot:${PORTSDIR}/graphics/scrot
 RUN_DEPENDS+=	scrot:${PORTSDIR}/graphics/scrot
 .endif
 
@@ -49,4 +48,5 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
 .include <bsd.port.post.mk>
diff --git a/x11-wm/e17-module-screenshot/distinfo b/x11-wm/e17-module-screenshot/distinfo
index 0836f4795b07..fc042b17e8d8 100644
--- a/x11-wm/e17-module-screenshot/distinfo
+++ b/x11-wm/e17-module-screenshot/distinfo
@@ -1,3 +1,3 @@
-MD5 (screenshot-20060707.tar.bz2) = 9171aaf311bcf74762f42c6317045813
-SHA256 (screenshot-20060707.tar.bz2) = 3c1dbfb464e4f440b2d9dc43387563e22cf2a20f94ded7f56930470ddce13bd8
-SIZE (screenshot-20060707.tar.bz2) = 364926
+MD5 (screenshot-20060926.tar.bz2) = 59d9780357c3f41676474800d274d6b9
+SHA256 (screenshot-20060926.tar.bz2) = fc5f809d6af7da0a65033e28a27f91db424e716c46574f449a3300ba8a73277f
+SIZE (screenshot-20060926.tar.bz2) = 373270
diff --git a/x11-wm/e17-module-screenshot/pkg-plist b/x11-wm/e17-module-screenshot/pkg-plist
index 5cdca64316e5..190a2187bff1 100644
--- a/x11-wm/e17-module-screenshot/pkg-plist
+++ b/x11-wm/e17-module-screenshot/pkg-plist
@@ -1,12 +1,10 @@
-lib/enlightenment/modules/screenshot/screenshot.edj
-lib/enlightenment/modules/screenshot/e17_titlebar_glint1.png
-lib/enlightenment/modules/screenshot/e17_titlebar_glint2.png
-lib/enlightenment/modules/screenshot/e17_titlebar_glint3.png
-lib/enlightenment/modules/screenshot/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/screenshot/module.eap
-lib/enlightenment/modules/screenshot/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/screenshot/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/screenshot/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/screenshot/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/screenshot/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/screenshot/module.desktop
+lib/enlightenment/modules/screenshot/module.edj
 lib/enlightenment/modules/screenshot/module_icon.png
+lib/enlightenment/modules/screenshot/screenshot.edj
 %%NLS%%share/locale/eo/LC_MESSAGES/screenshot.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/screenshot.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/screenshot.mo
@@ -14,5 +12,9 @@ lib/enlightenment/modules/screenshot/module_icon.png
 %%NLS%%share/locale/ja/LC_MESSAGES/screenshot.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/screenshot.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/screenshot.mo
-@dirrm lib/enlightenment/modules/screenshot/%%MODULE_ARCH%%
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+@dirrm lib/enlightenment/modules/screenshot/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/screenshot
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-slideshow/Makefile b/x11-wm/e17-module-slideshow/Makefile
index 6e498a894b5a..5b9ac9375aae 100644
--- a/x11-wm/e17-module-slideshow/Makefile
+++ b/x11-wm/e17-module-slideshow/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	slideshow
-PORTVERSION=	20060728
+PORTVERSION=	20060926
 PORTREVISION=	0
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module which cycles desktop backgrounds
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +33,6 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-wm/e17-module-slideshow/distinfo b/x11-wm/e17-module-slideshow/distinfo
index 148b9f6eb244..973d1ebc4ca0 100644
--- a/x11-wm/e17-module-slideshow/distinfo
+++ b/x11-wm/e17-module-slideshow/distinfo
@@ -1,3 +1,3 @@
-MD5 (slideshow-20060728.tar.bz2) = fba7f99ab060e90f46647e8552fc01c7
-SHA256 (slideshow-20060728.tar.bz2) = f612d49d96aff81858c85d9884bca61bdcd0527c729120922817d8f12a76f6d0
-SIZE (slideshow-20060728.tar.bz2) = 249348
+MD5 (slideshow-20060926.tar.bz2) = 26e082dfe8aeb43d0fb1f56fcf27cee4
+SHA256 (slideshow-20060926.tar.bz2) = 9b709121621489fe84d9941fc2fd276800ddfe9be6b763f7242ebc00f79ea295
+SIZE (slideshow-20060926.tar.bz2) = 254831
diff --git a/x11-wm/e17-module-slideshow/pkg-plist b/x11-wm/e17-module-slideshow/pkg-plist
index ca6c7797c4f8..de126aa1c465 100644
--- a/x11-wm/e17-module-slideshow/pkg-plist
+++ b/x11-wm/e17-module-slideshow/pkg-plist
@@ -1,7 +1,8 @@
-lib/enlightenment/modules/slideshow/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/slideshow/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/slideshow/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/slideshow/module.eap
+lib/enlightenment/modules/slideshow/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/slideshow/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/slideshow/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/slideshow/module.desktop
+lib/enlightenment/modules/slideshow/module.edj
 lib/enlightenment/modules/slideshow/module_icon.png
 lib/enlightenment/modules/slideshow/slideshow.edj
 %%NLS%%share/locale/eo/LC_MESSAGES/slideshow.mo
@@ -10,5 +11,9 @@ lib/enlightenment/modules/slideshow/slideshow.edj
 %%NLS%%share/locale/it/LC_MESSAGES/slideshow.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/slideshow.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/slideshow.mo
-@dirrm lib/enlightenment/modules/slideshow/%%MODULE_ARCH%%
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+@dirrm lib/enlightenment/modules/slideshow/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/slideshow
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-snow/Makefile b/x11-wm/e17-module-snow/Makefile
index 91472f0604ce..f01e84a9df7a 100644
--- a/x11-wm/e17-module-snow/Makefile
+++ b/x11-wm/e17-module-snow/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	snow
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module which draws snowflakes on your screen
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +33,6 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-wm/e17-module-snow/distinfo b/x11-wm/e17-module-snow/distinfo
index 2226f0d968cb..b2e53b54dd7b 100644
--- a/x11-wm/e17-module-snow/distinfo
+++ b/x11-wm/e17-module-snow/distinfo
@@ -1,3 +1,3 @@
-MD5 (snow-20060707.tar.bz2) = 138b18e7afc538955d2409727ad3507e
-SHA256 (snow-20060707.tar.bz2) = ff064eef0bee90ea7f40c5d10c27a6e0e6392657bc47f632a6568fac792e112b
-SIZE (snow-20060707.tar.bz2) = 241756
+MD5 (snow-20060926.tar.bz2) = c5dbea13f4151b4d0851d1b083c90732
+SHA256 (snow-20060926.tar.bz2) = 4372038f755e2e99f53a3e367ff175a634b94f618ad47533dbd68892f5f22490
+SIZE (snow-20060926.tar.bz2) = 248633
diff --git a/x11-wm/e17-module-snow/pkg-plist b/x11-wm/e17-module-snow/pkg-plist
index 5437ff0125b6..d3d75cd2e5a8 100644
--- a/x11-wm/e17-module-snow/pkg-plist
+++ b/x11-wm/e17-module-snow/pkg-plist
@@ -1,10 +1,11 @@
 lib/enlightenment/modules/snow/flake-l.png
 lib/enlightenment/modules/snow/flake-m.png
 lib/enlightenment/modules/snow/flake-s.png
-lib/enlightenment/modules/snow/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/snow/module.eap
-lib/enlightenment/modules/snow/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/snow/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/snow/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/snow/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/snow/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/snow/module.desktop
+lib/enlightenment/modules/snow/module.edj
 lib/enlightenment/modules/snow/module_icon.png
 lib/enlightenment/modules/snow/tree.png
 %%NLS%%share/locale/eo/LC_MESSAGES/snow.mo
@@ -13,5 +14,9 @@ lib/enlightenment/modules/snow/tree.png
 %%NLS%%share/locale/it/LC_MESSAGES/snow.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/snow.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/snow.mo
-@dirrm lib/enlightenment/modules/snow/%%MODULE_ARCH%%
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+@dirrm lib/enlightenment/modules/snow/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/snow
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-uptime/Makefile b/x11-wm/e17-module-uptime/Makefile
index 2b279b4a2bd2..c977b63d67e7 100644
--- a/x11-wm/e17-module-uptime/Makefile
+++ b/x11-wm/e17-module-uptime/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	uptime
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 uptime and load average indicator module
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +33,6 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-wm/e17-module-uptime/distinfo b/x11-wm/e17-module-uptime/distinfo
index 851ccb9f799e..5257ad423257 100644
--- a/x11-wm/e17-module-uptime/distinfo
+++ b/x11-wm/e17-module-uptime/distinfo
@@ -1,3 +1,3 @@
-MD5 (uptime-20060707.tar.bz2) = 83d8f63ee637ddcc3eb8cbff01e1a50d
-SHA256 (uptime-20060707.tar.bz2) = 9a4713e04faa55c309cf03d7f431b81ee6ddc36a238f696b7a132a0099926783
-SIZE (uptime-20060707.tar.bz2) = 275549
+MD5 (uptime-20060926.tar.bz2) = f39c2c7643adef2456e4e3994a3696d0
+SHA256 (uptime-20060926.tar.bz2) = 145ce4451b0df08985b691fbaa4fe783cac32a5b2bab007f093ebfb3cbfb5bec
+SIZE (uptime-20060926.tar.bz2) = 285109
diff --git a/x11-wm/e17-module-uptime/pkg-plist b/x11-wm/e17-module-uptime/pkg-plist
index 9ba376e9e8dd..2d2960917bac 100644
--- a/x11-wm/e17-module-uptime/pkg-plist
+++ b/x11-wm/e17-module-uptime/pkg-plist
@@ -1,13 +1,21 @@
-lib/enlightenment/modules/uptime/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/uptime/module.eap
-lib/enlightenment/modules/uptime/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/uptime/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/uptime/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/uptime/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/uptime/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/uptime/module.desktop
+lib/enlightenment/modules/uptime/module.edj
 lib/enlightenment/modules/uptime/uptime.edj
-%%NLS%%share/locale/bg/LC_MESSAGES/uptime.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/uptime.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/uptime.mo
-%%NLS%%share/locale/it/LC_MESSAGES/uptime.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/uptime.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/uptime.mo
-@dirrm lib/enlightenment/modules/uptime/%%MODULE_ARCH%%
-@dirrm lib/enlightenment/modules/uptime
+lib/enlightenment/modules/uptime/uptime.png
+share/locale/bg/LC_MESSAGES/uptime.mo
+share/locale/eo/LC_MESSAGES/uptime.mo
+share/locale/fi/LC_MESSAGES/uptime.mo
+share/locale/it/LC_MESSAGES/uptime.mo
+share/locale/ja/LC_MESSAGES/uptime.mo
+share/locale/sv/LC_MESSAGES/uptime.mo
+share/nls/POSIX
+share/nls/en_US.US-ASCII
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry lib/enlightenment/modules/uptime/%%E17_ARCH%%
+@dirrmtry lib/enlightenment/modules/uptime
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-weather/Makefile b/x11-wm/e17-module-weather/Makefile
index 8d4ccdd37b55..458c9d203ff7 100644
--- a/x11-wm/e17-module-weather/Makefile
+++ b/x11-wm/e17-module-weather/Makefile
@@ -6,27 +6,25 @@
 #
 
 PORTNAME=	weather
-PORTVERSION=	23062006
-PORTREVISION=	2
+PORTVERSION=	20060926
+PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 weather module
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +34,6 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-wm/e17-module-weather/distinfo b/x11-wm/e17-module-weather/distinfo
index 286d80bf9239..51bc6124cecc 100644
--- a/x11-wm/e17-module-weather/distinfo
+++ b/x11-wm/e17-module-weather/distinfo
@@ -1,3 +1,3 @@
-MD5 (weather-23062006.tar.bz2) = ea95150b91bd794e1c4d2381e4729a80
-SHA256 (weather-23062006.tar.bz2) = 4847c88494e6f33424911464f91cfe696ae82e70ed512fd900e70a1123ce3ea8
-SIZE (weather-23062006.tar.bz2) = 941161
+MD5 (weather-20060926.tar.bz2) = 6bda3b61f7f026040865a262305fc9a4
+SHA256 (weather-20060926.tar.bz2) = 02371844b0d466d7a90ad47bef5e40470dec77aff07c8635cea4cf985ba384d3
+SIZE (weather-20060926.tar.bz2) = 948459
diff --git a/x11-wm/e17-module-weather/files/patch-e_mod_main.c b/x11-wm/e17-module-weather/files/patch-e_mod_main.c
deleted file mode 100644
index 64cfef8a20e0..000000000000
--- a/x11-wm/e17-module-weather/files/patch-e_mod_main.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- e_mod_main.c.orig	Thu Jul  6 23:05:04 2006
-+++ e_mod_main.c	Thu Jul  6 23:05:19 2006
-@@ -354,7 +354,8 @@
- EAPI int
- e_modapi_about(E_Module *m)
- {
--   e_module_dialog_show(D_("Enlightenment Weather Module"), D_("A weather forecast module for Enlightenment"));
-+   e_module_dialog_show(m, D_("Enlightenment Weather Module"), 
-+	D_("A weather forecast module for Enlightenment"));
-    return 1;
- }
- 
diff --git a/x11-wm/e17-module-weather/pkg-plist b/x11-wm/e17-module-weather/pkg-plist
index 66c078bb5d6f..bd4bcd2c0fbd 100644
--- a/x11-wm/e17-module-weather/pkg-plist
+++ b/x11-wm/e17-module-weather/pkg-plist
@@ -1,4 +1,6 @@
-lib/enlightenment/modules/weather/VeraBd.ttf
+lib/enlightenment/modules/weather/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/weather/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/weather/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/weather/images/blizzard.png
 lib/enlightenment/modules/weather/images/blowingsnow.png
 lib/enlightenment/modules/weather/images/chancetstorm.png
@@ -61,17 +63,16 @@ lib/enlightenment/modules/weather/images/unknown.png
 lib/enlightenment/modules/weather/images/wind.png
 lib/enlightenment/modules/weather/images/wswarning.png
 lib/enlightenment/modules/weather/images/wswatch.png
-lib/enlightenment/modules/weather/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/weather/module.eap
-lib/enlightenment/modules/weather/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/weather/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/weather/module.desktop
+lib/enlightenment/modules/weather/module.edj
 lib/enlightenment/modules/weather/module_icon.png
-lib/enlightenment/modules/weather/vera.ttf
-lib/enlightenment/modules/weather/weather.edc
 lib/enlightenment/modules/weather/weather.edj
 %%NLS%%share/locale/eo/LC_MESSAGES/weather.mo
 %%NLS%%share/locale/it/LC_MESSAGES/weather.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/weather.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/weather.mo
 @dirrm lib/enlightenment/modules/weather/images
-@dirrm lib/enlightenment/modules/weather/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/weather/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/weather
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-winselector/Makefile b/x11-wm/e17-module-winselector/Makefile
new file mode 100644
index 000000000000..553c0ec4c557
--- /dev/null
+++ b/x11-wm/e17-module-winselector/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	winselector
+# Date created:		2006-08-15
+# Whom:			Stanislav Sedov <ssedov@mbsd.msk.ru>
+#
+# $MBSDlabs$
+# $FreeBSD$
+#
+
+PORTNAME=	winselector
+PORTVERSION=	20060926
+CATEGORIES=	x11
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+PKGNAMEPREFIX=	e17-module-
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	An e17 module to switch between windows
+
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	pkgconfig gnometarget
+USE_EFL=	edje
+
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-wm/e17-module-winselector/distinfo b/x11-wm/e17-module-winselector/distinfo
new file mode 100644
index 000000000000..12ddf1232176
--- /dev/null
+++ b/x11-wm/e17-module-winselector/distinfo
@@ -0,0 +1,3 @@
+MD5 (winselector-20060926.tar.bz2) = 7f3f5d26dff799c4c37945043b171d28
+SHA256 (winselector-20060926.tar.bz2) = f6e433dda44c9bedc81b12032a7618b015d33acdb7177becea4e56a2baa13484
+SIZE (winselector-20060926.tar.bz2) = 277497
diff --git a/x11-wm/e17-module-winselector/pkg-descr b/x11-wm/e17-module-winselector/pkg-descr
new file mode 100644
index 000000000000..8e25ba30168d
--- /dev/null
+++ b/x11-wm/e17-module-winselector/pkg-descr
@@ -0,0 +1,4 @@
+An E17 module that enables access to all windows through a shelf button.
+
+Author:	Viktor Kojouharov <vkojouharov@gmail.com>
+WWW:	http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-winselector/pkg-plist b/x11-wm/e17-module-winselector/pkg-plist
new file mode 100644
index 000000000000..27724a16ee28
--- /dev/null
+++ b/x11-wm/e17-module-winselector/pkg-plist
@@ -0,0 +1,11 @@
+lib/enlightenment/modules/winselector/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/winselector/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/winselector/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/winselector/module.desktop
+lib/enlightenment/modules/winselector/module.edj
+lib/enlightenment/modules/winselector/module_icon.png
+lib/enlightenment/modules/winselector/winselector.edj
+@dirrm lib/enlightenment/modules/winselector/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/winselector
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-utils/Makefile b/x11-wm/e17-utils/Makefile
index 7eaa6c1185b4..5322ae6666e2 100644
--- a/x11-wm/e17-utils/Makefile
+++ b/x11-wm/e17-utils/Makefile
@@ -7,35 +7,27 @@
 #
 
 PORTNAME=	utils
-PORTVERSION=	20060719
+PORTVERSION=	20060926
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-
 DISTNAME=	e_${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Various supplementary utilities for e17 window manager
 
 BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2 \
-		evas.1:${PORTSDIR}/graphics/evas \
-		edje.5:${PORTSDIR}/graphics/edje \
-		ecore.1:${PORTSDIR}/x11/ecore \
-		embryo.9:${PORTSDIR}/lang/embryo \
-		eet.9:${PORTSDIR}/devel/eet \
-		ewl.0:${PORTSDIR}/x11-toolkits/ewl \
-		engrave.1:${PORTSDIR}/devel/engrave \
-		epsilon.0:${PORTSDIR}/graphics/epsilon \
-		esmart_trans_x11.0:${PORTSDIR}/graphics/esmart
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
 
 DATADIR=	${PREFIX}/share/e_utils
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	imlib2 evas edje ecore embryo eet ewl engrave epsilon
+USE_EFL_ESMART=	trans_x11
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-wm/e17-utils/distinfo b/x11-wm/e17-utils/distinfo
index af98e261ab80..af03eaf36cd6 100644
--- a/x11-wm/e17-utils/distinfo
+++ b/x11-wm/e17-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (e_utils-20060719.tar.bz2) = 7408a1f6806294f7663f90b39558290f
-SHA256 (e_utils-20060719.tar.bz2) = dc2a9775a4df2a4a59d7a6f746ade244c8f066802b7eea858898c9913b32d524
-SIZE (e_utils-20060719.tar.bz2) = 1000780
+MD5 (e_utils-20060926.tar.bz2) = a7cf259d61a67eae2d53099b75eabd3d
+SHA256 (e_utils-20060926.tar.bz2) = bda5268080bcf1e04544f2f3dc85b142afe9f033e83f63a5eb9990a8306a8a99
+SIZE (e_utils-20060926.tar.bz2) = 921212
diff --git a/x11-wm/e17-utils/files/patch-src_bin_eapp_edit_eapp_edit_main.c b/x11-wm/e17-utils/files/patch-src_bin_eapp_edit_eapp_edit_main.c
deleted file mode 100644
index 0a50165550f1..000000000000
--- a/x11-wm/e17-utils/files/patch-src_bin_eapp_edit_eapp_edit_main.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/bin/eapp_edit/eapp_edit_main.c.orig	Thu Sep  7 22:16:56 2006
-+++ src/bin/eapp_edit/eapp_edit_main.c	Thu Sep  7 22:20:34 2006
-@@ -420,13 +420,11 @@
-     e = ev;
-     if (e->response == EWL_STOCK_OK)
-     {
--        char *icon;
-         const char *icon2;
-         char icon3[PATH_MAX];
-     
--        icon = ewl_filedialog_selected_file_get(EWL_FILEDIALOG(w));
--        icon2 = ewl_filedialog_directory_get(EWL_FILEDIALOG(w));
--        snprintf(icon3, PATH_MAX, "%s/%s", icon2, icon);
-+	icon2 = ewl_filedialog_file_get(EWL_FILEDIALOG(w));
-+        snprintf(icon3, PATH_MAX, "%s", icon2);
- 
-         o = ewl_widget_name_find("icon");
-         ewl_widget_data_set(o, "file", strdup(icon3));
diff --git a/x11-wm/e17-utils/pkg-plist b/x11-wm/e17-utils/pkg-plist
index ea1b1b0fc313..3092b77dc2d3 100644
--- a/x11-wm/e17-utils/pkg-plist
+++ b/x11-wm/e17-utils/pkg-plist
@@ -18,15 +18,13 @@ bin/exige
 %%DATADIR%%/data/e17genmenu/icons/package_toys.png
 %%DATADIR%%/data/e17genmenu/icons/package_utilities.png
 %%DATADIR%%/data/e17genmenu/icons/package_wordprocessing.png
-%%DATADIR%%/data/emblem/default.edj
-%%DATADIR%%/data/emblem/gant.edj
 %%DATADIR%%/data/entangle/default.edj
 %%DATADIR%%/data/exige/default.edj
 share/enlightenment/config-apps/entangle.eap
+@dirrmtry share/enlightenment
 @dirrmtry share/enlightenment/config-apps
 @dirrm %%DATADIR%%/data/exige
 @dirrm %%DATADIR%%/data/entangle
-@dirrm %%DATADIR%%/data/emblem
 @dirrm %%DATADIR%%/data/e17genmenu/icons
 @dirrm %%DATADIR%%/data/e17genmenu
 @dirrm %%DATADIR%%/data
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index 82232ce1d6ce..a6cbb3d0ce0a 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -6,33 +6,25 @@
 #
 
 PORTNAME=	enlightenment
-PORTVERSION=	0.16.999.032
+PORTVERSION=	20060926
 PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://enlightenment.freedesktop.org/files/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+DISTNAME=	e-${PORTVERSION}
 
-MAINTAINER=	vanilla@FreeBSD.org
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	A very artistic X window manager
 
-LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2 \
-		evas.1:${PORTSDIR}/graphics/evas \
-		edje.5:${PORTSDIR}/graphics/edje \
-		ecore.1:${PORTSDIR}/x11/ecore \
-		embryo.9:${PORTSDIR}/lang/embryo \
-		eet.9:${PORTSDIR}/devel/eet
-
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomehack gnometarget
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack gnometarget pkgconfig
+USE_EFL=	imlib2 evas edje ecore embryo eet
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 NO_LATEST_LINK=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
 
 .include <bsd.port.pre.mk>
 
@@ -40,4 +32,5 @@ PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
 IGNORE=	does not build on 4.X
 .endif
 
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
 .include <bsd.port.post.mk>
diff --git a/x11-wm/enlightenment-devel/bsd.efl.mk b/x11-wm/enlightenment-devel/bsd.efl.mk
new file mode 100644
index 000000000000..58a4c15dca60
--- /dev/null
+++ b/x11-wm/enlightenment-devel/bsd.efl.mk
@@ -0,0 +1,307 @@
+#
+# $MBSDlabs: portmk/bsd.efl.mk,v 1.17 2006/10/02 14:57:48 stas Exp $
+# $FreeBSD$
+#
+# bsd.efl.mk - Support for Enlightenment Foundation Libraries (EFL)
+#
+# Author: Stanislav Sedov <ssedov@mbsd.msk.ru>
+# Inspired by bsd.sdl.mk by Edwin Groothuis <edwin@freebsd.org>
+#
+# You can specify EFL-related library dependency using "USE_EFL=" statement,
+# e.g. "USE_EFL= ecore evas" will add x11/ecore and graphics/evas as dependency
+# for your port.
+# You can check existency of certain library throught "WANT_EFL/HAVE_EFL" pair.
+# Note: WANT_EFL should be defined before including <bsd.port.pre.mk>, and
+# HAVE_EFL variable could be tested after it. For example:
+#
+#	WANT_EFL=	yes
+#	.include <bsd.port.pre.mk>
+#	.if ${HAVE_EFL:Mevas}
+#	USE_EFL+=	evas
+#	.endif
+#
+# Currently recognized variables are:
+# USE_EFL	- lists all EFL libraries which port depends on
+# WANT_EFL	- the port wants to test which of EFL libraries are installed
+#		  on the target system
+# USE_EFL_ESMART- the ports depends on specified esmart objects (or on all
+#		  esmart objects if "yes")
+#
+# The following variables could be tested after inclusion of bsd.port.pre.mk:
+# HAVE_EFL	- lists all EFL libraries which are available on target system
+# HAVE_EFL_ESMART - esmart objects available
+#
+# Feel free to send any comments and suggestion to maintainer.
+#
+
+EFL_Include_MAINTAINER=	ssedov@mbsd.msk.ru
+
+#
+# Define all supported libraries
+#
+_USE_EFL_ALL=	ecore edb edje eet embryo emotion engrave enhance epeg \
+		epsilon etk etox evas evfs ewl exml imlib2
+
+# For each library supported we define the following variables:
+#	_%%LIB%%_CATEGORY	- category the port belongs to
+#	_%%LIB%%_DEPENDS	- other EFL libraries the library
+#		itself depends on. We'll define them explicitly
+#		to handle unwanted deinstalls.
+#	_%%LIB%%_PREFIX		- where the library is installed
+#	_%%LIB%%_VERSION	- version of the shared library
+#	_%%LIB%%_SLIB		- name of the shared library
+#
+
+_ecore_CATEGORY=	x11
+_ecore_DEPENDS=		evas
+_ecore_PREFIX=		${LOCALBASE}
+_ecore_VERSION=		1
+
+_edb_CATEGORY=		databases
+_edb_PREFIX=		${LOCALBASE}
+_edb_VERSION=		1
+
+_eet_CATEGORY=		devel
+_eet_PREFIX=		${LOCALBASE}
+_eet_VERSION=		9
+
+_edje_CATEGORY=		graphics
+_edje_DEPENDS=		embryo eet imlib2 evas ecore
+_edje_PREFIX=		${LOCALBASE}
+_edje_VERSION=		5
+
+_embryo_CATEGORY=	lang
+_embryo_PREFIX=		${LOCALBASE}
+_embryo_VERSION=	9
+
+_emotion_CATEGORY=	multimedia
+_emotion_DEPENDS=	ecore edje eet embryo evas
+_emotion_PREFIX=	${LOCALBASE}
+_emotion_VERSION=	0
+
+_engrave_CATEGORY=	devel
+_engrave_DEPENDS=	ecore evas
+_engrave_PREFIX=	${LOCALBASE}
+_engrave_VERSION=	1
+
+_enhance_CATEGORY=	x11-toolkits
+_enhance_DEPENDS=	ecore etk exml
+_enhance_PREFIX=	${LOCALBASE}
+_enhance_VERSION=	0
+
+_epeg_CATEGORY=		graphics
+_epeg_PREFIX=		${LOCALBASE}
+_epeg_VERSION=		9
+
+_epsilon_CATEGORY=	graphics
+_epsilon_DEPENDS=	epeg edje imlib2 ecore
+_epsilon_PREFIX=	${LOCALBASE}
+_epsilon_VERSION=	0
+
+_etk_CATEGORY=		x11-toolkits
+_etk_DEPENDS=		evas ecore edje
+_etk_PREFIX=		${LOCALBASE}
+_etk_VERSION=		1
+
+_etox_CATEGORY=		x11-toolkits
+_etox_DEPENDS=		edb evas ecore
+_etox_PREFIX=		${LOCALBASE}
+_etox_VERSION=		0
+
+_evas_CATEGORY=		graphics
+_evas_DEPENDS=		eet edb
+_evas_PREFIX=		${LOCALBASE}
+_evas_VERSION=		1
+
+_evfs_CATEGORY=		devel
+_evfs_DEPENDS=		eet ecore
+_evfs_PREFIX=		${LOCALBASE}
+_evfs_VERSION=		0
+
+_ewl_CATEGORY=		x11-toolkits
+_ewl_DEPENDS=		evas ecore edje epsilon
+_ewl_PREFIX=		${LOCALBASE}
+_ewl_VERSION=		0
+
+_exml_CATEGORY=		textproc
+_exml_DEPENDS=		ecore
+_exml_PREFIX=		${LOCALBASE}
+_exml_VERSION=		1
+
+_imlib2_CATEGORY=	graphics
+_imlib2_PREFIX=		${LOCALBASE}
+_imlib2_VERSION=	3
+_imlib2_SLIB=		Imlib2
+
+#
+# Assign values for variables which were not defined explicitly
+#
+.for LIB in ${_USE_EFL_ALL}
+. if !defined(_${LIB}_DEPENDS)
+_${LIB}_DEPENDS=	#empty
+. endif
+. if !defined(_${LIB}_SLIB)
+_${LIB}_SLIB=${LIB}
+. endif
+.endfor
+
+#
+# Esmart support. We'll define esmart components in the way the're 
+# defined for EFL.
+# Values processed:
+# _esmart_COMP_CATEGORY	- Where the port for this esmart object is located
+# _esmart_COMP_PORTNAME	- Object's port subdirectory
+# _esmart_COMP_DEPENDS	- Other components which this object depends on
+# _esmart_COMP_PREFIX	- Where the shared library for this object is located
+# _esmart_COMP_VERSION	- Version of the shared library
+#
+
+# All components that are currently supported
+_EFL_ESMART_ALL=	container draggies file_dialog text_entry \
+			thumb trans_x11
+
+#
+# Generic stock esmart definitions
+#
+_EFL_ESMART_CATEGORY=	graphics
+_EFL_ESMART_PORTNAME=	esmart
+_EFL_ESMART_DEPENDS=	epsilon evas ecore imlib2 edje
+_EFL_ESMART_PREFIX=	${LOCALBASE}
+_EFL_ESMART_VERSION=	0
+
+#
+# Assign values for variables which were not defined explicitly
+#
+.for COMP in ${_EFL_ESMART_ALL}
+. if !defined(_esmart_${COMP}_CATEGORY)
+_esmart_${COMP}_CATEGORY=	${_EFL_ESMART_CATEGORY}
+. endif
+. if !defined(_esmart_${COMP}_PORTNAME)
+_esmart_${COMP}_PORTNAME=	${_EFL_ESMART_PORTNAME}
+. endif
+. if !defined(_esmart_${COMP}_PREFIX)
+_esmart_${COMP}_PREFIX=	${_EFL_ESMART_PREFIX}
+. endif
+. if !defined(_esmart_${COMP}_DEPENDS)
+_esmart_${COMP}_DEPENDS=	#empty
+. endif
+. if !defined(_esmart_${COMP}_SLIB)
+_esmart_${COMP}_SLIB=	esmart_${COMP}
+. endif
+. if !defined(_esmart_${COMP}_VERSION)
+_esmart_${COMP}_VERSION=	${_EFL_ESMART_VERSION}
+. endif
+.endfor
+
+#
+# Handle WANT_EFL feature
+#
+.if !defined(AFTERPORTMK)
+.if !defined(EFL_Include_pre)
+
+EFL_Include_pre=	bsd.efl.mk
+
+HAVE_EFL?=
+HAVE_EFL_ESMART?=
+.if defined(WANT_EFL)
+. for LIB in ${_USE_EFL_ALL}
+.  if exists(${_${LIB}_PREFIX}/lib/lib${_${LIB}_SLIB}.so.${_${LIB}_VERSION})
+HAVE_EFL+=	${LIB}
+.  endif
+. endfor
+. for COMP in ${_EFL_ESMART_ALL}
+.  if exists(${_esmart_${COMP}_PREFIX}/lib/lib${_esmart_${COMP}_SLIB}.so.${_esmart_${COMP}_VERSION})
+HAVE_EFL_ESMART+=	${COMP}
+.  endif
+. endfor
+.endif
+
+.endif #EFL_Include_pre
+.endif #AFTERPORTMK
+
+#
+# Handle USE_EFL & USE_ESMART feature
+#
+.if !defined(BEFOREPORTMK)
+.if !defined(EFL_Include_post)
+
+.if defined(USE_EFL_ESMART)
+
+USE_EFL+=	${_EFL_ESMART_DEPENDS} #we use EFL too
+
+_USE_EFL_ESMART=	#empty
+.if USE_EFL_ESMART=="yes"
+_USE_EFL_ESMART=	${_EFL_ESMART_ALL}
+.else
+. for COMP in ${USE_EFL_ESMART}
+.  if ${_EFL_ESMART_ALL:M${COMP}}==""
+IGNORE=	cannot install: unknown Esmart component ${COMP}
+.  else
+_USE_EFL_ESMART+=	${COMP} ${_esmart_${COMP}_DEPENDS}
+.  endif
+. endfor
+.endif
+
+# Get rid of duplicates
+.if ${OSVERSION} > 700016
+_USE_EFL_ESMART_UQ=	${_USE_EFL_ESMART:O:u}
+.else
+_USE_EFL_ESMART_UQ=	#empty
+. for COMP in ${_USE_EFL_ESMART}
+.  if ${_USE_EFL_ESMART_UQ:M${COMP}}==""
+_USE_EFL_ESMART_UQ+=	${COMP}
+.  endif
+. endfor
+.endif
+
+.for COMP in ${_USE_EFL_ESMART_UQ}
+LIB_DEPENDS+=	${_esmart_${COMP}_SLIB}.${_esmart_${COMP}_VERSION}:${PORTSDIR}/${_esmart_${COMP}_CATEGORY}/${_esmart_${COMP}_PORTNAME}
+.endfor
+
+.endif #USE_EFL_ESMART
+
+.if defined(USE_EFL)
+
+EFL_Include_post=	bsd.efl.mk
+
+#
+# Check if we have all libraries requiested and build depends list
+#
+_USE_EFL=	#empty
+.for LIB in ${USE_EFL}
+. if ${_USE_EFL_ALL:M${LIB}}==""
+IGNORE=	cannot install: unknown library ${LIB}
+. endif
+_USE_EFL+=	${_${LIB}_DEPENDS} ${LIB}
+.endfor
+
+#
+# Get rid of duplicates
+#
+_USE_EFL_UQ=	#empty
+.for LIB in ${_USE_EFL}
+. if ${_USE_EFL_UQ:M${LIB}}==""
+_USE_EFL_UQ+=	${LIB}
+. endif
+.endfor
+
+#
+# define dependencies
+#
+.for LIB in ${_USE_EFL_UQ}
+LIB_DEPENDS+=	${_${LIB}_SLIB}.${_${LIB}_VERSION}:${PORTSDIR}/${_${LIB}_CATEGORY}/${LIB}
+.endfor
+
+#
+# Initialize configure enviropment
+#
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${LDFLAGS}"
+
+PLIST_SUB+=	E17_ARCH=freebsd${OSREL}-${ARCH}
+
+.endif #USE_EFL
+
+.endif #EFL_Include_post
+.endif #BEFOREPORTMK
diff --git a/x11-wm/enlightenment-devel/distinfo b/x11-wm/enlightenment-devel/distinfo
index 934d88520b6d..96e4ff935a0d 100644
--- a/x11-wm/enlightenment-devel/distinfo
+++ b/x11-wm/enlightenment-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (enlightenment-0.16.999.032.tar.gz) = 206dca9d967ea4898ca0b9139e51e31f
-SHA256 (enlightenment-0.16.999.032.tar.gz) = 7643f56131a6db9635e0224b1d6806c412c4638731f62355cf892236d0dcded9
-SIZE (enlightenment-0.16.999.032.tar.gz) = 29911903
+MD5 (e-20060926.tar.bz2) = 440377d3f561b2dc8dbc5a04be50193f
+SHA256 (e-20060926.tar.bz2) = fdba2748a0a172d11b5edd8f8ee1ecec17b4e270a7b9983a8d8f156d5e95d6bd
+SIZE (e-20060926.tar.bz2) = 31174715
diff --git a/x11-wm/enlightenment-devel/pkg-plist b/x11-wm/enlightenment-devel/pkg-plist
index e33de5dabce8..ce5df7f81b4c 100644
--- a/x11-wm/enlightenment-devel/pkg-plist
+++ b/x11-wm/enlightenment-devel/pkg-plist
@@ -1,17 +1,18 @@
+bin/eap_to_desktop
 bin/enlightenment
 bin/enlightenment-config
 bin/enlightenment_eapp
-bin/enlightenment_eapp_cache_gen
 bin/enlightenment_imc
 bin/enlightenment_remote
 bin/enlightenment_start
+bin/enlightenment_sys
 bin/enlightenment_thumb
+etc/enlightenment/sysactions.conf
 include/enlightenment/e.h
 include/enlightenment/e_about.h
 include/enlightenment/e_actions.h
 include/enlightenment/e_alert.h
 include/enlightenment/e_apps.h
-include/enlightenment/e_apps_cache.h
 include/enlightenment/e_apps_error.h
 include/enlightenment/e_atoms.h
 include/enlightenment/e_bg.h
@@ -19,7 +20,9 @@ include/enlightenment/e_bindings.h
 include/enlightenment/e_border.h
 include/enlightenment/e_box.h
 include/enlightenment/e_canvas.h
+include/enlightenment/e_color.h
 include/enlightenment/e_color_class.h
+include/enlightenment/e_color_dialog.h
 include/enlightenment/e_config.h
 include/enlightenment/e_config_dialog.h
 include/enlightenment/e_configure.h
@@ -32,29 +35,21 @@ include/enlightenment/e_deskpreview.h
 include/enlightenment/e_dialog.h
 include/enlightenment/e_dnd.h
 include/enlightenment/e_eap_editor.h
+include/enlightenment/e_editable.h
 include/enlightenment/e_entry.h
 include/enlightenment/e_entry_dialog.h
 include/enlightenment/e_error.h
 include/enlightenment/e_exebuf.h
 include/enlightenment/e_exehist.h
-include/enlightenment/e_file_dialog.h
-include/enlightenment/e_file_selector.h
-include/enlightenment/e_fileman.h
-include/enlightenment/e_fileman_file.h
-include/enlightenment/e_fileman_icon.h
-include/enlightenment/e_fileman_mime.h
-include/enlightenment/e_fileman_smart.h
+include/enlightenment/e_fdo_menu_to_order.h
 include/enlightenment/e_fm.h
+include/enlightenment/e_fm_mime.h
 include/enlightenment/e_focus.h
 include/enlightenment/e_font.h
 include/enlightenment/e_gadcon.h
-include/enlightenment/e_gadget.h
-include/enlightenment/e_gadman.h
 include/enlightenment/e_grabinput.h
 include/enlightenment/e_hints.h
 include/enlightenment/e_icon.h
-include/enlightenment/e_icon_canvas.h
-include/enlightenment/e_icon_grid.h
 include/enlightenment/e_ilist.h
 include/enlightenment/e_includes.h
 include/enlightenment/e_init.h
@@ -63,8 +58,7 @@ include/enlightenment/e_int_border_locks.h
 include/enlightenment/e_int_border_menu.h
 include/enlightenment/e_int_border_prop.h
 include/enlightenment/e_int_border_remember.h
-include/enlightenment/e_int_config_background.h
-include/enlightenment/e_int_config_background_import.h
+include/enlightenment/e_int_config_apps.h
 include/enlightenment/e_int_config_cfgdialogs.h
 include/enlightenment/e_int_config_cursor.h
 include/enlightenment/e_int_config_desklock.h
@@ -73,21 +67,28 @@ include/enlightenment/e_int_config_display.h
 include/enlightenment/e_int_config_exebuf.h
 include/enlightenment/e_int_config_focus.h
 include/enlightenment/e_int_config_fonts.h
-include/enlightenment/e_int_config_hinting.h
+include/enlightenment/e_int_config_icon_themes.h
+include/enlightenment/e_int_config_intl.h
 include/enlightenment/e_int_config_keybindings.h
-include/enlightenment/e_int_config_startup.h
 include/enlightenment/e_int_config_menus.h
 include/enlightenment/e_int_config_modules.h
+include/enlightenment/e_int_config_mousebindings.h
 include/enlightenment/e_int_config_paths.h
 include/enlightenment/e_int_config_performance.h
-include/enlightenment/e_int_config_shelf.h
+include/enlightenment/e_int_config_sh%%PORTOBJFORMAT%%.h
+include/enlightenment/e_int_config_startup.h
 include/enlightenment/e_int_config_theme.h
+include/enlightenment/e_int_config_theme_import.h
+include/enlightenment/e_int_config_transitions.h
+include/enlightenment/e_int_config_wallpaper.h
+include/enlightenment/e_int_config_wallpaper_gradient.h
+include/enlightenment/e_int_config_wallpaper_import.h
 include/enlightenment/e_int_config_window_display.h
 include/enlightenment/e_int_config_window_manipulation.h
 include/enlightenment/e_int_config_winlist.h
 include/enlightenment/e_int_gadcon_config.h
 include/enlightenment/e_int_menus.h
-include/enlightenment/e_int_shelf_config.h
+include/enlightenment/e_int_sh%%PORTOBJFORMAT%%_config.h
 include/enlightenment/e_intl.h
 include/enlightenment/e_ipc.h
 include/enlightenment/e_ipc_codec.h
@@ -102,6 +103,7 @@ include/enlightenment/e_mmx.h
 include/enlightenment/e_module.h
 include/enlightenment/e_moveresize.h
 include/enlightenment/e_msg.h
+include/enlightenment/e_obj_dialog.h
 include/enlightenment/e_object.h
 include/enlightenment/e_pan.h
 include/enlightenment/e_path.h
@@ -113,11 +115,13 @@ include/enlightenment/e_remember.h
 include/enlightenment/e_resist.h
 include/enlightenment/e_scrollframe.h
 include/enlightenment/e_sha1.h
-include/enlightenment/e_shelf.h
+include/enlightenment/e_sh%%PORTOBJFORMAT%%.h
 include/enlightenment/e_signals.h
 include/enlightenment/e_slider.h
+include/enlightenment/e_spectrum.h
 include/enlightenment/e_startup.h
 include/enlightenment/e_stolen.h
+include/enlightenment/e_sys.h
 include/enlightenment/e_table.h
 include/enlightenment/e_test.h
 include/enlightenment/e_theme.h
@@ -129,13 +133,14 @@ include/enlightenment/e_utils.h
 include/enlightenment/e_widget.h
 include/enlightenment/e_widget_button.h
 include/enlightenment/e_widget_check.h
+include/enlightenment/e_widget_color_well.h
 include/enlightenment/e_widget_config_list.h
+include/enlightenment/e_widget_csel.h
+include/enlightenment/e_widget_cslider.h
 include/enlightenment/e_widget_entry.h
-include/enlightenment/e_widget_fileman.h
 include/enlightenment/e_widget_framelist.h
 include/enlightenment/e_widget_frametable.h
 include/enlightenment/e_widget_fsel.h
-include/enlightenment/e_widget_iconsel.h
 include/enlightenment/e_widget_ilist.h
 include/enlightenment/e_widget_image.h
 include/enlightenment/e_widget_label.h
@@ -144,6 +149,7 @@ include/enlightenment/e_widget_preview.h
 include/enlightenment/e_widget_radio.h
 include/enlightenment/e_widget_scrollframe.h
 include/enlightenment/e_widget_slider.h
+include/enlightenment/e_widget_spectrum.h
 include/enlightenment/e_widget_table.h
 include/enlightenment/e_widget_textblock.h
 include/enlightenment/e_widget_tlist.h
@@ -151,45 +157,58 @@ include/enlightenment/e_win.h
 include/enlightenment/e_winlist.h
 include/enlightenment/e_xinerama.h
 include/enlightenment/e_zone.h
-lib/enlightenment/modules/battery/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/battery/module.eap
-lib/enlightenment/modules/battery/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/battery/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/clock/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/clock/module.eap
-lib/enlightenment/modules/clock/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/clock/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/cpufreq/%%MODULE_ARCH%%/freqset
-lib/enlightenment/modules/cpufreq/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/cpufreq/module.eap
-lib/enlightenment/modules/cpufreq/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/cpufreq/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/dropshadow/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/dropshadow/module.eap
-lib/enlightenment/modules/dropshadow/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/dropshadow/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/ibar/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/ibar/module.eap
-lib/enlightenment/modules/ibar/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/ibar/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/ibox/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/ibox/module.eap
-lib/enlightenment/modules/ibox/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/ibox/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/pager/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/pager/module.eap
-lib/enlightenment/modules/pager/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/pager/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/start/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/start/module.eap
-lib/enlightenment/modules/start/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/start/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/temperature/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/temperature/module.eap
-lib/enlightenment/modules/temperature/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/temperature/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/battery/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/battery/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/battery/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/battery/module.desktop
+lib/enlightenment/modules/battery/module.edj
+lib/enlightenment/modules/clock/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/clock/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/clock/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/clock/module.desktop
+lib/enlightenment/modules/clock/module.edj
+lib/enlightenment/modules/cpufreq/%%E17_ARCH%%/freqset
+lib/enlightenment/modules/cpufreq/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/cpufreq/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/cpufreq/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/cpufreq/module.desktop
+lib/enlightenment/modules/cpufreq/module.edj
+lib/enlightenment/modules/dropshadow/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/dropshadow/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/dropshadow/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/dropshadow/module.desktop
+lib/enlightenment/modules/dropshadow/module.edj
+lib/enlightenment/modules/ibar/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/ibar/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/ibar/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/ibar/module.desktop
+lib/enlightenment/modules/ibar/module.edj
+lib/enlightenment/modules/ibox/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/ibox/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/ibox/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/ibox/module.desktop
+lib/enlightenment/modules/ibox/module.edj
+lib/enlightenment/modules/pager/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/pager/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/pager/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/pager/module.desktop
+lib/enlightenment/modules/pager/module.edj
+lib/enlightenment/modules/start/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/start/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/start/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/start/module.desktop
+lib/enlightenment/modules/start/module.edj
+lib/enlightenment/modules/temperature/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/temperature/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/temperature/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/temperature/module.desktop
+lib/enlightenment/modules/temperature/module.edj
 %%DATADIR%%/AUTHORS
 %%DATADIR%%/COPYING
+%%DATADIR%%/data/backgrounds/Blue_Sky_Tree.edj
+%%DATADIR%%/data/backgrounds/Cracked_Earth.edj
+%%DATADIR%%/data/backgrounds/Ivy_Wall.edj
+%%DATADIR%%/data/backgrounds/Ladybug.edj
 %%DATADIR%%/data/fonts/Vera.COPYING
 %%DATADIR%%/data/fonts/Vera.ttf
 %%DATADIR%%/data/fonts/VeraBI.ttf
@@ -203,6 +222,10 @@ lib/enlightenment/modules/temperature/%%MODULE_ARCH%%/module.so
 %%DATADIR%%/data/fonts/VeraSeBd.ttf
 %%DATADIR%%/data/fonts/fonts.alias
 %%DATADIR%%/data/fonts/fonts.dir
+%%DATADIR%%/data/icons/audio_player.png
+%%DATADIR%%/data/icons/video_player.png
+%%DATADIR%%/data/icons/web_browser.png
+%%DATADIR%%/data/icons/xterm.png
 %%DATADIR%%/data/images/button_in.png
 %%DATADIR%%/data/images/button_out.png
 %%DATADIR%%/data/images/e.png
@@ -210,7 +233,7 @@ lib/enlightenment/modules/temperature/%%MODULE_ARCH%%/module.so
 %%DATADIR%%/data/images/test.edj
 %%DATADIR%%/data/images/test.jpg
 %%DATADIR%%/data/images/test.png
-%%DATADIR%%/data/init/init.edj
+%%DATADIR%%/data/init/default.edj
 %%DATADIR%%/data/input_methods/iiimf.imc
 %%DATADIR%%/data/input_methods/scim.imc
 %%DATADIR%%/data/input_methods/uim.imc
@@ -218,6 +241,8 @@ lib/enlightenment/modules/temperature/%%MODULE_ARCH%%/module.so
 %%DATADIR%%/data/other/efm_favorites.tar.gz
 %%DATADIR%%/data/other/icon_example.tar.gz
 %%DATADIR%%/data/themes/default.edj
+%%DATADIR%%/doc/FDO.txt
+%%DATADIR%%/doc/cache.txt
 %%DATADIR%%/doc/documentation.html
 %%DATADIR%%/doc/enlightenment.png
 share/locale/bg/LC_MESSAGES/enlightenment.mo
@@ -243,34 +268,55 @@ share/locale/sv/LC_MESSAGES/enlightenment.mo
 share/locale/zh_CN/LC_MESSAGES/enlightenment.mo
 share/locale/zh_TW/LC_MESSAGES/enlightenment.mo
 share/xsessions/enlightenment.desktop
+@dirrmtry share/xsessions
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
 @dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/data/themes
 @dirrm %%DATADIR%%/data/other
-@dirrm %%DATADIR%%/data/init
 @dirrm %%DATADIR%%/data/input_methods
+@dirrm %%DATADIR%%/data/init
 @dirrm %%DATADIR%%/data/images
+@dirrm %%DATADIR%%/data/icons
 @dirrm %%DATADIR%%/data/fonts
+@dirrm %%DATADIR%%/data/backgrounds
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
-@dirrmtry share/xsessions
-@dirrm lib/enlightenment/modules/temperature/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/temperature/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/temperature
-@dirrm lib/enlightenment/modules/start/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/start/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/start
-@dirrm lib/enlightenment/modules/pager/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/pager/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/pager
-@dirrm lib/enlightenment/modules/ibox/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/ibox/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/ibox
-@dirrm lib/enlightenment/modules/ibar/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/ibar/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/ibar
-@dirrm lib/enlightenment/modules/dropshadow/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/dropshadow/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/dropshadow
-@dirrm lib/enlightenment/modules/cpufreq/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/cpufreq/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/cpufreq
-@dirrm lib/enlightenment/modules/clock/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/clock/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/clock
-@dirrm lib/enlightenment/modules/battery/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/battery/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/battery
 @dirrm lib/enlightenment/modules
 @dirrm lib/enlightenment
 @dirrm include/enlightenment
+@dirrm etc/enlightenment
diff --git a/x11/e17-module-calendar/Makefile b/x11/e17-module-calendar/Makefile
index a0c387313007..96735db318aa 100644
--- a/x11/e17-module-calendar/Makefile
+++ b/x11/e17-module-calendar/Makefile
@@ -6,27 +6,28 @@
 #
 
 PORTNAME=	calendar
-PORTVERSION=	23062006
-PORTREVISION=	2
+PORTVERSION=	20060926
+PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Nice calendar module for e17
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	ecore evas edje eet
+USE_EFL_ESMART=	trans_x11
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+IGNORE=		doesn't compile with recent e17
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +37,10 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e s,`${PRINTF} '\r'`,,g ${WRKSRC}/src/*.[ch]
+
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/e17-module-calendar/distinfo b/x11/e17-module-calendar/distinfo
index 3e641ac6c035..492ca7b8e1dc 100644
--- a/x11/e17-module-calendar/distinfo
+++ b/x11/e17-module-calendar/distinfo
@@ -1,3 +1,3 @@
-MD5 (calendar-23062006.tar.bz2) = 161a388d25c7abd9a73142aad0792f4b
-SHA256 (calendar-23062006.tar.bz2) = 3c96faa84c4776c9a1d970962ade1b36113d2226ed657ee0290fc98328f90e4d
-SIZE (calendar-23062006.tar.bz2) = 554819
+MD5 (calendar-20060926.tar.bz2) = a7c47f3efc02a2688ce4b8cc3fe2a659
+SHA256 (calendar-20060926.tar.bz2) = cdfaa4277375994287149310cf3b2a4be224cd38304ff3909f99006c55ec9331
+SIZE (calendar-20060926.tar.bz2) = 552639
diff --git a/x11/e17-module-calendar/files/patch-src_e_mod_main.c b/x11/e17-module-calendar/files/patch-src_e_mod_main.c
deleted file mode 100644
index 1425a4ef7ec1..000000000000
--- a/x11/e17-module-calendar/files/patch-src_e_mod_main.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/e_mod_main.c.orig	Thu Jul  6 23:11:37 2006
-+++ src/e_mod_main.c	Thu Jul  6 23:13:48 2006
-@@ -47,7 +47,7 @@
-       
-      {
-         
-e_error_dialog_show 
--           ("Module API Error", 
-"Error initializing Module: calendar\n" 
-+           (module, "Module API Error", 
-"Error initializing Module: calendar\n" 
-             "It requires a minimum module API version of: %i.\n" 
-             "The module API advertized by Enlightenment is: %i.\n" 
-             "Aborting module.", 
-E_MODULE_API_VERSION, module->api->version);
-@@ -102,7 +102,7 @@
- EAPI int 
- e_modapi_about(E_Module *module) 
- {
--   
-e_error_dialog_show(D_("Enlightenment calendar Module"), 
-D_("A simple module to give E17 a desktop calendar "));
-+   
-e_error_dialog_show(module, D_("Enlightenment calendar Module"), 
-D_("A simple module to give E17 a desktop calendar "));
-    
-return 1;
- 
-}
- 
diff --git a/x11/e17-module-cpu/Makefile b/x11/e17-module-cpu/Makefile
index fa8c0da18c55..015ecef1a6cb 100644
--- a/x11/e17-module-cpu/Makefile
+++ b/x11/e17-module-cpu/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	cpu
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module which allows users to monitor cpu load
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +33,6 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/e17-module-cpu/distinfo b/x11/e17-module-cpu/distinfo
index 5b0ebc87a26d..7a0ddda8eeeb 100644
--- a/x11/e17-module-cpu/distinfo
+++ b/x11/e17-module-cpu/distinfo
@@ -1,3 +1,3 @@
-MD5 (cpu-20060707.tar.bz2) = c4f763fc3cf8bcac6da1fb90a54c60ac
-SHA256 (cpu-20060707.tar.bz2) = 8b81a3acae9a48613ef4d10ef0f037687e084f572f4f1c7e023739fd7d4acac7
-SIZE (cpu-20060707.tar.bz2) = 298803
+MD5 (cpu-20060926.tar.bz2) = 1cd0a1463cb4e30bcc1bcb65416ed54b
+SHA256 (cpu-20060926.tar.bz2) = a66b516bfb10e0b9094bbc4bc6fdc3c34946cf0873142e7eb151a952e704ab0d
+SIZE (cpu-20060926.tar.bz2) = 261091
diff --git a/x11/e17-module-cpu/files/patch-e_mod_main.c b/x11/e17-module-cpu/files/patch-e_mod_main.c
deleted file mode 100644
index 79b3a8ba3412..000000000000
--- a/x11/e17-module-cpu/files/patch-e_mod_main.c
+++ /dev/null
@@ -1,93 +0,0 @@
---- e_mod_main.c.orig	Sun Jul  9 14:15:46 2006
-+++ e_mod_main.c	Sun Jul  9 15:58:09 2006
-@@ -3,6 +3,12 @@
- #include "e_mod_config.h"
- #include "config.h"
- 
-+#if defined(__FreeBSD__)
-+# include <sys/types.h>
-+# include <sys/sysctl.h>
-+# include <sys/resource.h>
-+#endif
-+
- static Cpu *_cpu_init(E_Module *m);
- static void _cpu_shutdown(Cpu *n);
- static void _cpu_config_menu_new(Cpu *n);
-@@ -460,31 +466,66 @@
-    FILE *f;
-    int cpu = -1;
- 
-+#if defined(__FreeBSD__)
-+   cpu = 1; /* We can't retrive per-cpu statistics, so we'll assume UP arch*/
-+#else
-    if (!(f = fopen("/proc/stat", "r")))
-       return -1;
- 
-    while (fscanf(f, "cp%s %*u %*u %*u %*u %*u %*u %*u %*u\n", (char *)&tmp) == 1)
-       cpu++;
--
-    fclose(f);
-+#endif
-+
-    return cpu;
- }
- 
- static void
- _cpu_face_get_load(Cpu_Face *cf)
- {
-+   int cpu_count;
-+   Edje_Message_Float msg;
-+#if defined(__FreeBSD__)
-+   long cp_time[CPUSTATES];
-+   static long old_used, old_tot;
-+   long new_used, new_tot;
-+   size_t len;
-+#else
-    static unsigned long old_u[4], old_n[4], old_s[4], old_i[4], old_wa[4], old_hi[4], old_si[4];
-    unsigned long new_u, new_n, new_s, new_i, new_wa = 0, new_hi = 0, new_si = 0, ticks_past;
-    int tmp_u, tmp_n, tmp_s, tmp_i;
-    char dummy[16];
-    FILE *stat;
--   int cpu_count;
--   Edje_Message_Float msg;
-+#endif
- 
-    cpu_count = _cpu_face_get_cpu_count(cf);
-    if (cpu_count == -1)
-       return;
- 
-+#if defined(__FreeBSD__)
-+   len = sizeof(cp_time);
-+
-+   if (sysctlbyname("kern.cp_time", &cp_time, &len, NULL, 0) < 0) {
-+	warn("sysctl()");
-+	return;
-+   }
-+
-+   new_used = cp_time[CP_USER] + cp_time[CP_NICE] + cp_time[CP_SYS];
-+   new_tot = new_used + cp_time[CP_IDLE];
-+
-+   if (new_tot == old_tot)
-+	msg.val = 0;
-+   else
-+	msg.val = 100 * (float)(new_used - old_used) / (float)(new_tot - old_tot);
-+
-+   cpu_stats[0] = msg.val;
-+   edje_object_message_send(cf->cpu_obj, EDJE_MESSAGE_FLOAT, 0, &msg);
-+
-+   old_tot = new_tot;
-+   old_used = new_used;
-+
-+#else
-+
-    if (!(stat = fopen("/proc/stat", "r")))
-       return;
- 
-@@ -537,6 +578,7 @@
-         i++;
-      }
-    fclose(stat);
-+#endif
- }
- 
- static void
diff --git a/x11/e17-module-cpu/pkg-plist b/x11/e17-module-cpu/pkg-plist
index 33b6656b67a2..42144630fef3 100644
--- a/x11/e17-module-cpu/pkg-plist
+++ b/x11/e17-module-cpu/pkg-plist
@@ -1,15 +1,11 @@
 lib/enlightenment/modules/cpu/cpu.edj
-lib/enlightenment/modules/cpu/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/cpu/module.eap
-lib/enlightenment/modules/cpu/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/cpu/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/cpu/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/cpu/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/cpu/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/cpu/module.desktop
+lib/enlightenment/modules/cpu/module.edj
 lib/enlightenment/modules/cpu/module_icon.png
-%%NLS%%share/locale/bg/LC_MESSAGES/cpu.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/cpu.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/cpu.mo
-%%NLS%%share/locale/it/LC_MESSAGES/cpu.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/cpu.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/cpu.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/cpu.mo
-@dirrm lib/enlightenment/modules/cpu/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/cpu/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/cpu
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11/e17-module-deskshow/Makefile b/x11/e17-module-deskshow/Makefile
index bf966ed69126..3bd1342191c7 100644
--- a/x11/e17-module-deskshow/Makefile
+++ b/x11/e17-module-deskshow/Makefile
@@ -6,26 +6,25 @@
 #
 
 PORTNAME=	deskshow
-PORTVERSION=	20060728
+PORTVERSION=	20060926
 PORTREVISION=	0
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	E17 module that minimizes all windows to show the desktop
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/e17-module-deskshow/distinfo b/x11/e17-module-deskshow/distinfo
index bbc3c00c9a13..7bf5af25b44c 100644
--- a/x11/e17-module-deskshow/distinfo
+++ b/x11/e17-module-deskshow/distinfo
@@ -1,3 +1,3 @@
-MD5 (deskshow-20060728.tar.bz2) = cb2041f4bc2d5a0bdaf03c85f9efe3ea
-SHA256 (deskshow-20060728.tar.bz2) = c56e569e92d462a87350c67f884ebc23f0dcf390e8f7da1ba03b5662bc44e609
-SIZE (deskshow-20060728.tar.bz2) = 572628
+MD5 (deskshow-20060926.tar.bz2) = ca9f52acca54fb00923bc83344b38349
+SHA256 (deskshow-20060926.tar.bz2) = a689ee52663c4180b8d506a83d35b713fe9f328273627d03c6def55635b6230b
+SIZE (deskshow-20060926.tar.bz2) = 279254
diff --git a/x11/e17-module-deskshow/pkg-plist b/x11/e17-module-deskshow/pkg-plist
index 8e21b5eb7c54..a5528559f717 100644
--- a/x11/e17-module-deskshow/pkg-plist
+++ b/x11/e17-module-deskshow/pkg-plist
@@ -1,8 +1,11 @@
 lib/enlightenment/modules/deskshow/deskshow.edj
-lib/enlightenment/modules/deskshow/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/deskshow/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/deskshow/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/deskshow/module.eap
+lib/enlightenment/modules/deskshow/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/deskshow/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/deskshow/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/deskshow/module.desktop
+lib/enlightenment/modules/deskshow/module.edj
 lib/enlightenment/modules/deskshow/module_icon.png
-@dirrm lib/enlightenment/modules/deskshow/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/deskshow/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/deskshow
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11/e17-module-devian/Makefile b/x11/e17-module-devian/Makefile
index 5f4d9cdb1e9b..5d5e7017d2d6 100644
--- a/x11/e17-module-devian/Makefile
+++ b/x11/e17-module-devian/Makefile
@@ -6,26 +6,26 @@
 #
 
 PORTNAME=	devian
-PORTVERSION=	20060728
+PORTVERSION=	20060926
 PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module that displays images and rss feeds
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+IGNORE=		doesn't compile with recent e17
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/e17-module-devian/distinfo b/x11/e17-module-devian/distinfo
index a556bbebfa34..7268ad264ee3 100644
--- a/x11/e17-module-devian/distinfo
+++ b/x11/e17-module-devian/distinfo
@@ -1,3 +1,3 @@
-MD5 (devian-20060728.tar.bz2) = 0a89a14c06689bf77fd5eb485922e879
-SHA256 (devian-20060728.tar.bz2) = c3bbaf2fa67dcc2075635368ede0aae4a20c3f0d3b08ae60295aeb5ed1291875
-SIZE (devian-20060728.tar.bz2) = 1115532
+MD5 (devian-20060926.tar.bz2) = ee8a004b60761c2e1f50d0b02cf7ba06
+SHA256 (devian-20060926.tar.bz2) = f037f93eac25e71003a56cffd0d8c383c096260dea65e4acf2c868615156e37d
+SIZE (devian-20060926.tar.bz2) = 1138740
diff --git a/x11/e17-module-engage/Makefile b/x11/e17-module-engage/Makefile
index 9ccc1763fc3d..a7ef92b84a7b 100644
--- a/x11/e17-module-engage/Makefile
+++ b/x11/e17-module-engage/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://mbsd.msk.ru/dist/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Alternative e17 application launcher with tray support
 
 BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
@@ -31,4 +31,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 
 PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
 
+IGNORE=		doesn't compile with recent e17
+
 .include <bsd.port.mk>
diff --git a/x11/e17-module-eveil/Makefile b/x11/e17-module-eveil/Makefile
index e57a1dd80d62..ab0099dd2dcf 100644
--- a/x11/e17-module-eveil/Makefile
+++ b/x11/e17-module-eveil/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	eveil
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module to set alarms and timers
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +33,6 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/e17-module-eveil/distinfo b/x11/e17-module-eveil/distinfo
index e32f420f507b..bf3f9f818699 100644
--- a/x11/e17-module-eveil/distinfo
+++ b/x11/e17-module-eveil/distinfo
@@ -1,3 +1,3 @@
-MD5 (eveil-20060707.tar.bz2) = 96ad35d8454ca13507f54153947a17aa
-SHA256 (eveil-20060707.tar.bz2) = 2c8361145a7d1ef66e6576adbdc84fbbfce03a368ddb2c852f660f0b1a1d48ee
-SIZE (eveil-20060707.tar.bz2) = 432968
+MD5 (eveil-20060926.tar.bz2) = dc87b851c847a84d4a85825ea84c92e2
+SHA256 (eveil-20060926.tar.bz2) = e9d3222d93c86415522ab05bbf3facaed7c6143cf998c993a0fc2815efe942e5
+SIZE (eveil-20060926.tar.bz2) = 440169
diff --git a/x11/e17-module-eveil/pkg-plist b/x11/e17-module-eveil/pkg-plist
index 55039b483dd8..4ef65ffbf605 100644
--- a/x11/e17-module-eveil/pkg-plist
+++ b/x11/e17-module-eveil/pkg-plist
@@ -1,11 +1,21 @@
+lib/enlightenment/modules/eveil/alarm_disabled.png
+lib/enlightenment/modules/eveil/alarm_enabled.png
+lib/enlightenment/modules/eveil/alarm_snooze.png
 lib/enlightenment/modules/eveil/eveil.edc
 lib/enlightenment/modules/eveil/eveil.edj
-lib/enlightenment/modules/eveil/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/eveil/module.eap
-lib/enlightenment/modules/eveil/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/eveil/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/eveil/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/eveil/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/eveil/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/eveil/module.desktop
+lib/enlightenment/modules/eveil/module.edj
+lib/enlightenment/modules/eveil/timer_disabled.png
+lib/enlightenment/modules/eveil/timer_enabled.png
 lib/enlightenment/modules/eveil/vera.ttf
+%%NLS%%share/locale/eo/LC_MESSAGES/eveil.mo
 %%NLS%%share/locale/it/LC_MESSAGES/eveil.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/eveil.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/eveil.mo
-@dirrm lib/enlightenment/modules/eveil/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/eveil/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/eveil
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11/e17-module-flame/Makefile b/x11/e17-module-flame/Makefile
index 52927d0fd452..f41380ec4e8f 100644
--- a/x11/e17-module-flame/Makefile
+++ b/x11/e17-module-flame/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	flame
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module which draws flames on your desktop
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +33,6 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/e17-module-flame/distinfo b/x11/e17-module-flame/distinfo
index 1a1e925dc9a8..e2b2a353bafc 100644
--- a/x11/e17-module-flame/distinfo
+++ b/x11/e17-module-flame/distinfo
@@ -1,3 +1,3 @@
-MD5 (flame-20060707.tar.bz2) = 7fe367c4ace70b7add9a8448664dcf45
-SHA256 (flame-20060707.tar.bz2) = 0e0825c9a0208eedf4d48831ce10bbf4eed0c8bbd0125124f52240b3484bb413
-SIZE (flame-20060707.tar.bz2) = 244132
+MD5 (flame-20060926.tar.bz2) = e7ebdd2606517342e0a35ebfbb996c62
+SHA256 (flame-20060926.tar.bz2) = 3aa971dcbd72023ad14a491d0a338f337a5d1509f1e47e5c0cff9cbfefff6fe5
+SIZE (flame-20060926.tar.bz2) = 250902
diff --git a/x11/e17-module-flame/pkg-plist b/x11/e17-module-flame/pkg-plist
index 9ed88f7d9756..716fee610674 100644
--- a/x11/e17-module-flame/pkg-plist
+++ b/x11/e17-module-flame/pkg-plist
@@ -1,11 +1,16 @@
-lib/enlightenment/modules/flame/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/flame/module.eap
-lib/enlightenment/modules/flame/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/flame/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/flame/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/flame/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/flame/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/flame/module.desktop
+lib/enlightenment/modules/flame/module.edj
 lib/enlightenment/modules/flame/module_icon.png
 %%NLS%%share/locale/eo/LC_MESSAGES/flame.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/flame.mo
 %%NLS%%share/locale/it/LC_MESSAGES/flame.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/flame.mo
-@dirrm lib/enlightenment/modules/flame/%%MODULE_ARCH%%
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+@dirrm lib/enlightenment/modules/flame/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/flame
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11/e17-module-language/Makefile b/x11/e17-module-language/Makefile
index 593b48b4e9ea..25ddecefa9d3 100644
--- a/x11/e17-module-language/Makefile
+++ b/x11/e17-module-language/Makefile
@@ -6,27 +6,26 @@
 #
 
 PORTNAME=	language
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module to switch XKB input language
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-LIB_DEPENDS=	exml.1:${PORTSDIR}/textproc/exml
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje exml
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/e17-module-language/distinfo b/x11/e17-module-language/distinfo
index bcc0a4c24107..385ea90a9d6f 100644
--- a/x11/e17-module-language/distinfo
+++ b/x11/e17-module-language/distinfo
@@ -1,3 +1,3 @@
-MD5 (language-20060707.tar.bz2) = 23ddc1567ef8c3cded46e69faca53b88
-SHA256 (language-20060707.tar.bz2) = 6a21fa661476c265898e1a952a65b574dfa91353c5d04e84b278a2e89195908f
-SIZE (language-20060707.tar.bz2) = 394068
+MD5 (language-20060926.tar.bz2) = 701d7dddddfa4ed4fcc0a11422cd5fb0
+SHA256 (language-20060926.tar.bz2) = f7ff47aa19a5015046bea49d6ac999bd9b8eba513856242f86614efc2d9d77fb
+SIZE (language-20060926.tar.bz2) = 422313
diff --git a/x11/e17-module-language/pkg-plist b/x11/e17-module-language/pkg-plist
index c2b6e7a54141..b4a26ed34c97 100644
--- a/x11/e17-module-language/pkg-plist
+++ b/x11/e17-module-language/pkg-plist
@@ -1,6 +1,6 @@
-lib/enlightenment/modules/language/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/language/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/language/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/language/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/language/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/language/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/language/images/AFG_flag.png
 lib/enlightenment/modules/language/images/ALB_flag.png
 lib/enlightenment/modules/language/images/AND_flag.png
@@ -72,11 +72,14 @@ lib/enlightenment/modules/language/images/UZB_flag.png
 lib/enlightenment/modules/language/images/VNM_flag.png
 lib/enlightenment/modules/language/images/ZAR_flag.png
 lib/enlightenment/modules/language/images/unknown_flag.png
-lib/enlightenment/modules/language/language.edc
 lib/enlightenment/modules/language/language.edj
-lib/enlightenment/modules/language/module.eap
+lib/enlightenment/modules/language/module.desktop
+lib/enlightenment/modules/language/module.edj
+share/locale/eo/LC_MESSAGES/language.mo
+share/locale/it/LC_MESSAGES/language.mo
+share/locale/sv/LC_MESSAGES/language.mo
 @dirrm lib/enlightenment/modules/language/images
-@dirrm lib/enlightenment/modules/language/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/language/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/language
 @dirrmtry lib/enlightenment/modules
 @dirrmtry lib/enlightenment
diff --git a/x11/e17-module-mail/Makefile b/x11/e17-module-mail/Makefile
index 0740274cc5e6..d002958813c8 100644
--- a/x11/e17-module-mail/Makefile
+++ b/x11/e17-module-mail/Makefile
@@ -6,26 +6,26 @@
 #
 
 PORTNAME=	mail
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module to check your mailboxes (like xbiff does)
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/e17-module-mail/distinfo b/x11/e17-module-mail/distinfo
index ee79645fe7e4..ef41257f2c56 100644
--- a/x11/e17-module-mail/distinfo
+++ b/x11/e17-module-mail/distinfo
@@ -1,3 +1,3 @@
-MD5 (mail-20060707.tar.bz2) = 5fb424681cf466841f647dba0cec2c5c
-SHA256 (mail-20060707.tar.bz2) = 6c726c376672a30bd43e94eb5ad216b41897d6b27f8ceb0f51eef6a854ad58e6
-SIZE (mail-20060707.tar.bz2) = 269002
+MD5 (mail-20060926.tar.bz2) = d63660b2e38d82a212684420024458bb
+SHA256 (mail-20060926.tar.bz2) = b526a1d4d3cbb5b0e54d22b9cc87b4462d0bda6ba9a06450f7e8a1d95885d898
+SIZE (mail-20060926.tar.bz2) = 309337
diff --git a/x11/e17-module-mail/pkg-plist b/x11/e17-module-mail/pkg-plist
index e9882ccdf3f9..d32b8e0e82c8 100644
--- a/x11/e17-module-mail/pkg-plist
+++ b/x11/e17-module-mail/pkg-plist
@@ -1,9 +1,12 @@
+lib/enlightenment/modules/mail/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/mail/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/mail/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/mail/mail.edj
-lib/enlightenment/modules/mail/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/mail/module.eap
-lib/enlightenment/modules/mail/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/mail/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/mail/module.desktop
+lib/enlightenment/modules/mail/module.edj
 lib/enlightenment/modules/mail/module_icon.png
-lib/enlightenment/modules/mail/newmail.png
-@dirrm lib/enlightenment/modules/mail/%%MODULE_ARCH%%
+share/locale/it/LC_MESSAGES/mail.mo
+@dirrm lib/enlightenment/modules/mail/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/mail
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11/e17-module-mem/Makefile b/x11/e17-module-mem/Makefile
index ae7c42ca79ed..623362f4038e 100644
--- a/x11/e17-module-mem/Makefile
+++ b/x11/e17-module-mem/Makefile
@@ -6,27 +6,25 @@
 #
 
 PORTNAME=	mem
-PORTVERSION=	23062006
-PORTREVISION=	2
+PORTVERSION=	20060926
+PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 memory monitoring module
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +34,6 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/e17-module-mem/distinfo b/x11/e17-module-mem/distinfo
index 9d89499b0331..cf64d06cdfc1 100644
--- a/x11/e17-module-mem/distinfo
+++ b/x11/e17-module-mem/distinfo
@@ -1,3 +1,3 @@
-MD5 (mem-23062006.tar.bz2) = dff9e3cad99d050232dc4d0df0a9c201
-SHA256 (mem-23062006.tar.bz2) = c0466c3d9449fd85c935c99ab38d470bfd0ff62d8e30cb37fd23765bad6978dd
-SIZE (mem-23062006.tar.bz2) = 426819
+MD5 (mem-20060926.tar.bz2) = 8cb953cc229a1864336ea6e4e547aef1
+SHA256 (mem-20060926.tar.bz2) = eed0876ef948eeabf15c67bfdb8e08d6ba9b6a5479b1ffd60cd29adb69793c49
+SIZE (mem-20060926.tar.bz2) = 389496
diff --git a/x11/e17-module-mem/files/patch-e_mod_main.c b/x11/e17-module-mem/files/patch-e_mod_main.c
deleted file mode 100644
index 045b3ea456f8..000000000000
--- a/x11/e17-module-mem/files/patch-e_mod_main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- e_mod_main.c.orig	Thu Jul  6 22:43:05 2006
-+++ e_mod_main.c	Thu Jul  6 22:43:18 2006
-@@ -339,7 +339,7 @@
- EAPI int
- e_modapi_about(E_Module *m) 
- {
--   e_module_dialog_show(D_("Enlightenment Mem Monitor Module"), 
-+   e_module_dialog_show(m, D_("Enlightenment Mem Monitor Module"), 
- 			D_("This module is used to monitor memory."));
-    return 1;   
- }
diff --git a/x11/e17-module-mem/pkg-plist b/x11/e17-module-mem/pkg-plist
index 6614afa2ae08..aae66c519dca 100644
--- a/x11/e17-module-mem/pkg-plist
+++ b/x11/e17-module-mem/pkg-plist
@@ -1,38 +1,19 @@
-lib/enlightenment/modules/mem/DejaVuSansMono.ttf
-lib/enlightenment/modules/mem/mem.edc
+lib/enlightenment/modules/mem/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/mem/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/mem/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/mem/mem.edj
-lib/enlightenment/modules/mem/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/mem/module.eap
-lib/enlightenment/modules/mem/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/mem/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/mem/module.desktop
+lib/enlightenment/modules/mem/module.edj
 lib/enlightenment/modules/mem/module_icon.png
-lib/enlightenment/modules/mem/real_00.png
-lib/enlightenment/modules/mem/real_01.png
-lib/enlightenment/modules/mem/real_02.png
-lib/enlightenment/modules/mem/real_03.png
-lib/enlightenment/modules/mem/real_04.png
-lib/enlightenment/modules/mem/real_05.png
-lib/enlightenment/modules/mem/real_06.png
-lib/enlightenment/modules/mem/real_07.png
-lib/enlightenment/modules/mem/real_08.png
-lib/enlightenment/modules/mem/real_09.png
-lib/enlightenment/modules/mem/real_10.png
-lib/enlightenment/modules/mem/swap_00.png
-lib/enlightenment/modules/mem/swap_01.png
-lib/enlightenment/modules/mem/swap_02.png
-lib/enlightenment/modules/mem/swap_03.png
-lib/enlightenment/modules/mem/swap_04.png
-lib/enlightenment/modules/mem/swap_05.png
-lib/enlightenment/modules/mem/swap_06.png
-lib/enlightenment/modules/mem/swap_07.png
-lib/enlightenment/modules/mem/swap_08.png
-lib/enlightenment/modules/mem/swap_09.png
-lib/enlightenment/modules/mem/swap_10.png
 %%NLS%%share/locale/eo/LC_MESSAGES/mem.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/mem.mo
 %%NLS%%share/locale/it/LC_MESSAGES/mem.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/mem.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/mem.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/mem.mo
-@dirrm lib/enlightenment/modules/mem/%%MODULE_ARCH%%
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+@dirrm lib/enlightenment/modules/mem/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/mem
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11/e17-module-mixer/Makefile b/x11/e17-module-mixer/Makefile
new file mode 100644
index 000000000000..c979be1591a9
--- /dev/null
+++ b/x11/e17-module-mixer/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	e17-module-mixer
+# Date created:		30 September 2006
+# Whom:			Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	mixer
+PORTVERSION=	20060926
+CATEGORIES=	x11
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+PKGNAMEPREFIX=	e17-module-
+DISTNAME=	${PORTNAME}-${PORTVERSION}
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	An e17 module to adjust audio mixer settings
+
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
+GNU_CONFIGURE=	yes
+
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/e17-module-mixer/distinfo b/x11/e17-module-mixer/distinfo
new file mode 100644
index 000000000000..058aebf14405
--- /dev/null
+++ b/x11/e17-module-mixer/distinfo
@@ -0,0 +1,3 @@
+MD5 (mixer-20060926.tar.bz2) = 3652211f1b7fe321440de97d8801f5d0
+SHA256 (mixer-20060926.tar.bz2) = 0bbacb948166eb5324c602ffd741d1597aea07c69e51c2061d84fcb6638d2a1d
+SIZE (mixer-20060926.tar.bz2) = 289454
diff --git a/x11/e17-module-mixer/pkg-descr b/x11/e17-module-mixer/pkg-descr
new file mode 100644
index 000000000000..f631d3706434
--- /dev/null
+++ b/x11/e17-module-mixer/pkg-descr
@@ -0,0 +1,4 @@
+This e17 module allows users to adjust the sound mixer settings.
+
+Author:	Christopher 'devilhorns' Michael <devilhorns@comcast.net>
+WWW:	http://www.enlightenment.org
diff --git a/x11/e17-module-mixer/pkg-plist b/x11/e17-module-mixer/pkg-plist
new file mode 100644
index 000000000000..7b5d44decf2c
--- /dev/null
+++ b/x11/e17-module-mixer/pkg-plist
@@ -0,0 +1,9 @@
+lib/enlightenment/modules/mixer/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/mixer/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/mixer/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/mixer/mixer.edj
+lib/enlightenment/modules/mixer/module.eap
+@dirrm lib/enlightenment/modules/mixer/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/mixer
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11/e17-module-moon/Makefile b/x11/e17-module-moon/Makefile
index aaeb04b9a162..f442da8955c6 100644
--- a/x11/e17-module-moon/Makefile
+++ b/x11/e17-module-moon/Makefile
@@ -6,27 +6,25 @@
 #
 
 PORTNAME=	moon
-PORTVERSION=	23062006
-PORTREVISION=	2
+PORTVERSION=	20060926
+PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 Moon Clock module
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +34,6 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/e17-module-moon/distinfo b/x11/e17-module-moon/distinfo
index 8a1a8789bb68..872df226239c 100644
--- a/x11/e17-module-moon/distinfo
+++ b/x11/e17-module-moon/distinfo
@@ -1,3 +1,3 @@
-MD5 (moon-23062006.tar.bz2) = 6db65094f895971195fb1a1e5c792cf1
-SHA256 (moon-23062006.tar.bz2) = 83a7a52e60e9a603b53a1eef0c5798e1953a13951188a2a9691c9026c931c78b
-SIZE (moon-23062006.tar.bz2) = 646800
+MD5 (moon-20060926.tar.bz2) = f967701d2f031631d3b0a63b58df76c3
+SHA256 (moon-20060926.tar.bz2) = 3319d37fcd7fdfe0bf65aeb5d9016e3660e730263a97d18538e397ea5e2d50c0
+SIZE (moon-20060926.tar.bz2) = 672466
diff --git a/x11/e17-module-moon/files/patch-src__e_mod_main.c b/x11/e17-module-moon/files/patch-src__e_mod_main.c
deleted file mode 100644
index 1b64751d1dbd..000000000000
--- a/x11/e17-module-moon/files/patch-src__e_mod_main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/e_mod_main.c.orig	Sat Jun  3 12:35:27 2006
-+++ src/e_mod_main.c	Thu Jul  6 23:01:10 2006
-@@ -124,7 +124,7 @@
- 
-    snprintf(title, sizeof(title), "%s %s", D_("Moon Clock Module"), 
- 	 PACKAGE_VERSION);
--   e_module_dialog_show(title, 
-+   e_module_dialog_show(module, title, 
- 	 D_("Display current phase of the moon ala e16 E-MoonClock")); 
-    return 1;
- }
diff --git a/x11/e17-module-moon/pkg-plist b/x11/e17-module-moon/pkg-plist
index 3c1c40aadf35..9e45a173c835 100644
--- a/x11/e17-module-moon/pkg-plist
+++ b/x11/e17-module-moon/pkg-plist
@@ -1,11 +1,14 @@
-lib/enlightenment/modules/moon/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/moon/module.eap
-lib/enlightenment/modules/moon/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/moon/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/moon/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/moon/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/moon/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/moon/module.desktop
+lib/enlightenment/modules/moon/module.edj
 lib/enlightenment/modules/moon/moon.edj
 %%NLS%%share/locale/eo/LC_MESSAGES/moon.mo
 %%NLS%%share/locale/it/LC_MESSAGES/moon.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/moon.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/moon.mo
-@dirrm lib/enlightenment/modules/moon/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/moon/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/moon
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11/e17-module-rain/Makefile b/x11/e17-module-rain/Makefile
index 2bf4b5f17222..77f5f19018dc 100644
--- a/x11/e17-module-rain/Makefile
+++ b/x11/e17-module-rain/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	rain
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module which draws raindrops on your screen
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +33,6 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/e17-module-rain/distinfo b/x11/e17-module-rain/distinfo
index 84ba93d6b7e8..1df8e3b07846 100644
--- a/x11/e17-module-rain/distinfo
+++ b/x11/e17-module-rain/distinfo
@@ -1,3 +1,3 @@
-MD5 (rain-20060707.tar.bz2) = 603ae7f4c58b27d0be633030fbbb88cb
-SHA256 (rain-20060707.tar.bz2) = 0901114c5c4477f4c60480d4c03475a2e8558930bc60668a08897b77ad2712a0
-SIZE (rain-20060707.tar.bz2) = 309011
+MD5 (rain-20060926.tar.bz2) = 4505ab2f405c09191fb3dace3160ef88
+SHA256 (rain-20060926.tar.bz2) = 5f7b172c99518b1bee0d9a79c150e25cdbf289e1506bedf72bbe0f2c0eee212f
+SIZE (rain-20060926.tar.bz2) = 315366
diff --git a/x11/e17-module-rain/pkg-plist b/x11/e17-module-rain/pkg-plist
index 7d2e9998e063..fad84f556792 100644
--- a/x11/e17-module-rain/pkg-plist
+++ b/x11/e17-module-rain/pkg-plist
@@ -2,10 +2,11 @@ lib/enlightenment/modules/rain/cloud.png
 lib/enlightenment/modules/rain/drop-l.png
 lib/enlightenment/modules/rain/drop-m.png
 lib/enlightenment/modules/rain/drop-s.png
-lib/enlightenment/modules/rain/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/rain/module.eap
-lib/enlightenment/modules/rain/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/rain/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/rain/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/rain/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/rain/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/rain/module.desktop
+lib/enlightenment/modules/rain/module.edj
 lib/enlightenment/modules/rain/module_icon.png
 %%NLS%%share/locale/eo/LC_MESSAGES/rain.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/rain.mo
@@ -13,5 +14,9 @@ lib/enlightenment/modules/rain/module_icon.png
 %%NLS%%share/locale/it/LC_MESSAGES/rain.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/rain.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/rain.mo
-@dirrm lib/enlightenment/modules/rain/%%MODULE_ARCH%%
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+@dirrm lib/enlightenment/modules/rain/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/rain
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11/e17-module-screenshot/Makefile b/x11/e17-module-screenshot/Makefile
index aaddd8aacd42..42347fec4de2 100644
--- a/x11/e17-module-screenshot/Makefile
+++ b/x11/e17-module-screenshot/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	screenshot
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module which allows users to take screenshots
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
 OPTIONS=	IMAGIC "Use ImageMagick" on \
 		SCROT "Use Scrot" off
@@ -34,10 +31,12 @@ OPTIONS=	IMAGIC "Use ImageMagick" on \
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_IMAGIC)
+BUILD_DEPENDS+=	import:${PORTSDIR}/graphics/ImageMagick
 RUN_DEPENDS+=	import:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 .if defined(WITH_SCROT)
+BUILD_DEPENDS+=	scrot:${PORTSDIR}/graphics/scrot
 RUN_DEPENDS+=	scrot:${PORTSDIR}/graphics/scrot
 .endif
 
@@ -49,4 +48,5 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
 .include <bsd.port.post.mk>
diff --git a/x11/e17-module-screenshot/distinfo b/x11/e17-module-screenshot/distinfo
index 0836f4795b07..fc042b17e8d8 100644
--- a/x11/e17-module-screenshot/distinfo
+++ b/x11/e17-module-screenshot/distinfo
@@ -1,3 +1,3 @@
-MD5 (screenshot-20060707.tar.bz2) = 9171aaf311bcf74762f42c6317045813
-SHA256 (screenshot-20060707.tar.bz2) = 3c1dbfb464e4f440b2d9dc43387563e22cf2a20f94ded7f56930470ddce13bd8
-SIZE (screenshot-20060707.tar.bz2) = 364926
+MD5 (screenshot-20060926.tar.bz2) = 59d9780357c3f41676474800d274d6b9
+SHA256 (screenshot-20060926.tar.bz2) = fc5f809d6af7da0a65033e28a27f91db424e716c46574f449a3300ba8a73277f
+SIZE (screenshot-20060926.tar.bz2) = 373270
diff --git a/x11/e17-module-screenshot/pkg-plist b/x11/e17-module-screenshot/pkg-plist
index 5cdca64316e5..190a2187bff1 100644
--- a/x11/e17-module-screenshot/pkg-plist
+++ b/x11/e17-module-screenshot/pkg-plist
@@ -1,12 +1,10 @@
-lib/enlightenment/modules/screenshot/screenshot.edj
-lib/enlightenment/modules/screenshot/e17_titlebar_glint1.png
-lib/enlightenment/modules/screenshot/e17_titlebar_glint2.png
-lib/enlightenment/modules/screenshot/e17_titlebar_glint3.png
-lib/enlightenment/modules/screenshot/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/screenshot/module.eap
-lib/enlightenment/modules/screenshot/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/screenshot/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/screenshot/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/screenshot/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/screenshot/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/screenshot/module.desktop
+lib/enlightenment/modules/screenshot/module.edj
 lib/enlightenment/modules/screenshot/module_icon.png
+lib/enlightenment/modules/screenshot/screenshot.edj
 %%NLS%%share/locale/eo/LC_MESSAGES/screenshot.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/screenshot.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/screenshot.mo
@@ -14,5 +12,9 @@ lib/enlightenment/modules/screenshot/module_icon.png
 %%NLS%%share/locale/ja/LC_MESSAGES/screenshot.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/screenshot.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/screenshot.mo
-@dirrm lib/enlightenment/modules/screenshot/%%MODULE_ARCH%%
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+@dirrm lib/enlightenment/modules/screenshot/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/screenshot
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11/e17-module-slideshow/Makefile b/x11/e17-module-slideshow/Makefile
index 6e498a894b5a..5b9ac9375aae 100644
--- a/x11/e17-module-slideshow/Makefile
+++ b/x11/e17-module-slideshow/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	slideshow
-PORTVERSION=	20060728
+PORTVERSION=	20060926
 PORTREVISION=	0
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module which cycles desktop backgrounds
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +33,6 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/e17-module-slideshow/distinfo b/x11/e17-module-slideshow/distinfo
index 148b9f6eb244..973d1ebc4ca0 100644
--- a/x11/e17-module-slideshow/distinfo
+++ b/x11/e17-module-slideshow/distinfo
@@ -1,3 +1,3 @@
-MD5 (slideshow-20060728.tar.bz2) = fba7f99ab060e90f46647e8552fc01c7
-SHA256 (slideshow-20060728.tar.bz2) = f612d49d96aff81858c85d9884bca61bdcd0527c729120922817d8f12a76f6d0
-SIZE (slideshow-20060728.tar.bz2) = 249348
+MD5 (slideshow-20060926.tar.bz2) = 26e082dfe8aeb43d0fb1f56fcf27cee4
+SHA256 (slideshow-20060926.tar.bz2) = 9b709121621489fe84d9941fc2fd276800ddfe9be6b763f7242ebc00f79ea295
+SIZE (slideshow-20060926.tar.bz2) = 254831
diff --git a/x11/e17-module-slideshow/pkg-plist b/x11/e17-module-slideshow/pkg-plist
index ca6c7797c4f8..de126aa1c465 100644
--- a/x11/e17-module-slideshow/pkg-plist
+++ b/x11/e17-module-slideshow/pkg-plist
@@ -1,7 +1,8 @@
-lib/enlightenment/modules/slideshow/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/slideshow/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/slideshow/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/slideshow/module.eap
+lib/enlightenment/modules/slideshow/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/slideshow/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/slideshow/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/slideshow/module.desktop
+lib/enlightenment/modules/slideshow/module.edj
 lib/enlightenment/modules/slideshow/module_icon.png
 lib/enlightenment/modules/slideshow/slideshow.edj
 %%NLS%%share/locale/eo/LC_MESSAGES/slideshow.mo
@@ -10,5 +11,9 @@ lib/enlightenment/modules/slideshow/slideshow.edj
 %%NLS%%share/locale/it/LC_MESSAGES/slideshow.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/slideshow.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/slideshow.mo
-@dirrm lib/enlightenment/modules/slideshow/%%MODULE_ARCH%%
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+@dirrm lib/enlightenment/modules/slideshow/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/slideshow
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11/e17-module-snow/Makefile b/x11/e17-module-snow/Makefile
index 91472f0604ce..f01e84a9df7a 100644
--- a/x11/e17-module-snow/Makefile
+++ b/x11/e17-module-snow/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	snow
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 module which draws snowflakes on your screen
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +33,6 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/e17-module-snow/distinfo b/x11/e17-module-snow/distinfo
index 2226f0d968cb..b2e53b54dd7b 100644
--- a/x11/e17-module-snow/distinfo
+++ b/x11/e17-module-snow/distinfo
@@ -1,3 +1,3 @@
-MD5 (snow-20060707.tar.bz2) = 138b18e7afc538955d2409727ad3507e
-SHA256 (snow-20060707.tar.bz2) = ff064eef0bee90ea7f40c5d10c27a6e0e6392657bc47f632a6568fac792e112b
-SIZE (snow-20060707.tar.bz2) = 241756
+MD5 (snow-20060926.tar.bz2) = c5dbea13f4151b4d0851d1b083c90732
+SHA256 (snow-20060926.tar.bz2) = 4372038f755e2e99f53a3e367ff175a634b94f618ad47533dbd68892f5f22490
+SIZE (snow-20060926.tar.bz2) = 248633
diff --git a/x11/e17-module-snow/pkg-plist b/x11/e17-module-snow/pkg-plist
index 5437ff0125b6..d3d75cd2e5a8 100644
--- a/x11/e17-module-snow/pkg-plist
+++ b/x11/e17-module-snow/pkg-plist
@@ -1,10 +1,11 @@
 lib/enlightenment/modules/snow/flake-l.png
 lib/enlightenment/modules/snow/flake-m.png
 lib/enlightenment/modules/snow/flake-s.png
-lib/enlightenment/modules/snow/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/snow/module.eap
-lib/enlightenment/modules/snow/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/snow/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/snow/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/snow/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/snow/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/snow/module.desktop
+lib/enlightenment/modules/snow/module.edj
 lib/enlightenment/modules/snow/module_icon.png
 lib/enlightenment/modules/snow/tree.png
 %%NLS%%share/locale/eo/LC_MESSAGES/snow.mo
@@ -13,5 +14,9 @@ lib/enlightenment/modules/snow/tree.png
 %%NLS%%share/locale/it/LC_MESSAGES/snow.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/snow.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/snow.mo
-@dirrm lib/enlightenment/modules/snow/%%MODULE_ARCH%%
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+@dirrm lib/enlightenment/modules/snow/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/snow
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11/e17-module-uptime/Makefile b/x11/e17-module-uptime/Makefile
index 2b279b4a2bd2..c977b63d67e7 100644
--- a/x11/e17-module-uptime/Makefile
+++ b/x11/e17-module-uptime/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	uptime
-PORTVERSION=	20060707
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 uptime and load average indicator module
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +33,6 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/e17-module-uptime/distinfo b/x11/e17-module-uptime/distinfo
index 851ccb9f799e..5257ad423257 100644
--- a/x11/e17-module-uptime/distinfo
+++ b/x11/e17-module-uptime/distinfo
@@ -1,3 +1,3 @@
-MD5 (uptime-20060707.tar.bz2) = 83d8f63ee637ddcc3eb8cbff01e1a50d
-SHA256 (uptime-20060707.tar.bz2) = 9a4713e04faa55c309cf03d7f431b81ee6ddc36a238f696b7a132a0099926783
-SIZE (uptime-20060707.tar.bz2) = 275549
+MD5 (uptime-20060926.tar.bz2) = f39c2c7643adef2456e4e3994a3696d0
+SHA256 (uptime-20060926.tar.bz2) = 145ce4451b0df08985b691fbaa4fe783cac32a5b2bab007f093ebfb3cbfb5bec
+SIZE (uptime-20060926.tar.bz2) = 285109
diff --git a/x11/e17-module-uptime/pkg-plist b/x11/e17-module-uptime/pkg-plist
index 9ba376e9e8dd..2d2960917bac 100644
--- a/x11/e17-module-uptime/pkg-plist
+++ b/x11/e17-module-uptime/pkg-plist
@@ -1,13 +1,21 @@
-lib/enlightenment/modules/uptime/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/uptime/module.eap
-lib/enlightenment/modules/uptime/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/uptime/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/uptime/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/uptime/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/uptime/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/uptime/module.desktop
+lib/enlightenment/modules/uptime/module.edj
 lib/enlightenment/modules/uptime/uptime.edj
-%%NLS%%share/locale/bg/LC_MESSAGES/uptime.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/uptime.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/uptime.mo
-%%NLS%%share/locale/it/LC_MESSAGES/uptime.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/uptime.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/uptime.mo
-@dirrm lib/enlightenment/modules/uptime/%%MODULE_ARCH%%
-@dirrm lib/enlightenment/modules/uptime
+lib/enlightenment/modules/uptime/uptime.png
+share/locale/bg/LC_MESSAGES/uptime.mo
+share/locale/eo/LC_MESSAGES/uptime.mo
+share/locale/fi/LC_MESSAGES/uptime.mo
+share/locale/it/LC_MESSAGES/uptime.mo
+share/locale/ja/LC_MESSAGES/uptime.mo
+share/locale/sv/LC_MESSAGES/uptime.mo
+share/nls/POSIX
+share/nls/en_US.US-ASCII
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry lib/enlightenment/modules/uptime/%%E17_ARCH%%
+@dirrmtry lib/enlightenment/modules/uptime
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11/e17-module-weather/Makefile b/x11/e17-module-weather/Makefile
index 8d4ccdd37b55..458c9d203ff7 100644
--- a/x11/e17-module-weather/Makefile
+++ b/x11/e17-module-weather/Makefile
@@ -6,27 +6,25 @@
 #
 
 PORTNAME=	weather
-PORTVERSION=	23062006
-PORTREVISION=	2
+PORTVERSION=	20060926
+PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 weather module
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +34,6 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/e17-module-weather/distinfo b/x11/e17-module-weather/distinfo
index 286d80bf9239..51bc6124cecc 100644
--- a/x11/e17-module-weather/distinfo
+++ b/x11/e17-module-weather/distinfo
@@ -1,3 +1,3 @@
-MD5 (weather-23062006.tar.bz2) = ea95150b91bd794e1c4d2381e4729a80
-SHA256 (weather-23062006.tar.bz2) = 4847c88494e6f33424911464f91cfe696ae82e70ed512fd900e70a1123ce3ea8
-SIZE (weather-23062006.tar.bz2) = 941161
+MD5 (weather-20060926.tar.bz2) = 6bda3b61f7f026040865a262305fc9a4
+SHA256 (weather-20060926.tar.bz2) = 02371844b0d466d7a90ad47bef5e40470dec77aff07c8635cea4cf985ba384d3
+SIZE (weather-20060926.tar.bz2) = 948459
diff --git a/x11/e17-module-weather/files/patch-e_mod_main.c b/x11/e17-module-weather/files/patch-e_mod_main.c
deleted file mode 100644
index 64cfef8a20e0..000000000000
--- a/x11/e17-module-weather/files/patch-e_mod_main.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- e_mod_main.c.orig	Thu Jul  6 23:05:04 2006
-+++ e_mod_main.c	Thu Jul  6 23:05:19 2006
-@@ -354,7 +354,8 @@
- EAPI int
- e_modapi_about(E_Module *m)
- {
--   e_module_dialog_show(D_("Enlightenment Weather Module"), D_("A weather forecast module for Enlightenment"));
-+   e_module_dialog_show(m, D_("Enlightenment Weather Module"), 
-+	D_("A weather forecast module for Enlightenment"));
-    return 1;
- }
- 
diff --git a/x11/e17-module-weather/pkg-plist b/x11/e17-module-weather/pkg-plist
index 66c078bb5d6f..bd4bcd2c0fbd 100644
--- a/x11/e17-module-weather/pkg-plist
+++ b/x11/e17-module-weather/pkg-plist
@@ -1,4 +1,6 @@
-lib/enlightenment/modules/weather/VeraBd.ttf
+lib/enlightenment/modules/weather/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/weather/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/weather/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/weather/images/blizzard.png
 lib/enlightenment/modules/weather/images/blowingsnow.png
 lib/enlightenment/modules/weather/images/chancetstorm.png
@@ -61,17 +63,16 @@ lib/enlightenment/modules/weather/images/unknown.png
 lib/enlightenment/modules/weather/images/wind.png
 lib/enlightenment/modules/weather/images/wswarning.png
 lib/enlightenment/modules/weather/images/wswatch.png
-lib/enlightenment/modules/weather/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/weather/module.eap
-lib/enlightenment/modules/weather/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/weather/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/weather/module.desktop
+lib/enlightenment/modules/weather/module.edj
 lib/enlightenment/modules/weather/module_icon.png
-lib/enlightenment/modules/weather/vera.ttf
-lib/enlightenment/modules/weather/weather.edc
 lib/enlightenment/modules/weather/weather.edj
 %%NLS%%share/locale/eo/LC_MESSAGES/weather.mo
 %%NLS%%share/locale/it/LC_MESSAGES/weather.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/weather.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/weather.mo
 @dirrm lib/enlightenment/modules/weather/images
-@dirrm lib/enlightenment/modules/weather/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/weather/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/weather
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11/e17-module-winselector/Makefile b/x11/e17-module-winselector/Makefile
new file mode 100644
index 000000000000..553c0ec4c557
--- /dev/null
+++ b/x11/e17-module-winselector/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	winselector
+# Date created:		2006-08-15
+# Whom:			Stanislav Sedov <ssedov@mbsd.msk.ru>
+#
+# $MBSDlabs$
+# $FreeBSD$
+#
+
+PORTNAME=	winselector
+PORTVERSION=	20060926
+CATEGORIES=	x11
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+PKGNAMEPREFIX=	e17-module-
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	An e17 module to switch between windows
+
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	pkgconfig gnometarget
+USE_EFL=	edje
+
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/e17-module-winselector/distinfo b/x11/e17-module-winselector/distinfo
new file mode 100644
index 000000000000..12ddf1232176
--- /dev/null
+++ b/x11/e17-module-winselector/distinfo
@@ -0,0 +1,3 @@
+MD5 (winselector-20060926.tar.bz2) = 7f3f5d26dff799c4c37945043b171d28
+SHA256 (winselector-20060926.tar.bz2) = f6e433dda44c9bedc81b12032a7618b015d33acdb7177becea4e56a2baa13484
+SIZE (winselector-20060926.tar.bz2) = 277497
diff --git a/x11/e17-module-winselector/pkg-descr b/x11/e17-module-winselector/pkg-descr
new file mode 100644
index 000000000000..8e25ba30168d
--- /dev/null
+++ b/x11/e17-module-winselector/pkg-descr
@@ -0,0 +1,4 @@
+An E17 module that enables access to all windows through a shelf button.
+
+Author:	Viktor Kojouharov <vkojouharov@gmail.com>
+WWW:	http://www.enlightenment.org/
diff --git a/x11/e17-module-winselector/pkg-plist b/x11/e17-module-winselector/pkg-plist
new file mode 100644
index 000000000000..27724a16ee28
--- /dev/null
+++ b/x11/e17-module-winselector/pkg-plist
@@ -0,0 +1,11 @@
+lib/enlightenment/modules/winselector/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/winselector/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/winselector/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/winselector/module.desktop
+lib/enlightenment/modules/winselector/module.edj
+lib/enlightenment/modules/winselector/module_icon.png
+lib/enlightenment/modules/winselector/winselector.edj
+@dirrm lib/enlightenment/modules/winselector/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/winselector
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11/ecore/Makefile b/x11/ecore/Makefile
index 59e23ddbe899..1d9841281237 100644
--- a/x11/ecore/Makefile
+++ b/x11/ecore/Makefile
@@ -6,27 +6,97 @@
 #
 
 PORTNAME=	ecore
-PORTVERSION=	0.9.9.032
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://enlightenment.freedesktop.org/files/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	vanilla@FreeBSD.org
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	A core event abstraction library
 
-LIB_DEPENDS=	evas.1:${PORTSDIR}/graphics/evas
-
-.if !exists(/usr/include/getopt.h)
-USE_GETOPT_LONG=	yes
-.endif
-
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
-INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS+=	--enable-pthreads
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+USE_EFL=	evas
+USE_LDCONFIG=	yes
+USE_GETOPT_LONG=yes
+
+CONFIGURE_ARGS=	--disable-ecore-dfb
+
+OPTIONS=	DBUS		"Enable DBUS support" off \
+		CURL		"Enable Curl support" on \
+		X11		"Enable X11 support" on \
+		EVAS		"Enable evas support" on \
+		EET		"Enable EET configs support" on
+#		OPENSSL		"Enable OpenSSL support" on \
+#		DIRECTFB	"Enable DirectFB support" off \
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_X11)
+CONFIGURE_ARGS+=	--enable-ecore-x
+USE_XLIB=		yes
+PLIST_SUB+=		X11=""
+.else
+CONFIGURE_ARGS+=	--disable-ecore-x
+PLIST_SUB+=		X11="@comment "
+.endif
+
+.if !defined(WITHOUT_EVAS)
+CONFIGURE_ARGS+=	--enable-ecore-evas
+USE_EFL+=		evas
+PLIST_SUB+=		EVAS=""
+.else
+CONFIGURE_ARGS+=	--disable-ecore-evas
+PLIST_SUB+=		EVAS="@comment "
+.endif
+
+.if !defined(WITHOUT_CURL)
+CONFIGURE_ARGS+=	--enable-curl
+LIB_DEPENDS+=		curl.3:${PORTSDIR}/ftp/curl
+PLIST_SUB+=		CURL=""
+.else
+CONFIGURE_ARGS+=	--disable-curl
+PLIST_SUB+=		CURL="@comment "
+.endif
+
+#.if !defined(WITHOUT_OPENSSL)
+#CONFIGURE_ARGS+=	--enable-openssl
+#PLIST_SUB+=		OPENSSL=""
+#USE_OPENSSL=		yes
+#.else
+#CONFIGURE_ARGS+=	--disable-openssl
+#PLIST_SUB+=		OPENSSL="@comment "
+#.endif
+
+.if defined(WITH_DBUS)
+CONFIGURE_ARGS+=	--enable-ecore-dbus
+PLIST_SUB+=		DBUS=""
+LIB_DEPENDS+=		dbus-1.2:${PORTSDIR}/devel/dbus
+.else
+CONFIGURE_ARGS+=	--disable-ecore-dbus
+PLIST_SUB+=		DBUS="@comment "
+.endif
+
+#.if defined(WITH_DIRECTFB)
+#CONFIGURE_ARGS+=	--enable-ecore-dfb
+#PLIST_SUB+=		DIRECTFB=""
+#LIB_DEPENDS+=		directfb-0.9.16:${PORTSDIR}/devel/directfb
+#.else
+#CONFIGURE_ARGS+=	--disable-ecore-dfb
+#PLIST_SUB+=		DIRECTFB="@comment "
+#.endif
+
+.if !defined(WITHOUT_EET)
+CONFIGURE_ARGS+=	--enable-ecore-config
+USE_EFL+=		eet
+PLIST_SUB+=		EET=""
+.else
+CONFIGURE_ARGS+=	--disable-ecore-config
+PLIST_SUB+=		EET="@comment "
+.endif
 
-.include <bsd.port.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/ecore/distinfo b/x11/ecore/distinfo
index 170182e8d1df..e7e0a4cadff5 100644
--- a/x11/ecore/distinfo
+++ b/x11/ecore/distinfo
@@ -1,3 +1,3 @@
-MD5 (ecore-0.9.9.032.tar.gz) = 275ceadfd5537383dd2f331e02f5ce72
-SHA256 (ecore-0.9.9.032.tar.gz) = cef6a90c1fd0d3d7224b8ca1d7c925fb6cd2520191de9deba10a6af749b41929
-SIZE (ecore-0.9.9.032.tar.gz) = 1209574
+MD5 (ecore-20060926.tar.bz2) = d714613d6c8d51e8c841c65d520e0047
+SHA256 (ecore-20060926.tar.bz2) = eb1f75c70146efa5470faf00d23b4da27dd43b9862fabcd6914c05de9c616e91
+SIZE (ecore-20060926.tar.bz2) = 4162746
diff --git a/x11/ecore/pkg-plist b/x11/ecore/pkg-plist
index bb7ac89e0672..3b4fbcc50e74 100644
--- a/x11/ecore/pkg-plist
+++ b/x11/ecore/pkg-plist
@@ -1,21 +1,24 @@
 bin/ecore-config
-bin/ecore_config
+%%EET%%bin/ecore_config
+bin/ecore_dbus_hal_test
+bin/ecore_dbus_receiver_test
 bin/ecore_dbus_test
-bin/ecore_evas_test
-bin/ecore_test
+%%EVAS%%bin/ecore_evas_test
+%%EVAS%%bin/ecore_test
 include/Ecore.h
 include/Ecore_Con.h
-include/Ecore_Config.h
-include/Ecore_DBus.h
+%%EET%%include/Ecore_Config.h
+%%DBUS%%include/Ecore_DBus.h
 include/Ecore_Data.h
-include/Ecore_Evas.h
+include/Ecore_Desktop.h
+%%EVAS%%include/Ecore_Evas.h
 include/Ecore_File.h
 include/Ecore_Ipc.h
 include/Ecore_Job.h
 include/Ecore_Txt.h
-include/Ecore_X.h
-include/Ecore_X_Atoms.h
-include/Ecore_X_Cursor.h
+%%X11%%include/Ecore_X.h
+%%X11%%include/Ecore_X_Atoms.h
+%%X11%%include/Ecore_X_Cursor.h
 lib/libecore.a
 lib/libecore.la
 lib/libecore.so
@@ -24,18 +27,22 @@ lib/libecore_con.a
 lib/libecore_con.la
 lib/libecore_con.so
 lib/libecore_con.so.1
-lib/libecore_config.a
-lib/libecore_config.la
-lib/libecore_config.so
-lib/libecore_config.so.1
-lib/libecore_dbus.a
-lib/libecore_dbus.la
-lib/libecore_dbus.so
-lib/libecore_dbus.so.1
-lib/libecore_evas.a
-lib/libecore_evas.la
-lib/libecore_evas.so
-lib/libecore_evas.so.1
+%%EET%%lib/libecore_config.a
+%%EET%%lib/libecore_config.la
+%%EET%%lib/libecore_config.so
+%%EET%%lib/libecore_config.so.1
+%%DBUS%%lib/libecore_dbus.a
+%%DBUS%%lib/libecore_dbus.la
+%%DBUS%%lib/libecore_dbus.so
+%%DBUS%%lib/libecore_dbus.so.1
+lib/libecore_desktop.a
+lib/libecore_desktop.la
+lib/libecore_desktop.so
+lib/libecore_desktop.so.1
+%%EVAS%%lib/libecore_evas.a
+%%EVAS%%lib/libecore_evas.la
+%%EVAS%%lib/libecore_evas.so
+%%EVAS%%lib/libecore_evas.so.1
 lib/libecore_file.a
 lib/libecore_file.la
 lib/libecore_file.so
@@ -53,9 +60,9 @@ lib/libecore_txt.la
 lib/libecore_txt.so
 lib/libecore_txt.so.1
 lib/libecore_x.a
-lib/libecore_x.la
-lib/libecore_x.so
-lib/libecore_x.so.1
+%%X11%%lib/libecore_x.la
+%%X11%%lib/libecore_x.so
+%%X11%%lib/libecore_x.so.1
 libdata/pkgconfig/ecore.pc
 share/aclocal/ecore.m4
 %%DATADIR%%/fonts/Vera.ttf
diff --git a/x11/elicit/Makefile b/x11/elicit/Makefile
index 9365be96e0d8..50a4147d6eea 100644
--- a/x11/elicit/Makefile
+++ b/x11/elicit/Makefile
@@ -7,31 +7,24 @@
 #
 
 PORTNAME=	elicit
-PORTVERSION=	20060719
+PORTVERSION=	20060926
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Screen zoomer/color picker for e17
 
-LIB_DEPENDS=	ecore.1:${PORTSDIR}/x11/ecore \
-		edb.1:${PORTSDIR}/databases/edb \
-		edje.5:${PORTSDIR}/graphics/edje \
-		eet.9:${PORTSDIR}/devel/eet \
-		esmart_trans_x11.0:${PORTSDIR}/graphics/esmart \
-		evas.1:${PORTSDIR}/graphics/evas \
-		Imlib2.3:${PORTSDIR}/graphics/imlib2
-
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	ecore edb eet edje evas imlib2
+USE_EFL_ESMART=	trans_x11
 
 .include <bsd.port.pre.mk>
 .if ${ARCH} == "ia64"
 BROKEN=		edje is broken on ia64
 .endif
 
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
 .include <bsd.port.post.mk>
diff --git a/x11/elicit/distinfo b/x11/elicit/distinfo
index 277804dc3d91..cf757b166401 100644
--- a/x11/elicit/distinfo
+++ b/x11/elicit/distinfo
@@ -1,3 +1,3 @@
-MD5 (elicit-20060719.tar.bz2) = 23280f261a1f0942ea3cc9aefa1abf10
-SHA256 (elicit-20060719.tar.bz2) = 3a48898c4ae83ab7557eda3926ffb2276439480e012bedc2c4037fa3e654ebb0
-SIZE (elicit-20060719.tar.bz2) = 452336
+MD5 (elicit-20060926.tar.bz2) = fe8e88cb2a959e37afb66fd48c3eaaf8
+SHA256 (elicit-20060926.tar.bz2) = 6cc88935cca450ca6867150c89557909c1b44b4cb4fdb02f45f513d1eaf30647
+SIZE (elicit-20060926.tar.bz2) = 468200
diff --git a/x11/elicit/pkg-plist b/x11/elicit/pkg-plist
index 8779e647e711..e1dd2fc7d0c9 100644
--- a/x11/elicit/pkg-plist
+++ b/x11/elicit/pkg-plist
@@ -2,6 +2,6 @@ bin/elicit
 %%DATADIR%%/images/grid_cell.png
 %%DATADIR%%/themes/summer.edj
 %%DATADIR%%/themes/winter.edj
-@dirrmtry %%DATADIR%%/themes
-@dirrmtry %%DATADIR%%/images
-@dirrmtry %%DATADIR%%
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%
diff --git a/x11/enity/Makefile b/x11/enity/Makefile
new file mode 100644
index 000000000000..2f9248afb800
--- /dev/null
+++ b/x11/enity/Makefile
@@ -0,0 +1,27 @@
+# New ports collection makefile for:	enity
+# Date created:		2006-08-14
+# Whom:			Stanislav Sedov <ssedov@mbsd.msk.ru>
+#
+# $MBSDlabs$
+# $FreeBSD$
+#
+
+PORTNAME=	enity
+PORTVERSION=	20060926
+CATEGORIES=	x11
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	Create Etk dialogs using scripts
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_EFL=	etk
+GNU_CONFIGURE=	yes
+
+PLIST_FILES=	bin/enity
+
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/enity/distinfo b/x11/enity/distinfo
new file mode 100644
index 000000000000..7936ba5dd67f
--- /dev/null
+++ b/x11/enity/distinfo
@@ -0,0 +1,3 @@
+MD5 (enity-20060926.tar.bz2) = aa2ba2aabd23e2b7f215085af12a7623
+SHA256 (enity-20060926.tar.bz2) = 4236e09b3e43af589684e44b1f1eed35226d642f6f907363d3cdc70432c4215e
+SIZE (enity-20060926.tar.bz2) = 232524
diff --git a/x11/enity/files/patch-src_bin_enity.c b/x11/enity/files/patch-src_bin_enity.c
new file mode 100644
index 000000000000..0b8afbac4f25
--- /dev/null
+++ b/x11/enity/files/patch-src_bin_enity.c
@@ -0,0 +1,20 @@
+--- src/bin/enity.c.orig	Thu Oct  5 01:06:18 2006
++++ src/bin/enity.c	Thu Oct  5 01:07:02 2006
+@@ -376,7 +376,7 @@
+ 	     
+ 	     valist[j] = NULL;
+ 	     	     
+-	     row = etk_tree_append_valist(ETK_TREE(tree), (va_list)valist);
++/*	     row = etk_tree_append_valist(ETK_TREE(tree), (va_list)valist); */
+ 	     etk_tree_row_data_set(row, cols);
+ 	  }
+      }
+@@ -583,7 +583,7 @@
+      /* --list options */
+      { "checklist", ' ', NULL, _en_list_check_cb, NULL, EN_ARGUMENT_FLAG_OPTIONAL, "Use check boxes for first column" },
+      { "column", ' ', NULL, _en_list_column_cb, NULL, EN_ARGUMENT_FLAG_OPTIONAL|EN_ARGUMENT_FLAG_VALUE_REQUIRED|EN_ARGUMENT_FLAG_MULTIVALUE, "Set the column header" },
+-     { "list", ' ', NULL, _en_list_cb, NULL, EN_ARGUMENT_FLAG_OPTIONAL, "Display list dialog" },
++/*     { "list", ' ', NULL, _en_list_cb, NULL, EN_ARGUMENT_FLAG_OPTIONAL, "Display list dialog" }, */
+ 
+      /* --progress options */
+      { "progress", ' ', NULL, _en_progress_cb, NULL, EN_ARGUMENT_FLAG_OPTIONAL, "Display progress indication dialog" },
diff --git a/x11/enity/pkg-descr b/x11/enity/pkg-descr
new file mode 100644
index 000000000000..af6ca53a3e4f
--- /dev/null
+++ b/x11/enity/pkg-descr
@@ -0,0 +1,10 @@
+Enity allows users to create Etk dialogs using shell scripts or other
+scripting languages that can call programs. The basic idea is to ease
+the development of quick interfaces for input, configuration,
+installation, etc...
+
+The List feature is currently disabled due to unresolved problems in
+implementation.
+
+Author:	Hisham 'CodeWarrior' Mardambey <hisham.mardambey@gmail.com>
+WWW:	http://www.enlightenment.org/
diff --git a/x11/enterminus/Makefile b/x11/enterminus/Makefile
new file mode 100644
index 000000000000..3e5a63869cfd
--- /dev/null
+++ b/x11/enterminus/Makefile
@@ -0,0 +1,25 @@
+# New ports collection makefile for:	enterminus
+# Date created:		2006-08-14
+# Whom:			Stanislav Sedov <ssedov@mbsd.msk.ru>
+#
+# $MBSDlabs$
+# $FreeBSD$
+#
+
+PORTNAME=	enterminus
+PORTVERSION=	20060926
+CATEGORIES=	x11
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT=	An EFL based terminal
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_EFL=	evas ecore
+GNU_CONFIGURE=	yes
+
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/enterminus/distinfo b/x11/enterminus/distinfo
new file mode 100644
index 000000000000..d58480ff505d
--- /dev/null
+++ b/x11/enterminus/distinfo
@@ -0,0 +1,3 @@
+MD5 (enterminus-20060926.tar.bz2) = b0a96dc2f34cea46966515549450aedf
+SHA256 (enterminus-20060926.tar.bz2) = 195205d1687b3100c6f8a0441e8dea108893e5077519e12396f5fd24140d47ee
+SIZE (enterminus-20060926.tar.bz2) = 270790
diff --git a/x11/enterminus/files/patch-src_bin_pty.c b/x11/enterminus/files/patch-src_bin_pty.c
new file mode 100644
index 000000000000..263137f1b925
--- /dev/null
+++ b/x11/enterminus/files/patch-src_bin_pty.c
@@ -0,0 +1,11 @@
+--- src/bin/pty.c.orig	Mon Aug 14 18:25:18 2006
++++ src/bin/pty.c	Mon Aug 14 18:25:51 2006
+@@ -19,7 +19,7 @@
+    int fd;
+    char *ptydev;
+ 
+-   if((fd = getpt()) >= 0)
++   if((fd = posix_openpt(O_RDWR)) >= 0)
+      {
+ 	if(grantpt(fd) == 0 && unlockpt(fd) == 0)
+ 	  {
diff --git a/x11/enterminus/pkg-descr b/x11/enterminus/pkg-descr
new file mode 100644
index 000000000000..14d5aee37605
--- /dev/null
+++ b/x11/enterminus/pkg-descr
@@ -0,0 +1,4 @@
+An EFL Based Terminal.
+
+Author:	codewarrior (Hisham Mardam Bey) <codewarrior@users.sourceforge.net>
+WWW:	http://www.enlightenment.org/
diff --git a/x11/enterminus/pkg-plist b/x11/enterminus/pkg-plist
new file mode 100644
index 000000000000..96359a904dcb
--- /dev/null
+++ b/x11/enterminus/pkg-plist
@@ -0,0 +1,8 @@
+bin/enterminus
+bin/enterminus-config
+%%DATADIR%%/VeraMono.ttf
+%%DATADIR%%/black.png
+%%DATADIR%%/checkered_bg.png
+%%DATADIR%%/grey.png
+%%DATADIR%%/white.png
+@dirrm %%DATADIR%%
diff --git a/x11/examine/Makefile b/x11/examine/Makefile
index 1a234f5b3f79..4d468b648201 100644
--- a/x11/examine/Makefile
+++ b/x11/examine/Makefile
@@ -7,23 +7,24 @@
 #
 
 PORTNAME=	examine
-PORTVERSION=	20060719
+PORTVERSION=	20060926
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Interface for configuring EFL applications
 
 LIB_DEPENDS=	ecore.1:${PORTSDIR}/x11/ecore \
 		ewl.0:${PORTSDIR}/x11-toolkits/ewl
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	ecore ewl
 
 PLIST_FILES=	bin/examine bin/exsh
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/examine/distinfo b/x11/examine/distinfo
index 947efd9aecaf..bc8b311eb3ab 100644
--- a/x11/examine/distinfo
+++ b/x11/examine/distinfo
@@ -1,3 +1,3 @@
-MD5 (examine-20060719.tar.bz2) = c5ee1e30e3754e511e0a14a2e135f8f8
-SHA256 (examine-20060719.tar.bz2) = 525c6ef925aed34db672fa3fc6fd2e5269ba1a5447fdc29775efcae663290beb
-SIZE (examine-20060719.tar.bz2) = 1252192
+MD5 (examine-20060926.tar.bz2) = e849fb33e7752673e4ee0153d3d32c07
+SHA256 (examine-20060926.tar.bz2) = 225d6e595a5bb600fa7801ec2b232aa6e05c9b3f23b380acbeb391d20c6fc6b1
+SIZE (examine-20060926.tar.bz2) = 1261349
author	Stanislav Sedov <stas@FreeBSD.org>	2006-10-08 13:48:37 +0000
committer	Stanislav Sedov <stas@FreeBSD.org>	2006-10-08 13:48:37 +0000
commit	ee774b0f4fa7f1842f6b4dfdfe60b22cbcf12442 (patch)
tree	1bf12eadb5a7920766bf7a613174c0475b810d0d
parent	32e98c797bd5b952894ff185e59df8a91844f4ab (diff)
download	ports-ee774b0f4fa7f1842f6b4dfdfe60b22cbcf12442.tar.gz ports-ee774b0f4fa7f1842f6b4dfdfe60b22cbcf12442.zip