29 files changed, 281 insertions, 238 deletions

diff --git a/devel/Makefile b/devel/Makefile
index a85eb6877a8e..5d63ab478d0f 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -350,6 +350,7 @@
     SUBDIR += egypt
     SUBDIR += eieio
     SUBDIR += eiffelstudio
+    SUBDIR += eina
     SUBDIR += elf
     SUBDIR += elfio
     SUBDIR += elfkickers
diff --git a/devel/e_dbus/Makefile b/devel/e_dbus/Makefile
index 0856f347e867..a931aa17404e 100644
--- a/devel/e_dbus/Makefile
+++ b/devel/e_dbus/Makefile
@@ -6,26 +6,32 @@
 #
 
 PORTNAME=	e_dbus
-PORTVERSION=	20080223
-PORTREVISION=	2
-CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
-		http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION=	1.0.0.beta
+PORTEPOCH=	1
+CATEGORIES=	devel enlightenment
+MASTER_SITES=	http://download.enlightenment.org/releases/ \
+		http://files.roorback.net/e17/2010-10-03/base/
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	EFL DBUS connectivity library
 
 LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus
 
-GNU_CONFIGURE=	yes
+LICENSE=	BSD
+DIST_SUBDIR=	e17
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_EFL=	eina ecore libtool_hack librt_hack
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_EFL=	ecore
 USE_LDCONFIG=	yes
 
-OPTIONS=	EHAL	"Build E HAL module"	on \
-		ENM	"Build E NM module"	on \
-		ENOT	"Build E notify module" on
+CONFIGURE_ARGS=	--disable-ebluez  # Linux specific ??
+
+OPTIONS=	EHAL	"Build E HAL module"	 on \
+		EUKIT	"Build E upower module"	 on \
+		ECONNM	"Build E connman module" on \
+		EOFONO	"Build E oFono module"   on \
+		ENOT	"Build E notify module"  on
 
 .include <bsd.port.pre.mk>
 
@@ -37,12 +43,28 @@ CONFIGURE_ARGS+=	--disable-ehal
 PLIST_SUB+=	EHAL="@comment "
 .endif
 
-.if !defined(WITHOUT_ENM)
-CONFIGURE_ARGS+=	--enable-enm
-PLIST_SUB+=	ENM=""
+.if !defined(WITHOUT_EUKIT)
+CONFIGURE_ARGS+=	--enable-eukit
+PLIST_SUB+=	EUKIT=""
+.else
+CONFIGURE_ARGS+=	--disable-eukit
+PLIST_SUB+=	EUKIT="@comment "
+.endif
+
+.if !defined(WITHOUT_ECONNM)
+CONFIGURE_ARGS+=	--enable-econnman
+PLIST_SUB+=	ECONNM=""
+.else
+CONFIGURE_ARGS+=	--disable-econnman
+PLIST_SUB+=	ECONNM="@comment "
+.endif
+
+.if !defined(WITHOUT_EOFONO)
+CONFIGURE_ARGS+=	--enable-eofono
+PLIST_SUB+=	EOFONO=""
 .else
-CONFIGURE_ARGS+=	--disable-enm
-PLIST_SUB+=	ENM="@comment "
+CONFIGURE_ARGS+=	--disable-eofono
+PLIST_SUB+=	EOFONO="@comment "
 .endif
 
 .if !defined(WITHOUT_ENOT)
diff --git a/devel/e_dbus/distinfo b/devel/e_dbus/distinfo
index 486c69fb2ee8..559646f643ad 100644
--- a/devel/e_dbus/distinfo
+++ b/devel/e_dbus/distinfo
@@ -1,3 +1,2 @@
-MD5 (e_dbus-20080223.tar.bz2) = d709ffed87f71253a62cda1484b0aa64
-SHA256 (e_dbus-20080223.tar.bz2) = f27382a51c16f7d10b3e2757c4b8c3a483b3afc137cafae4321252b3d4cf59c0
-SIZE (e_dbus-20080223.tar.bz2) = 252568
+SHA256 (e17/e_dbus-1.0.0.beta.tar.bz2) = b6eff6419b0ad5e76a47705fd29128e96bc59a9ed5d18b36e0a55a5520806d76
+SIZE (e17/e_dbus-1.0.0.beta.tar.bz2) = 390574
diff --git a/devel/e_dbus/pkg-descr b/devel/e_dbus/pkg-descr
index 141e4ab49806..0c9865dc7820 100644
--- a/devel/e_dbus/pkg-descr
+++ b/devel/e_dbus/pkg-descr
@@ -1,3 +1,3 @@
 Enlightenment DBUS compatibility layer.
 
-WWW: http://www.enlightenment.org/
+WWW: http://docs.enlightenment.org/api/e_dbus/html/
diff --git a/devel/e_dbus/pkg-plist b/devel/e_dbus/pkg-plist
index 5699855209ab..dae1f604ee20 100644
--- a/devel/e_dbus/pkg-plist
+++ b/devel/e_dbus/pkg-plist
@@ -1,31 +1,34 @@
-%%EHAL%%bin/e_dbus_hal
-%%ENM%%bin/e_dbus_nm
+%%ENOT%%bin/e-notify-send
+%%ECONNM%%bin/e_dbus_connman_test
 %%ENOT%%bin/e_dbus_notification_daemon
 %%ENOT%%bin/e_dbus_notify
+%%EOFONO%%bin/e_dbus_ofono_test
 bin/e_dbus_test
 bin/e_dbus_test_client
-include/E_DBus.h
-%%EHAL%%include/E_Hal.h
-%%ENM%%include/E_Nm.h
-%%ENOT%%include/E_Notification_Daemon.h
-%%ENOT%%include/E_Notify.h
-lib/libedbus.a
-lib/libedbus.la
+%%EUKIT%%bin/e_dbus_ukit_test
+%%ECONNM%%include/e_dbus-1/E_Connman.h
+include/e_dbus-1/E_DBus.h
+%%EHAL%%include/e_dbus-1/E_Hal.h
+%%ENOT%%include/e_dbus-1/E_Notification_Daemon.h
+%%ENOT%%include/e_dbus-1/E_Notify.h
+%%EOFONO%%include/e_dbus-1/E_Ofono.h
+%%EUKIT%%include/e_dbus-1/E_Ukit.h
+%%ECONNM%%lib/libeconnman.so
+%%ECONNM%%lib/libeconnman.so.1
 lib/libedbus.so
 lib/libedbus.so.1
-%%EHAL%%lib/libehal.a
-%%EHAL%%lib/libehal.la
 %%EHAL%%lib/libehal.so
 %%EHAL%%lib/libehal.so.1
-%%ENM%%lib/libenm.a
-%%ENM%%lib/libenm.la
-%%ENM%%lib/libenm.so
-%%ENM%%lib/libenm.so.1
-%%ENOT%%lib/libenotify.a
-%%ENOT%%lib/libenotify.la
 %%ENOT%%lib/libenotify.so
 %%ENOT%%lib/libenotify.so.1
+%%EOFONO%%lib/libeofono.so
+%%EOFONO%%lib/libeofono.so.1
+%%EUKIT%%lib/libeukit.so
+%%EUKIT%%lib/libeukit.so.1
+%%ECONNM%%libdata/pkgconfig/econnman.pc
 libdata/pkgconfig/edbus.pc
 %%EHAL%%libdata/pkgconfig/ehal.pc
-%%ENM%%libdata/pkgconfig/enm.pc
 %%ENOT%%libdata/pkgconfig/enotify.pc
+%%EOFONO%%libdata/pkgconfig/eofono.pc
+%%EUKIT%%libdata/pkgconfig/eukit.pc
+@dirrm include/e_dbus-1
diff --git a/devel/ecore-file/Makefile b/devel/ecore-file/Makefile
index dd666eaa26f6..9372c81162cb 100644
--- a/devel/ecore-file/Makefile
+++ b/devel/ecore-file/Makefile
@@ -6,55 +6,55 @@
 #
 
 PORTNAME=	file
-PORTVERSION=	0.9.9.042
-PORTREVISION=	2
-CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
-		http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION=	1.0.0.beta
+PORTREVISION=	0
+CATEGORIES=	devel enlightenment
+MASTER_SITES=	http://download.enlightenment.org/releases/ \
+		http://files.roorback.net/e17/2010-10-03/base/
 PKGNAMEPREFIX=	ecore-
-DISTNAME=	ecore-${PORTVERSION}
+DISTNAME=	ecore-${DISTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Enlightenment core abstraction library (file module)
 
-GNU_CONFIGURE=	yes
+LICENSE=	BSD
+DIST_SUBDIR=	e17
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_EFL=	ecore libtool_hack
 USE_GNOME=	gnomehack pkgconfig gnometarget
 USE_LDCONFIG=	yes
-USE_EFL=	ecore
 BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_file
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-CONFIGURE_ARGS=	--disable-ecore-con \
-		--disable-ecore-config \
-		--disable-ecore-desktop \
-		--disable-ecore-directfb \
-		--disable-ecore-evas \
-		--enable-ecore-file \
-		--disable-ecore-ipc \
-		--disable-ecore-job \
-		--disable-ecore-sdl \
-		--disable-ecore-txt \
-		--disable-ecore-x \
-		--disable-ecore-imf \
-		--disable-ecore-imf_evas
+.include <../ecore-main/Makefile.inc>
+
+CONFIGURE_ARGS+=	--enable-ecore-file
 
 OPTIONS=	CURL	"Enable Curl support"	on
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_CURL)
-CONFIGURE_ARGS+=	--enable-curl
+USE_EFL_ECORE=		con
+CONFIGURE_ARGS+=	--enable-ecore-con \
+			--enable-curl
 LIB_DEPENDS+=		curl.6:${PORTSDIR}/ftp/curl
 .else
 CONFIGURE_ARGS+=	--disable-curl
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -E -e \
-		's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
+	@${REINPLACE_CMD} -E \
+		-e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
 		-e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
 		${BUILD_WRKSRC}/Makefile.in
+.if !defined(WITHOUT_CURL)
+	@${REINPLACE_CMD} -E \
+		-e 's,\$$\(top_builddir\)/src/lib/ecore_con/\.libs,${LOCALBASE}/lib,'\
+		-e 's,\$$\(top_builddir\)/src/lib/ecore_con/libecore_con\.la,-lecore_con,'\
+		${BUILD_WRKSRC}/Makefile.in
+.endif
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/ecore-file.pc \
diff --git a/devel/ecore-file/distinfo b/devel/ecore-file/distinfo
index 4672f6a1c167..36d07e85437a 100644
--- a/devel/ecore-file/distinfo
+++ b/devel/ecore-file/distinfo
@@ -1,3 +1,2 @@
-MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
-SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
-SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
+SHA256 (e17/ecore-1.0.0.beta.tar.bz2) = 9fd367f9ff10568082e65c1def46e64fb96b359221e0d6aea11c6c3f6bd5282f
+SIZE (e17/ecore-1.0.0.beta.tar.bz2) = 916635
diff --git a/devel/ecore-file/pkg-plist b/devel/ecore-file/pkg-plist
index f007fefe0c41..1be78d64f6e8 100644
--- a/devel/ecore-file/pkg-plist
+++ b/devel/ecore-file/pkg-plist
@@ -1,6 +1,5 @@
-include/Ecore_File.h
-lib/libecore_file.a
-lib/libecore_file.la
+include/ecore-1/Ecore_File.h
 lib/libecore_file.so
-lib/libecore_file.so.9
+lib/libecore_file.so.1
 libdata/pkgconfig/ecore-file.pc
+@dirrmtry include/ecore-1
diff --git a/devel/ecore-ipc/Makefile b/devel/ecore-ipc/Makefile
index 7d14d0932480..7257fb8d7b53 100644
--- a/devel/ecore-ipc/Makefile
+++ b/devel/ecore-ipc/Makefile
@@ -6,43 +6,30 @@
 #
 
 PORTNAME=	ipc
-PORTVERSION=	0.9.9.042
-PORTREVISION=	2
-CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
-		http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION=	1.0.0.beta
+CATEGORIES=	devel enlightenment
+MASTER_SITES=	http://download.enlightenment.org/releases/ \
+		http://files.roorback.net/e17/2010-10-03/base/
 PKGNAMEPREFIX=	ecore-
-DISTNAME=	ecore-${PORTVERSION}
+DISTNAME=	ecore-${DISTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Enlightenment core abstraction library (ipc module)
 
-GNU_CONFIGURE=	yes
+LICENSE=	BSD
+DIST_SUBDIR=	e17
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_EFL=	ecore libtool_hack
+USE_EFL_ECORE=	con
 USE_GNOME=	gnomehack pkgconfig gnometarget
 USE_LDCONFIG=	yes
-USE_EFL=	ecore
-USE_EFL_ECORE=	con
 BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_ipc
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-CONFIGURE_ARGS=	--enable-ecore-con \
-		--disable-ecore-config \
-		--disable-ecore-desktop \
-		--disable-ecore-directfb \
-		--disable-ecore-evas \
-		--disable-ecore-file \
-		--enable-ecore-ipc \
-		--disable-ecore-job \
-		--disable-ecore-sdl \
-		--disable-ecore-txt \
-		--disable-ecore-x \
-		--disable-ecore-imf \
-		--disable-ecore-imf_evas
+OPTIONS=	SSL "Enable SSL support" on
 
-OPTIONS=	SSL	"Enable SSL support"	on
-
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if !defined(WITHOUT_SSL)
 CONFIGURE_ARGS+=	--enable-openssl
@@ -50,6 +37,11 @@ CONFIGURE_ARGS+=	--enable-openssl
 CONFIGURE_ARGS+=	--disable-openssl
 .endif
 
+.include <../ecore-main/Makefile.inc>
+
+CONFIGURE_ARGS+=	--enable-ecore-con \
+			--enable-ecore-ipc
+
 post-patch:
 	@${REINPLACE_CMD} -E \
 		-e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
@@ -62,4 +54,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ecore-ipc.pc \
 		${PREFIX}/libdata/pkgconfig/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/ecore-ipc/distinfo b/devel/ecore-ipc/distinfo
index 4672f6a1c167..36d07e85437a 100644
--- a/devel/ecore-ipc/distinfo
+++ b/devel/ecore-ipc/distinfo
@@ -1,3 +1,2 @@
-MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
-SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
-SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
+SHA256 (e17/ecore-1.0.0.beta.tar.bz2) = 9fd367f9ff10568082e65c1def46e64fb96b359221e0d6aea11c6c3f6bd5282f
+SIZE (e17/ecore-1.0.0.beta.tar.bz2) = 916635
diff --git a/devel/ecore-ipc/files/patch-configure b/devel/ecore-ipc/files/patch-configure
deleted file mode 100644
index 9887d0720831..000000000000
--- a/devel/ecore-ipc/files/patch-configure
+++ /dev/null
@@ -1,89 +0,0 @@
---- configure.orig	2008-03-17 11:36:38.000000000 +0300
-+++ configure	2008-03-17 11:38:49.000000000 +0300
-@@ -20552,70 +20552,9 @@
- { echo "$as_me:$LINENO: checking for SSL" >&5
- echo $ECHO_N "checking for SSL... $ECHO_C" >&6; }
- 
--if test -n "$PKG_CONFIG"; then
--    if test -n "$SSL_CFLAGS"; then
--        pkg_cv_SSL_CFLAGS="$SSL_CFLAGS"
--    else
--        if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl\"") >&5
--  ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--  pkg_cv_SSL_CFLAGS=`$PKG_CONFIG --cflags "openssl" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
--    fi
--else
--	pkg_failed=untried
--fi
--if test -n "$PKG_CONFIG"; then
--    if test -n "$SSL_LIBS"; then
--        pkg_cv_SSL_LIBS="$SSL_LIBS"
--    else
--        if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl\"") >&5
--  ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--  pkg_cv_SSL_LIBS=`$PKG_CONFIG --libs "openssl" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
--    fi
--else
--	pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
--        _pkg_short_errors_supported=yes
--else
--        _pkg_short_errors_supported=no
--fi
--        if test $_pkg_short_errors_supported = yes; then
--	        SSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "openssl"`
--        else
--	        SSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl"`
--        fi
--	# Put the nasty error message in config.log where it belongs
--	echo "$SSL_PKG_ERRORS" >&5
--
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--                 have_openssl="no"
- 
--elif test $pkg_failed = untried; then
--	 have_openssl="no"
--
--else
--	SSL_CFLAGS=$pkg_cv_SSL_CFLAGS
--	SSL_LIBS=$pkg_cv_SSL_LIBS
-+	SSL_CFLAGS=""
-+	SSL_LIBS="-lssl -lcrypto"
-         { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
- 
-@@ -20623,13 +20562,9 @@
- cat >>confdefs.h <<\_ACEOF
- #define USE_OPENSSL 1
- _ACEOF
--
--       requirements_ecore_con="$requirements_ecore_con openssl"
-        # no need to add it to req_ecore_ipc, since they
-        # depends on ecore_con anyway.
-        have_openssl="yes"
--
--fi
- fi
- 
- want_curl="yes"
diff --git a/devel/ecore-ipc/pkg-plist b/devel/ecore-ipc/pkg-plist
index 3607cfe8c6b6..684339caa68e 100644
--- a/devel/ecore-ipc/pkg-plist
+++ b/devel/ecore-ipc/pkg-plist
@@ -1,6 +1,5 @@
-include/Ecore_Ipc.h
-lib/libecore_ipc.a
-lib/libecore_ipc.la
+include/ecore-1/Ecore_Ipc.h
 lib/libecore_ipc.so
-lib/libecore_ipc.so.9
+lib/libecore_ipc.so.1
 libdata/pkgconfig/ecore-ipc.pc
+@dirrmtry include/ecore-1
diff --git a/devel/ecore-job/Makefile b/devel/ecore-job/Makefile
index 19ea9a2d43ed..4e26f5c92b09 100644
--- a/devel/ecore-job/Makefile
+++ b/devel/ecore-job/Makefile
@@ -25,6 +25,10 @@ USE_EFL=	ecore
 BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_job
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
+BROKEN=		does not compile
+DEPRECATED=	abandoned upstream
+EXPIRATION_DATE=	2011-01-01
+
 CONFIGURE_ARGS=	--disable-ecore-con \
 		--disable-ecore-config \
 		--disable-ecore-desktop \
diff --git a/devel/ecore-main/Makefile b/devel/ecore-main/Makefile
index 38c26cb32926..df8e3b9285a5 100644
--- a/devel/ecore-main/Makefile
+++ b/devel/ecore-main/Makefile
@@ -6,34 +6,26 @@
 #
 
 PORTNAME=	main
-PORTVERSION=	0.9.9.042
-PORTREVISION=	0
-CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
-		http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION=	1.0.0.beta
+CATEGORIES=	devel enlightenment
+MASTER_SITES=	http://download.enlightenment.org/releases/ \
+		http://files.roorback.net/e17/2010-10-03/base/
 PKGNAMEPREFIX=	ecore-
-DISTNAME=	ecore-${PORTVERSION}
+DISTNAME=	ecore-${DISTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Enlightenment core abstraction library (main library)
 
-GNU_CONFIGURE=	yes
+LICENSE=	BSD
+DIST_SUBDIR=	e17
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_EFL=	eina libtool_hack
+USE_GETTEXT=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_ICONV=	yes
 USE_LDCONFIG=	yes
 
-CONFIGURE_ARGS=	--disable-ecore-con \
-		--disable-ecore-config \
-		--disable-ecore-desktop \
-		--disable-ecore-directfb \
-		--disable-ecore-evas \
-		--disable-ecore-file \
-		--disable-ecore-ipc \
-		--disable-ecore-job \
-		--disable-ecore-sdl \
-		--disable-ecore-txt \
-		--disable-ecore-x \
-		--disable-ecore-imf \
-		--disable-ecore-imf_evas
+.include "Makefile.inc"
 
 .include <bsd.port.mk>
diff --git a/devel/ecore-main/Makefile.inc b/devel/ecore-main/Makefile.inc
new file mode 100644
index 000000000000..acd6e9a32173
--- /dev/null
+++ b/devel/ecore-main/Makefile.inc
@@ -0,0 +1,17 @@
+CONFIGURE_ARGS=	--disable-ecore-con \
+		--disable-ecore-directfb \
+		--disable-ecore-evas \
+		--disable-ecore-file \
+		--disable-glib \
+		--disable-gnutls \
+		--disable-ecore-imf \
+		--disable-ecore-imf_evas \
+		--disable-ecore-input \
+		--disable-ecore-input_evas \
+		--disable-ecore-ipc \
+		--disable-ecore-sdl \
+		--disable-ecore-x
+
+post-patch: ecore_drop_librt
+ecore_drop_librt:
+	@${REINPLACE_CMD} -E -e 's,(rt_libs=).*,\1,g' ${WRKSRC}/configure
diff --git a/devel/ecore-main/distinfo b/devel/ecore-main/distinfo
index 4672f6a1c167..36d07e85437a 100644
--- a/devel/ecore-main/distinfo
+++ b/devel/ecore-main/distinfo
@@ -1,3 +1,2 @@
-MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
-SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
-SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
+SHA256 (e17/ecore-1.0.0.beta.tar.bz2) = 9fd367f9ff10568082e65c1def46e64fb96b359221e0d6aea11c6c3f6bd5282f
+SIZE (e17/ecore-1.0.0.beta.tar.bz2) = 916635
diff --git a/devel/ecore-main/pkg-plist b/devel/ecore-main/pkg-plist
index 69033dfea741..c5410f86f381 100644
--- a/devel/ecore-main/pkg-plist
+++ b/devel/ecore-main/pkg-plist
@@ -1,8 +1,12 @@
-include/Ecore.h
-include/Ecore_Data.h
-include/Ecore_Str.h
-lib/libecore.a
-lib/libecore.la
+include/ecore-1/Ecore.h
+include/ecore-1/Ecore_Getopt.h
 lib/libecore.so
-lib/libecore.so.9
+lib/libecore.so.1
 libdata/pkgconfig/ecore.pc
+share/locale/cs/LC_MESSAGES/ecore.mo
+share/locale/de/LC_MESSAGES/ecore.mo
+share/locale/el/LC_MESSAGES/ecore.mo
+share/locale/fr/LC_MESSAGES/ecore.mo
+share/locale/it/LC_MESSAGES/ecore.mo
+share/locale/pt/LC_MESSAGES/ecore.mo
+@dirrmtry include/ecore-1
diff --git a/devel/ecore/Makefile b/devel/ecore/Makefile
index 1aae80640bf3..b276c39a5d07 100644
--- a/devel/ecore/Makefile
+++ b/devel/ecore/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	ecore
-PORTVERSION=	0.9.9.042
-PORTREVISION=	2
+DISTVERSION=	1.0.0.beta
 PORTEPOCH=	2
-CATEGORIES=	devel
+CATEGORIES=	devel enlightenment
 MASTER_SITES=	# none
 DISTFILES=	# none
 EXTRACT_ONLY=	# none
@@ -20,7 +19,7 @@ COMMENT=	Enlightenment core abstraction library (meta port)
 NO_BUILD=	yes
 USE_EFL=	ecore
 
-ECORE_MODULES=	con config desktop evas file ipc job sdl txt x11 imf imf_evas
+ECORE_MODULES=	con evas file imf imf_evas input input_evas ipc sdl x11
 ECORE_sdl_off=	yes
 
 .for NODE in ${ECORE_MODULES}
diff --git a/devel/eet/Makefile b/devel/eet/Makefile
index 6c58dee8e378..633aac75ec5b 100644
--- a/devel/eet/Makefile
+++ b/devel/eet/Makefile
@@ -6,23 +6,26 @@
 #
 
 PORTNAME=	eet
-PORTVERSION=	0.9.10.042
-PORTREVISION=	2
+DISTVERSION=	1.4.0.beta
 PORTEPOCH=	2
-CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
-		http://download.enlightenment.org/snapshots/2008-01-25/
+CATEGORIES=	devel enlightenment
+MASTER_SITES=	http://download.enlightenment.org/releases/ \
+		http://files.roorback.net/e17/2010-10-03/base/
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Enlightenment Data Handling Library
 
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
 
+LICENSE=	BSD
+DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USE_EFL=	eina librt_hack libtool_hack
 USE_GNOME=	gnomehack pkgconfig gnometarget
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+USE_OPENSSL=	yes
+
+CONFIGURE_ARGS=	--disable-gnutls
 
 .include <bsd.port.mk>
diff --git a/devel/eet/distinfo b/devel/eet/distinfo
index d76b0f17d26a..d14b083fe457 100644
--- a/devel/eet/distinfo
+++ b/devel/eet/distinfo
@@ -1,3 +1,2 @@
-MD5 (eet-0.9.10.042.tar.bz2) = af0f46c29dcdc4725f4de491b7350bbb
-SHA256 (eet-0.9.10.042.tar.bz2) = c96643666ca8c70c71884affc4f3dc8b4cdb7c745d5f2a9c9366ad76aac8a38a
-SIZE (eet-0.9.10.042.tar.bz2) = 1497375
+SHA256 (e17/eet-1.4.0.beta.tar.bz2) = f8f509a7e071b63175d294b50c90d1fb5b44d04be7540318b6d38cd5b1a04fa4
+SIZE (e17/eet-1.4.0.beta.tar.bz2) = 503183
diff --git a/devel/eet/pkg-descr b/devel/eet/pkg-descr
index d7d3fde946c2..1353957da759 100644
--- a/devel/eet/pkg-descr
+++ b/devel/eet/pkg-descr
@@ -4,4 +4,4 @@ zip file) and allow fast random-access reading of the file later
 on. It does not do zip as a zip itself has more complexity than is
 needed, and it was much simpler to implement this once here.
 
-WWW: http://www.enlightenment.org/Libraries/Eet/index.html
+WWW: http://docs.enlightenment.org/auto/eet/
diff --git a/devel/eet/pkg-plist b/devel/eet/pkg-plist
index b5e86bdaeaf9..04c5e5a7aa24 100644
--- a/devel/eet/pkg-plist
+++ b/devel/eet/pkg-plist
@@ -1,7 +1,6 @@
 bin/eet
-include/Eet.h
-lib/libeet.a
-lib/libeet.la
+include/eet-1/Eet.h
 lib/libeet.so
-lib/libeet.so.9
+lib/libeet.so.5
 libdata/pkgconfig/eet.pc
+@dirrm include/eet-1
diff --git a/devel/eina/Makefile b/devel/eina/Makefile
new file mode 100644
index 000000000000..e343da92f275
--- /dev/null
+++ b/devel/eina/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for:	eina
+# Date created:		Dec 10 2009
+# Whom:			Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	eina
+DISTVERSION=	1.0.0.beta
+CATEGORIES=	devel enlightenment
+MASTER_SITES=	http://download.enlightenment.org/releases/ \
+		http://files.roorback.net/e17/2010-10-03/base/
+
+MAINTAINER=	magik@roorback.net
+COMMENT=	Enlightenment API for data types
+
+LICENSE=	LGPL21
+DIST_SUBDIR=	e17
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_GNOME=	gnomehack pkgconfig gnometarget
+USE_EFL=	librt_hack libtool_hack
+USE_ICONV=	yes
+USE_LDCONFIG=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/eina/distinfo b/devel/eina/distinfo
new file mode 100644
index 000000000000..c9c9fad906d5
--- /dev/null
+++ b/devel/eina/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/eina-1.0.0.beta.tar.bz2) = 16170403ad9b8ca52f7ec895852ededb507ceb6794dc5bbd9224cff2c94de4d8
+SIZE (e17/eina-1.0.0.beta.tar.bz2) = 539629
diff --git a/devel/eina/pkg-descr b/devel/eina/pkg-descr
new file mode 100644
index 000000000000..f8b871c780a1
--- /dev/null
+++ b/devel/eina/pkg-descr
@@ -0,0 +1,4 @@
+Eina is a multi-platform library that provides optimized data types
+and a few tools that could be used for projects.
+
+WWW: http://docs.enlightenment.org/auto/eina/
diff --git a/devel/eina/pkg-plist b/devel/eina/pkg-plist
new file mode 100644
index 000000000000..b70a24416fcd
--- /dev/null
+++ b/devel/eina/pkg-plist
@@ -0,0 +1,59 @@
+include/eina-1/Eina.h
+include/eina-1/eina/eina_accessor.h
+include/eina-1/eina/eina_array.h
+include/eina-1/eina/eina_benchmark.h
+include/eina-1/eina/eina_binshare.h
+include/eina-1/eina/eina_convert.h
+include/eina-1/eina/eina_counter.h
+include/eina-1/eina/eina_cpu.h
+include/eina-1/eina/eina_error.h
+include/eina-1/eina/eina_file.h
+include/eina-1/eina/eina_fp.h
+include/eina-1/eina/eina_hamster.h
+include/eina-1/eina/eina_hash.h
+include/eina-1/eina/eina_inline_array.x
+include/eina-1/eina/eina_inline_f16p16.x
+include/eina-1/eina/eina_inline_f32p32.x
+include/eina-1/eina/eina_inline_f8p24.x
+include/eina-1/eina/eina_inline_fp.x
+include/eina-1/eina/eina_inline_hash.x
+include/eina-1/eina/eina_inline_list.x
+include/eina-1/eina/eina_inline_log.x
+include/eina-1/eina/eina_inline_mempool.x
+include/eina-1/eina/eina_inline_rbtree.x
+include/eina-1/eina/eina_inline_rectangle.x
+include/eina-1/eina/eina_inline_str.x
+include/eina-1/eina/eina_inline_stringshare.x
+include/eina-1/eina/eina_inline_tiler.x
+include/eina-1/eina/eina_inline_trash.x
+include/eina-1/eina/eina_inline_ustringshare.x
+include/eina-1/eina/eina_inlist.h
+include/eina-1/eina/eina_iterator.h
+include/eina-1/eina/eina_lalloc.h
+include/eina-1/eina/eina_list.h
+include/eina-1/eina/eina_log.h
+include/eina-1/eina/eina_magic.h
+include/eina-1/eina/eina_main.h
+include/eina-1/eina/eina_matrixsparse.h
+include/eina-1/eina/eina_mempool.h
+include/eina-1/eina/eina_module.h
+include/eina-1/eina/eina_quadtree.h
+include/eina-1/eina/eina_rbtree.h
+include/eina-1/eina/eina_rectangle.h
+include/eina-1/eina/eina_safety_checks.h
+include/eina-1/eina/eina_sched.h
+include/eina-1/eina/eina_str.h
+include/eina-1/eina/eina_strbuf.h
+include/eina-1/eina/eina_stringshare.h
+include/eina-1/eina/eina_tiler.h
+include/eina-1/eina/eina_trash.h
+include/eina-1/eina/eina_types.h
+include/eina-1/eina/eina_unicode.h
+include/eina-1/eina/eina_ustrbuf.h
+include/eina-1/eina/eina_ustringshare.h
+include/eina-1/eina_config.h
+lib/libeina.so
+lib/libeina.so.1
+libdata/pkgconfig/eina.pc
+@dirrm include/eina-1/eina
+@dirrm include/eina-1
diff --git a/devel/engrave/Makefile b/devel/engrave/Makefile
index 996db568906d..88aa347750c3 100644
--- a/devel/engrave/Makefile
+++ b/devel/engrave/Makefile
@@ -22,4 +22,8 @@ USE_EFL_ECORE=	evas
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
+BROKEN=		does not compile
+DEPRECATED=	abandoned upstream
+EXPIRATION_DATE=	2011-01-01
+
 .include <bsd.port.mk>
diff --git a/devel/evfs/Makefile b/devel/evfs/Makefile
index e27a5e3a7c2c..cd92c91dd6da 100644
--- a/devel/evfs/Makefile
+++ b/devel/evfs/Makefile
@@ -29,6 +29,10 @@ OPTIONS=	SAMBA	"Build samba plugin" off \
 		TAGLIB	"Use taglib for audio metadata extraction" on \
 		XTRACT "Enable extended metadata extraction via libextractor" on
 
+BROKEN=		does not compile
+DEPRECATED=	abandoned upstream
+EXPIRATION_DATE=	2011-01-01
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_SAMBA)
diff --git a/devel/ruby-ecore/Makefile b/devel/ruby-ecore/Makefile
index b889eaf0f249..2382b7087759 100644
--- a/devel/ruby-ecore/Makefile
+++ b/devel/ruby-ecore/Makefile
@@ -26,6 +26,10 @@ USE_EFL_ECORE=	x11 con job evas
 
 RUBY_SA=	${RUBY_SITEARCHLIBDIR}
 
+BROKEN=		does not compile
+DEPRECATED=	abandoned upstream
+EXPIRATION_DATE=	2011-01-01
+
 .include <bsd.port.pre.mk>
 
 do-build: