23 files changed, 122 insertions, 115 deletions
diff --git a/devel/e_dbus/Makefile b/devel/e_dbus/Makefile
index 2d90e89..46ba5ce 100644
--- a/devel/e_dbus/Makefile
+++ b/devel/e_dbus/Makefile
@@ -2,18 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	e_dbus
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 PORTEPOCH=	1
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	EFL DBUS connectivity library
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus
 
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
@@ -25,9 +25,9 @@ USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--enable-ehal \
 		--enable-eukit \
-		--enable-econnman0_7x \
-		--enable-eofono \
 		--enable-enotify \
-		--disable-ebluez  # Linux specific ??
+		--disable-econnman0_7x \
+		--disable-eofono \
+		--disable-ebluez
 
 .include <bsd.port.mk>
diff --git a/devel/e_dbus/distinfo b/devel/e_dbus/distinfo
index ff31fc8..1963ee0 100644
--- a/devel/e_dbus/distinfo
+++ b/devel/e_dbus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/e_dbus-1.1.0.tar.bz2) = e3f229ca3f597ab01c89968f6d6e040e977299be19558160a978b9b5377dcb10
-SIZE (e17/e_dbus-1.1.0.tar.bz2) = 404269
+SHA256 (e17/e_dbus-1.7.4.tar.bz2) = c95cd50cbdad1a82bbd993cb6ca431cae8ce918ef38bc1288504da45f5ad733c
+SIZE (e17/e_dbus-1.7.4.tar.bz2) = 440334
diff --git a/devel/e_dbus/pkg-plist b/devel/e_dbus/pkg-plist
index c34c490..cb1bc60 100644
--- a/devel/e_dbus/pkg-plist
+++ b/devel/e_dbus/pkg-plist
@@ -1,37 +1,28 @@
 bin/e-notify-send
-bin/e_dbus_connman0_7x_test
+bin/e_dbus_async_client_test
+bin/e_dbus_async_server_test
 bin/e_dbus_notification_daemon
 bin/e_dbus_notify
-bin/e_dbus_ofono_test
 bin/e_dbus_test
 bin/e_dbus_test_client
 bin/e_dbus_ukit_test
-include/e_dbus-1/connman0_7x/E_Connman.h
 include/e_dbus-1/E_DBus.h
 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.2
+lib/libedbus.so.8
 lib/libehal.so
-lib/libehal.so.2
+lib/libehal.so.8
 lib/libenotify.so
-lib/libenotify.so.2
-lib/libeofono.so
-lib/libeofono.so.2
+lib/libenotify.so.8
 lib/libeukit.so
-lib/libeukit.so.2
-libdata/pkgconfig/econnman-0.7x.pc
+lib/libeukit.so.8
 libdata/pkgconfig/edbus.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 c16cb0a..7a4b0a1 100644
--- a/devel/ecore-file/Makefile
+++ b/devel/ecore-file/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	file
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	ecore-
-DISTNAME=	ecore-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	Enlightenment core abstraction library (file module)
@@ -25,19 +25,20 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 .include "../ecore-main/Makefile.inc"
 
-CONFIGURE_ARGS+=	--enable-ecore-file
+CONFIGURE_ARGS+=--enable-ecore-file
 
-OPTIONS=	CURL	"Enable Curl support"	on
+OPTIONS_DEFINE=	CURL
+OPTIONS_DEFAULT=CURL
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_CURL)
-USE_EFL_ECORE=		con
-CONFIGURE_ARGS+=	--enable-ecore-con \
-			--enable-curl
-LIB_DEPENDS+=		curl.6:${PORTSDIR}/ftp/curl
+.if ${PORT_OPTIONS:MCURL}
+USE_EFL_ECORE=	con
+CONFIGURE_ARGS+=--enable-ecore-con \
+		--enable-curl
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 .else
-CONFIGURE_ARGS+=	--disable-curl
+CONFIGURE_ARGS+=--disable-curl
 .endif
 
 post-patch:
@@ -56,4 +57,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ecore-file.pc \
 		${PREFIX}/libdata/pkgconfig/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/ecore-file/distinfo b/devel/ecore-file/distinfo
index 30f1fae..e479425 100644
--- a/devel/ecore-file/distinfo
+++ b/devel/ecore-file/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/ecore-1.1.0.tar.bz2) = c701a31941e178babad577ede886a98cf472352e5a73ee4717c0ffdc980152cc
-SIZE (e17/ecore-1.1.0.tar.bz2) = 3217298
+SHA256 (e17/ecore-1.7.4.tar.bz2) = 4fa52dece3cfeeb61c89038391c5c25ff31911a6dd187229f8ddb0a1bd61a03d
+SIZE (e17/ecore-1.7.4.tar.bz2) = 3421866
diff --git a/devel/ecore-file/pkg-plist b/devel/ecore-file/pkg-plist
index 8c6a5b5..423c377 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.2
+lib/libecore_file.so.8
 libdata/pkgconfig/ecore-file.pc
 @dirrmtry include/ecore-1
diff --git a/devel/ecore-ipc/Makefile b/devel/ecore-ipc/Makefile
index e34e6ed..89997d8 100644
--- a/devel/ecore-ipc/Makefile
+++ b/devel/ecore-ipc/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	ipc
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	ecore-
-DISTNAME=	ecore-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	Enlightenment core abstraction library (ipc module)
@@ -24,11 +24,12 @@ USE_LDCONFIG=	yes
 BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_ipc
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-OPTIONS=	SSL "Enable SSL support" on
+OPTIONS_DEFINE=	SSL
+OPTIONS_DEFAULT=SSL
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_SSL)
+.if ${PORT_OPTIONS:MSSL}
 CONFIGURE_ENV=		SSL_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" SSL_LIBS="-lssl"
 CONFIGURE_ARGS+=	--enable-openssl
 .else
diff --git a/devel/ecore-ipc/distinfo b/devel/ecore-ipc/distinfo
index 30f1fae..e479425 100644
--- a/devel/ecore-ipc/distinfo
+++ b/devel/ecore-ipc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/ecore-1.1.0.tar.bz2) = c701a31941e178babad577ede886a98cf472352e5a73ee4717c0ffdc980152cc
-SIZE (e17/ecore-1.1.0.tar.bz2) = 3217298
+SHA256 (e17/ecore-1.7.4.tar.bz2) = 4fa52dece3cfeeb61c89038391c5c25ff31911a6dd187229f8ddb0a1bd61a03d
+SIZE (e17/ecore-1.7.4.tar.bz2) = 3421866
diff --git a/devel/ecore-ipc/pkg-plist b/devel/ecore-ipc/pkg-plist
index 8870531..8f4d3ea 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.2
+lib/libecore_ipc.so.8
 libdata/pkgconfig/ecore-ipc.pc
 @dirrmtry include/ecore-1
diff --git a/devel/ecore-main/Makefile b/devel/ecore-main/Makefile
index 4f7a8bf..b1ee7da 100644
--- a/devel/ecore-main/Makefile
+++ b/devel/ecore-main/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	main
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	ecore-
-DISTNAME=	ecore-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	Enlightenment core abstraction library (main library)
@@ -25,20 +25,21 @@ USE_LDCONFIG=	yes
 EXAMPLESDIR=	${PREFIX}/share/examples/ecore
 
 .include "Makefile.inc"
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
-CONFIGURE_ARGS+=	--enable-nls
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS+=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if !defined(NOPORTEXAMPLES)
-CONFIGURE_ARGS+=	--enable-install-examples
+.if ${PORT_OPTIONS:MEXAMPLES}
+CONFIGURE_ARGS+=--enable-install-examples
 .else
-CONFIGURE_ARGS+=	--disable-install-examples
+CONFIGURE_ARGS+=--disable-install-examples
 .endif
 
 post-patch:
@@ -46,7 +47,7 @@ post-patch:
 		${WRKSRC}/src/examples/Makefile.in
 
 post-install:
-.if defined(NOPORTEXAMPLES)
+.if empty(PORT_OPTIONS:MEXAMPLES)
 	@${RMDIR} ${EXAMPLESDIR}
 .endif
 
diff --git a/devel/ecore-main/Makefile.inc b/devel/ecore-main/Makefile.inc
index acd6e9a..fe9648a 100644
--- a/devel/ecore-main/Makefile.inc
+++ b/devel/ecore-main/Makefile.inc
@@ -15,3 +15,5 @@ CONFIGURE_ARGS=	--disable-ecore-con \
 post-patch: ecore_drop_librt
 ecore_drop_librt:
 	@${REINPLACE_CMD} -E -e 's,(rt_libs=).*,\1,g' ${WRKSRC}/configure
+
+PATCHDIR=	"../../devel/ecore-main/files"
diff --git a/devel/ecore-main/distinfo b/devel/ecore-main/distinfo
index 30f1fae..e479425 100644
--- a/devel/ecore-main/distinfo
+++ b/devel/ecore-main/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/ecore-1.1.0.tar.bz2) = c701a31941e178babad577ede886a98cf472352e5a73ee4717c0ffdc980152cc
-SIZE (e17/ecore-1.1.0.tar.bz2) = 3217298
+SHA256 (e17/ecore-1.7.4.tar.bz2) = 4fa52dece3cfeeb61c89038391c5c25ff31911a6dd187229f8ddb0a1bd61a03d
+SIZE (e17/ecore-1.7.4.tar.bz2) = 3421866
diff --git a/devel/ecore-main/pkg-plist b/devel/ecore-main/pkg-plist
index b3c94dc..318aea4 100644
--- a/devel/ecore-main/pkg-plist
+++ b/devel/ecore-main/pkg-plist
@@ -1,7 +1,7 @@
 include/ecore-1/Ecore.h
 include/ecore-1/Ecore_Getopt.h
 lib/libecore.so
-lib/libecore.so.2
+lib/libecore.so.8
 libdata/pkgconfig/ecore.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_animator_example.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_client_bench.c
@@ -21,7 +21,10 @@ libdata/pkgconfig/ecore.pc
 %%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_event_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_event_example_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_exe_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_exe_example_child.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_fd_handler_example.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_fd_handler_gnutls_example.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_file_download_example.c
diff --git a/devel/ecore/Makefile b/devel/ecore/Makefile
index f24c2a5..d795f71 100644
--- a/devel/ecore/Makefile
+++ b/devel/ecore/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ecore
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 PORTEPOCH=	2
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	# none
@@ -15,33 +15,22 @@ COMMENT=	Enlightenment core abstraction library (meta port)
 NO_BUILD=	yes
 USE_EFL=	ecore
 
-ECORE_MODULES=	con evas file imf imf_evas input input_evas ipc sdl x11
-ECORE_sdl_off=	yes
+OPTIONS_DEFINE=	CON EVAS FILE IMF IMF_EVAS INPUT INPUT_EVAS IPC SDL X11
+OPTIONS_DEFAULT=CON EVAS FILE IMF IMF_EVAS INPUT INPUT_EVAS IPC X11
 
-.for NODE in ${ECORE_MODULES}
-OPTIONS+=	${NODE:U} "Install ${NODE} ecore module"
-. if !defined(ECORE_${NODE}_off)
-OPTIONS+=	on
-. else
-OPTIONS+=	off
-. endif
+.for NODE in ${OPTIONS_DEFINE}
+${NODE}_DESC=	Install ${NODE:L} module
 .endfor
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.for NODE in ${ECORE_MODULES}
-. if !defined(ECORE_${NODE}_off)
-.  if !defined(WITHOUT_${NODE:U})
-USE_EFL_ECORE+=	${NODE}
+.for NODE in ${OPTIONS_DEFINE}
+.  if ${PORT_OPTIONS:M${NODE}}
+USE_EFL_ECORE+=	${NODE:L}
 .  endif
-. else
-.  if !defined(WITHOUT_${NODE:U})
-USE_EFL_ECORE+=	${NODE}
-.  endif
-. endif
 .endfor
 
 do-install:
 	${DO_NADA}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/eet/Makefile b/devel/eet/Makefile
index ba2e4c5..47b7c37 100644
--- a/devel/eet/Makefile
+++ b/devel/eet/Makefile
@@ -2,34 +2,36 @@
 # $FreeBSD$
 
 PORTNAME=	eet
-DISTVERSION=	1.5.0
+PORTVERSION=	1.7.4
 PORTEPOCH=	2
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	Enlightenment Data Handling Library
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
 
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_EFL=	eina librt_hack libtool_hack
 USE_GNOME=	gnomehack pkgconfig
-USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
+USE_LDCONFIG=	yes
 
 CONFIGURE_ENV=	OPENSSL_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" OPENSSL_LIBS="-lssl"
-CONFIGURE_ARGS=	--disable-gnutls --enable-amalgamation
+CONFIGURE_ARGS=	--disable-gnutls
+
+.include <bsd.port.options.mk>
 
-.if !defined(NOPORTEXAMPLES)
-CONFIGURE_ARGS+=	--enable-install-examples
+.if ${PORT_OPTIONS:MEXAMPLES}
+CONFIGURE_ARGS+=--enable-install-examples
 .else
-CONFIGURE_ARGS+=	--disable-install-examples
+CONFIGURE_ARGS+=--disable-install-examples
 .endif
 
 post-patch:
@@ -38,7 +40,7 @@ post-patch:
 
 post-install:
 	@${REINPLACE_CMD} -i '' -e 's/ openssl//' ${PREFIX}/libdata/pkgconfig/eet.pc
-.if defined(NOPORTEXAMPLES)
+.if empty(PORT_OPTIONS:MEXAMPLES)
 	@${RMDIR} ${EXAMPLESDIR}
 .endif
 
diff --git a/devel/eet/distinfo b/devel/eet/distinfo
index a92a672..a7673d1 100644
--- a/devel/eet/distinfo
+++ b/devel/eet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/eet-1.5.0.tar.bz2) = 3a69e4a1b91b3b3d768b2c191624f80511546703dac932088875ca5a590a5d39
-SIZE (e17/eet-1.5.0.tar.bz2) = 518901
+SHA256 (e17/eet-1.7.4.tar.bz2) = 6fce549e89d5828fa70c7d67696932a0b40cf4061d0564eee84b6819f60650ef
+SIZE (e17/eet-1.7.4.tar.bz2) = 575676
diff --git a/devel/eet/pkg-plist b/devel/eet/pkg-plist
index e57a4170..2734532 100644
--- a/devel/eet/pkg-plist
+++ b/devel/eet/pkg-plist
@@ -1,7 +1,7 @@
 bin/eet
 include/eet-1/Eet.h
 lib/libeet.so
-lib/libeet.so.6
+lib/libeet.so.8
 libdata/pkgconfig/eet.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eet-basic.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eet-data-cipher_decipher.c
diff --git a/devel/eina/Makefile b/devel/eina/Makefile
index 1c1e059..654a25b 100644
--- a/devel/eina/Makefile
+++ b/devel/eina/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	eina
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	Enlightenment API for data types
@@ -15,17 +15,19 @@ LICENSE=	LGPL21
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack pkgconfig
 USE_EFL=	librt_hack libtool_hack
+USE_GNOME=	gnomehack pkgconfig
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 
-CONFIGURE_ARGS=		--enable-amalgamation
+CONFIGURE_ARGS=	--enable-amalgamation
+
+.include <bsd.port.options.mk>
 
-.if !defined(NOPORTEXAMPLES)
-CONFIGURE_ARGS+=	--enable-install-examples
+.if ${PORT_OPTIONS:MEXAMPLES}
+CONFIGURE_ARGS+=--enable-install-examples
 .else
-CONFIGURE_ARGS+=	--disable-install-examples
+CONFIGURE_ARGS+=--disable-install-examples
 .endif
 
 post-patch:
@@ -33,7 +35,7 @@ post-patch:
 		${WRKSRC}/src/examples/Makefile.in
 
 post-install:
-.if defined(NOPORTEXAMPLES)
+.if empty(PORT_OPTIONS:MEXAMPLES)
 	@${RMDIR} ${EXAMPLESDIR}
 .endif
 
diff --git a/devel/eina/distinfo b/devel/eina/distinfo
index 6c67a47..0d36539 100644
--- a/devel/eina/distinfo
+++ b/devel/eina/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/eina-1.1.0.tar.bz2) = 0c509c8dcef08945d0932ee5ba76e99eb6b5c3035a1b63ff0ce73e21630193c0
-SIZE (e17/eina-1.1.0.tar.bz2) = 9983287
+SHA256 (e17/eina-1.7.4.tar.bz2) = f16da871eabb9e2b34f1fa7d110a9040e07c458bc27ebc7b6b60f43801a78e54
+SIZE (e17/eina-1.7.4.tar.bz2) = 9806158
diff --git a/devel/eina/pkg-plist b/devel/eina/pkg-plist
index 66dcef4..1fd6bb5 100644
--- a/devel/eina/pkg-plist
+++ b/devel/eina/pkg-plist
@@ -13,7 +13,9 @@ 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_inarray.h
 include/eina-1/eina/eina_inline_array.x
+include/eina-1/eina/eina_inline_clist.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
@@ -30,6 +32,7 @@ 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_inline_value.x
 include/eina-1/eina/eina_inlist.h
 include/eina-1/eina/eina_iterator.h
 include/eina-1/eina/eina_lalloc.h
@@ -59,10 +62,11 @@ 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_value.h
 include/eina-1/eina/eina_xattr.h
 include/eina-1/eina_config.h
 lib/libeina.so
-lib/libeina.so.2
+lib/libeina.so.8
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_accessor_01.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_array_01.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_array_02.c
@@ -76,6 +80,8 @@ lib/libeina.so.2
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_hash_06.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_hash_07.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_hash_08.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_inarray_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_inarray_02.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_inlist_01.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_inlist_02.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_inlist_03.c
@@ -87,9 +93,14 @@ lib/libeina.so.2
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_log_01.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_log_02.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_log_03.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_simple_xml_parser_01.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_str_01.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_strbuf_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_stringshare_01.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_tiler_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_value_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_value_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_value_03.c
 libdata/pkgconfig/eina.pc
 @dirrm include/eina-1/eina
 @dirrm include/eina-1
diff --git a/devel/eio/Makefile b/devel/eio/Makefile
index 86702a7..a148c6c 100644
--- a/devel/eio/Makefile
+++ b/devel/eio/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	eio
-DISTVERSION=	0.1.0.65643
+PORTVERSION=	1.7.4
 CATEGORIES=	devel enlightenment
-MASTER_SITES=	http://download.enlightenment.org/snapshots/2011-11-28/ \
-		http://files.roorback.net/e17/base/
+MASTER_SITES=	http://download.enlightenment.org/releases/ \
+		LOCAL/gblach/e17/
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	Enlightenment Input/Output Library
@@ -15,8 +15,12 @@ LICENSE=	LGPL21
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_EFL=	eina ecore libtool_hack
+USE_EFL=	eina eet ecore libtool_hack
 USE_GNOME=	gnomehack pkgconfig
 USE_LDCONFIG=	yes
 
+post-install:
+	@${RMDIR} ${PREFIX}/share/eio/examples
+	@${RMDIR} ${PREFIX}/share/eio
+
 .include <bsd.port.mk>
diff --git a/devel/eio/distinfo b/devel/eio/distinfo
index d1cbcee..922d527 100644
--- a/devel/eio/distinfo
+++ b/devel/eio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/eio-0.1.0.65643.tar.bz2) = 9352cbf545a66645d07ebdf413b0866b6f13b86e6e0bfed500523427ff6debb7
-SIZE (e17/eio-0.1.0.65643.tar.bz2) = 317461
+SHA256 (e17/eio-1.7.4.tar.bz2) = ec762fdc27779e774b6144d8aaea0127694f43a3dfb9809130429e191c7b4063
+SIZE (e17/eio-1.7.4.tar.bz2) = 355980
diff --git a/devel/eio/pkg-plist b/devel/eio/pkg-plist
index 3870295..64e86fd 100644
--- a/devel/eio/pkg-plist
+++ b/devel/eio/pkg-plist
@@ -1,6 +1,6 @@
-include/eio-0/Eio.h
-include/eio-0/eio_inline_helper.x
+include/eio-1/Eio.h
+include/eio-1/eio_inline_helper.x
 lib/libeio.so
-lib/libeio.so.1
+lib/libeio.so.8
 libdata/pkgconfig/eio.pc
-@dirrm include/eio-0
+@dirrm include/eio-1