29 files changed, 292 insertions, 127 deletions

diff --git a/devel/Makefile b/devel/Makefile
index dbd96c28aac9..c74ba5e49106 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -359,6 +359,7 @@
     SUBDIR += eieio
     SUBDIR += eiffelstudio
     SUBDIR += eina
+    SUBDIR += eio
     SUBDIR += elf
     SUBDIR += elfio
     SUBDIR += elfkickers
diff --git a/devel/e_dbus/Makefile b/devel/e_dbus/Makefile
index 0d85b63c692e..4a79f50452fb 100644
--- a/devel/e_dbus/Makefile
+++ b/devel/e_dbus/Makefile
@@ -6,74 +6,32 @@
 #
 
 PORTNAME=	e_dbus
-DISTVERSION=	1.0.1
+DISTVERSION=	1.1.0
 PORTEPOCH=	1
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-05-25/base/
+		http://files.roorback.net/e17/2011-12-02/base/
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	EFL DBUS connectivity library
 
+LICENSE=	BSD
+
 LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus
 
-LICENSE=	BSD
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_EFL=	eina ecore libtool_hack librt_hack
+USE_EFL=	eina evas ecore libtool_hack librt_hack
+USE_EFL_ECORE=	evas
 USE_GNOME=	gnomehack pkgconfig
 USE_LDCONFIG=	yes
 
-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>
-
-.if !defined(WITHOUT_EHAL)
-CONFIGURE_ARGS+=	--enable-ehal
-PLIST_SUB+=	EHAL=""
-.else
-CONFIGURE_ARGS+=	--disable-ehal
-PLIST_SUB+=	EHAL="@comment "
-.endif
-
-.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-eofono
-PLIST_SUB+=	EOFONO="@comment "
-.endif
-
-.if !defined(WITHOUT_ENOT)
-CONFIGURE_ARGS+=	--enable-enotify
-PLIST_SUB+=	ENOT=""
-USE_EFL+=	evas
-.else
-CONFIGURE_ARGS+=	--disable-enotify
-PLIST_SUB+=	ENOT="@comment "
-.endif
+CONFIGURE_ARGS=	--enable-ehal \
+		--enable-eukit \
+		--enable-econnman0_7x \
+		--enable-eofono \
+		--enable-enotify \
+		--disable-ebluez  # Linux specific ??
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/e_dbus/distinfo b/devel/e_dbus/distinfo
index 8f48fad01c8c..ff31fc8ad589 100644
--- a/devel/e_dbus/distinfo
+++ b/devel/e_dbus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/e_dbus-1.0.1.tar.bz2) = 744bc4b9eba04e864f1748e0716a4d4260e45cb5f57a19b3aa549bc8b1ab1df5
-SIZE (e17/e_dbus-1.0.1.tar.bz2) = 357609
+SHA256 (e17/e_dbus-1.1.0.tar.bz2) = e3f229ca3f597ab01c89968f6d6e040e977299be19558160a978b9b5377dcb10
+SIZE (e17/e_dbus-1.1.0.tar.bz2) = 404269
diff --git a/devel/e_dbus/pkg-plist b/devel/e_dbus/pkg-plist
index dae1f604ee20..c34c4903631c 100644
--- a/devel/e_dbus/pkg-plist
+++ b/devel/e_dbus/pkg-plist
@@ -1,34 +1,37 @@
-%%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-notify-send
+bin/e_dbus_connman0_7x_test
+bin/e_dbus_notification_daemon
+bin/e_dbus_notify
+bin/e_dbus_ofono_test
 bin/e_dbus_test
 bin/e_dbus_test_client
-%%EUKIT%%bin/e_dbus_ukit_test
-%%ECONNM%%include/e_dbus-1/E_Connman.h
+bin/e_dbus_ukit_test
+include/e_dbus-1/connman0_7x/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
+include/e_dbus-1/E_Hal.h
+include/e_dbus-1/E_Notification_Daemon.h
+include/e_dbus-1/E_Notify.h
+include/e_dbus-1/E_Ofono.h
+include/e_dbus-1/E_Ukit.h
+lib/libeconnman0_7x.so
+lib/libeconnman0_7x.so.2
 lib/libedbus.so
-lib/libedbus.so.1
-%%EHAL%%lib/libehal.so
-%%EHAL%%lib/libehal.so.1
-%%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
+lib/libedbus.so.2
+lib/libehal.so
+lib/libehal.so.2
+lib/libenotify.so
+lib/libenotify.so.2
+lib/libeofono.so
+lib/libeofono.so.2
+lib/libeukit.so
+lib/libeukit.so.2
+libdata/pkgconfig/econnman-0.7x.pc
 libdata/pkgconfig/edbus.pc
-%%EHAL%%libdata/pkgconfig/ehal.pc
-%%ENOT%%libdata/pkgconfig/enotify.pc
-%%EOFONO%%libdata/pkgconfig/eofono.pc
-%%EUKIT%%libdata/pkgconfig/eukit.pc
+libdata/pkgconfig/ehal.pc
+libdata/pkgconfig/enotify.pc
+libdata/pkgconfig/eofono.pc
+libdata/pkgconfig/eukit.pc
+%%DATADIR%%/logo.png
+@dirrm include/e_dbus-1/connman0_7x
 @dirrm include/e_dbus-1
+@dirrm %%DATADIR%%
diff --git a/devel/ecore-file/Makefile b/devel/ecore-file/Makefile
index 02b0dfb40844..163a60f6fd3a 100644
--- a/devel/ecore-file/Makefile
+++ b/devel/ecore-file/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	file
-DISTVERSION=	1.0.1
+DISTVERSION=	1.1.0
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-05-25/base/
+		http://files.roorback.net/e17/2011-12-02/base/
 PKGNAMEPREFIX=	ecore-
 DISTNAME=	ecore-${DISTVERSION}
 
@@ -17,6 +17,7 @@ MAINTAINER=	magik@roorback.net
 COMMENT=	Enlightenment core abstraction library (file module)
 
 LICENSE=	BSD
+
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/ecore-file/distinfo b/devel/ecore-file/distinfo
index 1b6a301ea5d5..30f1faeb45b9 100644
--- a/devel/ecore-file/distinfo
+++ b/devel/ecore-file/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/ecore-1.0.1.tar.bz2) = 66d6c08fa2690b7fe0dc11fedfd08c442d8e1b9a5ea16724053c0f7dd625f366
-SIZE (e17/ecore-1.0.1.tar.bz2) = 903399
+SHA256 (e17/ecore-1.1.0.tar.bz2) = c701a31941e178babad577ede886a98cf472352e5a73ee4717c0ffdc980152cc
+SIZE (e17/ecore-1.1.0.tar.bz2) = 3217298
diff --git a/devel/ecore-file/pkg-descr b/devel/ecore-file/pkg-descr
index 2559668d0e57..de0d636325d6 100644
--- a/devel/ecore-file/pkg-descr
+++ b/devel/ecore-file/pkg-descr
@@ -2,4 +2,4 @@ A core event abstracter layer and X abstraction layer that makes doing
 selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
 fast, optimised, and convenient.
 
-WWW: http://enlightenment.sourceforge.net/Libraries/Ecore/
+WWW: http://docs.enlightenment.org/auto/ecore/
diff --git a/devel/ecore-file/pkg-plist b/devel/ecore-file/pkg-plist
index 1be78d64f6e8..8c6a5b52a3d3 100644
--- a/devel/ecore-file/pkg-plist
+++ b/devel/ecore-file/pkg-plist
@@ -1,5 +1,5 @@
 include/ecore-1/Ecore_File.h
 lib/libecore_file.so
-lib/libecore_file.so.1
+lib/libecore_file.so.2
 libdata/pkgconfig/ecore-file.pc
 @dirrmtry include/ecore-1
diff --git a/devel/ecore-ipc/Makefile b/devel/ecore-ipc/Makefile
index df40b212716e..12d1325c47e9 100644
--- a/devel/ecore-ipc/Makefile
+++ b/devel/ecore-ipc/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	ipc
-DISTVERSION=	1.0.1
+DISTVERSION=	1.1.0
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-05-25/base/
+		http://files.roorback.net/e17/2011-12-02/base/
 PKGNAMEPREFIX=	ecore-
 DISTNAME=	ecore-${DISTVERSION}
 
@@ -17,6 +17,7 @@ MAINTAINER=	magik@roorback.net
 COMMENT=	Enlightenment core abstraction library (ipc module)
 
 LICENSE=	BSD
+
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/ecore-ipc/distinfo b/devel/ecore-ipc/distinfo
index 1b6a301ea5d5..30f1faeb45b9 100644
--- a/devel/ecore-ipc/distinfo
+++ b/devel/ecore-ipc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/ecore-1.0.1.tar.bz2) = 66d6c08fa2690b7fe0dc11fedfd08c442d8e1b9a5ea16724053c0f7dd625f366
-SIZE (e17/ecore-1.0.1.tar.bz2) = 903399
+SHA256 (e17/ecore-1.1.0.tar.bz2) = c701a31941e178babad577ede886a98cf472352e5a73ee4717c0ffdc980152cc
+SIZE (e17/ecore-1.1.0.tar.bz2) = 3217298
diff --git a/devel/ecore-ipc/pkg-descr b/devel/ecore-ipc/pkg-descr
index 2559668d0e57..de0d636325d6 100644
--- a/devel/ecore-ipc/pkg-descr
+++ b/devel/ecore-ipc/pkg-descr
@@ -2,4 +2,4 @@ A core event abstracter layer and X abstraction layer that makes doing
 selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
 fast, optimised, and convenient.
 
-WWW: http://enlightenment.sourceforge.net/Libraries/Ecore/
+WWW: http://docs.enlightenment.org/auto/ecore/
diff --git a/devel/ecore-ipc/pkg-plist b/devel/ecore-ipc/pkg-plist
index 684339caa68e..8870531736a9 100644
--- a/devel/ecore-ipc/pkg-plist
+++ b/devel/ecore-ipc/pkg-plist
@@ -1,5 +1,5 @@
 include/ecore-1/Ecore_Ipc.h
 lib/libecore_ipc.so
-lib/libecore_ipc.so.1
+lib/libecore_ipc.so.2
 libdata/pkgconfig/ecore-ipc.pc
 @dirrmtry include/ecore-1
diff --git a/devel/ecore-main/Makefile b/devel/ecore-main/Makefile
index 099a1be9e2d2..373ad9224b53 100644
--- a/devel/ecore-main/Makefile
+++ b/devel/ecore-main/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	main
-DISTVERSION=	1.0.1
+DISTVERSION=	1.1.0
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-05-25/base/
+		http://files.roorback.net/e17/2011-12-02/base/
 PKGNAMEPREFIX=	ecore-
 DISTNAME=	ecore-${DISTVERSION}
 
@@ -17,15 +17,41 @@ MAINTAINER=	magik@roorback.net
 COMMENT=	Enlightenment core abstraction library (main library)
 
 LICENSE=	BSD
+
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_EFL=	eina libtool_hack
-USE_GETTEXT=	yes
 USE_GNOME=	gnomehack pkgconfig
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 
+EXAMPLESDIR=	${PREFIX}/share/examples/ecore
+
 .include "Makefile.inc"
 
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+CONFIGURE_ARGS+=	--enable-nls
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
+.if !defined(NOPORTEXAMPLES)
+CONFIGURE_ARGS+=	--enable-install-examples
+.else
+CONFIGURE_ARGS+=	--disable-install-examples
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|= \$$(datadir)/\$$(PACKAGE)/examples|= $$(datadir)/examples/$$(PACKAGE)|' \
+		${WRKSRC}/src/examples/Makefile.in
+
+post-install:
+.if defined(NOPORTEXAMPLES)
+	@${RMDIR} ${EXAMPLESDIR}
+.endif
+
 .include <bsd.port.mk>
diff --git a/devel/ecore-main/distinfo b/devel/ecore-main/distinfo
index 1b6a301ea5d5..30f1faeb45b9 100644
--- a/devel/ecore-main/distinfo
+++ b/devel/ecore-main/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/ecore-1.0.1.tar.bz2) = 66d6c08fa2690b7fe0dc11fedfd08c442d8e1b9a5ea16724053c0f7dd625f366
-SIZE (e17/ecore-1.0.1.tar.bz2) = 903399
+SHA256 (e17/ecore-1.1.0.tar.bz2) = c701a31941e178babad577ede886a98cf472352e5a73ee4717c0ffdc980152cc
+SIZE (e17/ecore-1.1.0.tar.bz2) = 3217298
diff --git a/devel/ecore-main/pkg-descr b/devel/ecore-main/pkg-descr
index 2559668d0e57..de0d636325d6 100644
--- a/devel/ecore-main/pkg-descr
+++ b/devel/ecore-main/pkg-descr
@@ -2,4 +2,4 @@ A core event abstracter layer and X abstraction layer that makes doing
 selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
 fast, optimised, and convenient.
 
-WWW: http://enlightenment.sourceforge.net/Libraries/Ecore/
+WWW: http://docs.enlightenment.org/auto/ecore/
diff --git a/devel/ecore-main/pkg-plist b/devel/ecore-main/pkg-plist
index c5410f86f381..b3c94dcbdb7c 100644
--- a/devel/ecore-main/pkg-plist
+++ b/devel/ecore-main/pkg-plist
@@ -1,12 +1,63 @@
 include/ecore-1/Ecore.h
 include/ecore-1/Ecore_Getopt.h
 lib/libecore.so
-lib/libecore.so.1
+lib/libecore.so.2
 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
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_animator_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_client_bench.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_con_client_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_con_client_simple_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_con_lookup_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_con_server_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_con_server_http_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_con_server_simple_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_con_url_cookies_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_con_url_download_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_con_url_headers_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_evas_basics_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_evas_buffer_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_evas_buffer_example_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_evas_callbacks.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_evas_ews_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_evas_object_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_evas_window_sizes_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_event_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_fd_handler_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_fd_handler_gnutls_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_file_download_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_idler_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_job_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_pipe_gstreamer_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_pipe_simple_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_poller_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_server_bench.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_thread_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_time_functions_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_timer_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/red.png
+%%NLS%%share/locale/cs/LC_MESSAGES/ecore.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ecore.mo
+%%NLS%%share/locale/el/LC_MESSAGES/ecore.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/ecore.mo
+%%NLS%%share/locale/it/LC_MESSAGES/ecore.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/ecore.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/ecore.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/ecore.mo
 @dirrmtry include/ecore-1
+%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/cs
+%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/de
+%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/el
+%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fr
+%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/it
+%%NLS%%@dirrmtry share/locale/nl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/nl
+%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pt
+%%NLS%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sl
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/devel/ecore/Makefile b/devel/ecore/Makefile
index 29411e4c2fb0..d486db692e59 100644
--- a/devel/ecore/Makefile
+++ b/devel/ecore/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ecore
-DISTVERSION=	1.0.1
+DISTVERSION=	1.1.0
 PORTEPOCH=	2
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	# none
@@ -39,7 +39,7 @@ OPTIONS+=	off
 USE_EFL_ECORE+=	${NODE}
 .  endif
 . else
-.  if defined(WITH_${NODE:U})
+.  if !defined(WITHOUT_${NODE:U})
 USE_EFL_ECORE+=	${NODE}
 .  endif
 . endif
diff --git a/devel/ecore/pkg-descr b/devel/ecore/pkg-descr
index 2559668d0e57..de0d636325d6 100644
--- a/devel/ecore/pkg-descr
+++ b/devel/ecore/pkg-descr
@@ -2,4 +2,4 @@ A core event abstracter layer and X abstraction layer that makes doing
 selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
 fast, optimised, and convenient.
 
-WWW: http://enlightenment.sourceforge.net/Libraries/Ecore/
+WWW: http://docs.enlightenment.org/auto/ecore/
diff --git a/devel/eet/Makefile b/devel/eet/Makefile
index 74babeb192e5..89a3bd51783e 100644
--- a/devel/eet/Makefile
+++ b/devel/eet/Makefile
@@ -6,18 +6,19 @@
 #
 
 PORTNAME=	eet
-DISTVERSION=	1.4.1
+DISTVERSION=	1.5.0
 PORTEPOCH=	2
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-05-25/base/
+		http://files.roorback.net/e17/2011-12-02/base/
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	Enlightenment Data Handling Library
 
+LICENSE=	BSD
+
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
 
-LICENSE=	BSD
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
@@ -29,7 +30,20 @@ USE_OPENSSL=	yes
 CONFIGURE_ENV=	OPENSSL_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" OPENSSL_LIBS="-lssl"
 CONFIGURE_ARGS=	--disable-gnutls --enable-amalgamation
 
+.if !defined(NOPORTEXAMPLES)
+CONFIGURE_ARGS+=	--enable-install-examples
+.else
+CONFIGURE_ARGS+=	--disable-install-examples
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|= \$$(datadir)/\$$(PACKAGE)/examples|= $$(datadir)/examples/$$(PACKAGE)|' \
+		${WRKSRC}/src/examples/Makefile.in
+
 post-install:
-	${REINPLACE_CMD} 's/ openssl//' ${PREFIX}/libdata/pkgconfig/eet.pc
+	@${REINPLACE_CMD} -i '' -e 's/ openssl//' ${PREFIX}/libdata/pkgconfig/eet.pc
+.if defined(NOPORTEXAMPLES)
+	@${RMDIR} ${EXAMPLESDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/eet/distinfo b/devel/eet/distinfo
index daddb426b15d..a92a672e728b 100644
--- a/devel/eet/distinfo
+++ b/devel/eet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/eet-1.4.1.tar.bz2) = 395853714895e9e57c4b0e76ae5903e7b31597a598b70a8e3063681d96c79ca5
-SIZE (e17/eet-1.4.1.tar.bz2) = 476077
+SHA256 (e17/eet-1.5.0.tar.bz2) = 3a69e4a1b91b3b3d768b2c191624f80511546703dac932088875ca5a590a5d39
+SIZE (e17/eet-1.5.0.tar.bz2) = 518901
diff --git a/devel/eet/pkg-plist b/devel/eet/pkg-plist
index 821eef7bf11a..e57a41701a9d 100644
--- a/devel/eet/pkg-plist
+++ b/devel/eet/pkg-plist
@@ -1,7 +1,14 @@
 bin/eet
 include/eet-1/Eet.h
 lib/libeet.so
-lib/libeet.so.5
+lib/libeet.so.6
 libdata/pkgconfig/eet.pc
-libdata/pkgconfig/eet.pc.bak
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eet-basic.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eet-data-cipher_decipher.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eet-data-file_descriptor_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eet-data-file_descriptor_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eet-file.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eet-data-nested.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eet-data-simple.c
 @dirrm include/eet-1
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/devel/eina/Makefile b/devel/eina/Makefile
index fac9f59acaf7..633bed1ad897 100644
--- a/devel/eina/Makefile
+++ b/devel/eina/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	eina
-DISTVERSION=	1.0.1
+DISTVERSION=	1.1.0
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-05-25/base/
+		http://files.roorback.net/e17/2011-12-02/base/
 
 MAINTAINER=	magik@roorback.net
 COMMENT=	Enlightenment API for data types
 
 LICENSE=	LGPL21
+
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
@@ -23,6 +24,21 @@ USE_EFL=	librt_hack libtool_hack
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 
-CONFIGURE_ARGS=	--enable-amalgamation
+CONFIGURE_ARGS=		--enable-amalgamation
+
+.if !defined(NOPORTEXAMPLES)
+CONFIGURE_ARGS+=	--enable-install-examples
+.else
+CONFIGURE_ARGS+=	--disable-install-examples
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|= \$$(datadir)/\$$(PACKAGE)/examples|= $$(datadir)/examples/$$(PACKAGE)|' \
+		${WRKSRC}/src/examples/Makefile.in
+
+post-install:
+.if defined(NOPORTEXAMPLES)
+	@${RMDIR} ${EXAMPLESDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/eina/distinfo b/devel/eina/distinfo
index 04f1dd17342a..6c67a47f8f1f 100644
--- a/devel/eina/distinfo
+++ b/devel/eina/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/eina-1.0.1.tar.bz2) = 6afe2d0e002a0c734dc6061fe2b70d9ebab2cf55c86732aa36783eed8e9accaf
-SIZE (e17/eina-1.0.1.tar.bz2) = 602689
+SHA256 (e17/eina-1.1.0.tar.bz2) = 0c509c8dcef08945d0932ee5ba76e99eb6b5c3035a1b63ff0ce73e21630193c0
+SIZE (e17/eina-1.1.0.tar.bz2) = 9983287
diff --git a/devel/eina/pkg-plist b/devel/eina/pkg-plist
index b70a24416fcd..66dcef4b190d 100644
--- a/devel/eina/pkg-plist
+++ b/devel/eina/pkg-plist
@@ -2,7 +2,9 @@ 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_binbuf.h
 include/eina-1/eina/eina_binshare.h
+include/eina-1/eina/eina_clist.h
 include/eina-1/eina/eina_convert.h
 include/eina-1/eina/eina_counter.h
 include/eina-1/eina/eina_cpu.h
@@ -18,6 +20,7 @@ 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_lock_posix.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
@@ -31,17 +34,22 @@ 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_lock.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_mmap.h
 include/eina-1/eina/eina_module.h
+include/eina-1/eina/eina_prefix.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_refcount.h
 include/eina-1/eina/eina_safety_checks.h
 include/eina-1/eina/eina_sched.h
+include/eina-1/eina/eina_simple_xml_parser.h
 include/eina-1/eina/eina_str.h
 include/eina-1/eina/eina_strbuf.h
 include/eina-1/eina/eina_stringshare.h
@@ -51,9 +59,38 @@ 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/eina_xattr.h
 include/eina-1/eina_config.h
 lib/libeina.so
-lib/libeina.so.1
+lib/libeina.so.2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_accessor_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_array_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_array_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_error_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_file_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_hash_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_hash_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_hash_03.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_hash_04.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_hash_05.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_hash_06.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_hash_07.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_hash_08.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_inlist_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_inlist_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_inlist_03.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_iterator_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_list_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_list_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_list_03.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_list_04.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_log_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_log_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_log_03.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_str_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_strbuf_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_tiler_01.c
 libdata/pkgconfig/eina.pc
 @dirrm include/eina-1/eina
 @dirrm include/eina-1
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/devel/eio/Makefile b/devel/eio/Makefile
new file mode 100644
index 000000000000..5ad2a22f42ef
--- /dev/null
+++ b/devel/eio/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for:	eio
+# Date created:				02 April 2012
+# Whom:					Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	eio
+DISTVERSION=	0.1.0.65643
+CATEGORIES=	devel enlightenment
+MASTER_SITES=	http://download.enlightenment.org/snapshots/2011-11-28/ \
+		http://files.roorback.net/e17/base/
+
+MAINTAINER=	magik@roorback.net
+COMMENT=	Enlightenment Input/Output Library
+
+LICENSE=	LGPL21
+
+DIST_SUBDIR=	e17
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_EFL=	eina ecore libtool_hack
+USE_GNOME=	gnomehack pkgconfig
+USE_LDCONFIG=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/eio/distinfo b/devel/eio/distinfo
new file mode 100644
index 000000000000..d1cbcee60b58
--- /dev/null
+++ b/devel/eio/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/eio-0.1.0.65643.tar.bz2) = 9352cbf545a66645d07ebdf413b0866b6f13b86e6e0bfed500523427ff6debb7
+SIZE (e17/eio-0.1.0.65643.tar.bz2) = 317461
diff --git a/devel/eio/files/patch-configure b/devel/eio/files/patch-configure
new file mode 100644
index 000000000000..a5d1bfd89a71
--- /dev/null
+++ b/devel/eio/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2012-04-02 17:30:16.831741118 +0200
++++ configure	2012-04-02 17:30:36.938737358 +0200
+@@ -11132,7 +11132,7 @@
+ _ACEOF
+ 
+ version_info="1:0:1"
+-release_info="-release ver-pre-svn-09"
++release_info=""
+ 
+ 
+ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
diff --git a/devel/eio/pkg-descr b/devel/eio/pkg-descr
new file mode 100644
index 000000000000..cecad1c9f20e
--- /dev/null
+++ b/devel/eio/pkg-descr
@@ -0,0 +1,5 @@
+Eio is intended to provide non blocking IO by using thread for all
+operation that may block. It depends only on eina and ecore right now. It
+should integrate all the features/functions of Ecore_File that could block.
+
+WWW: http://docs.enlightenment.org/auto/eio/
diff --git a/devel/eio/pkg-plist b/devel/eio/pkg-plist
new file mode 100644
index 000000000000..387029584514
--- /dev/null
+++ b/devel/eio/pkg-plist
@@ -0,0 +1,6 @@
+include/eio-0/Eio.h
+include/eio-0/eio_inline_helper.x
+lib/libeio.so
+lib/libeio.so.1
+libdata/pkgconfig/eio.pc
+@dirrm include/eio-0