- Update Enlightenment to 0.17.0

- Update EFL to 1.7.4 - Convert to OptionsNG Approved by: crees (mentor)
author: gblach <gblach@FreeBSD.org> 2012-12-22 20:54:59 +0000
committer: gblach <gblach@FreeBSD.org> 2012-12-22 20:54:59 +0000
commit: fb6528c60e3ea4f5ff74de6f21724d7ad28c0f7b (patch)
tree: 9c4bc08591050b7b536082be6db8392c913f8089
parent: 35e83ae5ca4ef2876eccf0e512467ede97187fb9 (diff)
download: FreeBSD-ports-fb6528c60e3ea4f5ff74de6f21724d7ad28c0f7b.zip
FreeBSD-ports-fb6528c60e3ea4f5ff74de6f21724d7ad28c0f7b.tar.gz
266 files changed, 2256 insertions, 1225 deletions
diff --git a/Mk/bsd.efl.mk b/Mk/bsd.efl.mk
index 8d56849..ff0eb28 100644
--- a/Mk/bsd.efl.mk
+++ b/Mk/bsd.efl.mk
@@ -23,7 +23,7 @@
 # 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
+#			on the target system
 #
 # 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
@@ -36,66 +36,70 @@ EFL_Include_MAINTAINER=	gblach@FreeBSD.org
 #
 # Define all supported libraries
 #
-_USE_EFL_ALL=	ecore edbus edje eet efreet eio eina elementary embryo emotion \
-		epeg evas imlib2
+_USE_EFL_ALL=	ecore edbus edje eet efreet eio eina elementary embryo \
+		emotion ender enesim epeg esvg etch ethumb evas 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=	devel
-_ecore_DEPENDS=		eina
 _ecore_PORTNAME=	ecore-main
-_ecore_VERSION=		2
+_ecore_VERSION=		8
 
 _edbus_CATEGORY=	devel
 _edbus_PORTNAME=	e_dbus
-_edbus_VERSION=		2
+_edbus_VERSION=		8
 
 _eet_CATEGORY=		devel
-_eet_DEPENDS=		eina
-_eet_VERSION=		6
+_eet_VERSION=		8
 
 _efreet_CATEGORY=	x11
-_efreet_DEPENDS=	ecore eina
-_efreet_VERSION=	2
+_efreet_VERSION=	8
 
 _edje_CATEGORY=		graphics
-_edje_DEPENDS=		ecore eet embryo evas
-_edje_VERSION=		2
+_edje_VERSION=		8
 
 _eio_CATEGORY=		devel
-_eio_DEPENDS=		ecore eina
-_eio_VERSION=		1
+_eio_VERSION=		8
 
 _eina_CATEGORY=		devel
-_eina_VERSION=		2
+_eina_VERSION=		8
 
 _elementary_CATEGORY=	x11-toolkits
-_elementary_DEPENDS=	ecore embryo edje
 _elementary_VERSION=	8
 
 _embryo_CATEGORY=	lang
-_embryo_DEPENDS=	eina
-_embryo_VERSION=	2
+_embryo_VERSION=	8
 
 _emotion_CATEGORY=	multimedia
-_emotion_DEPENDS=	ecore edje eet eio embryo evas
-_emotion_VERSION=	2
+_emotion_VERSION=	8
+
+_ender_CATEGORY=	graphics
+_ender_VERSION=		0
+
+_enesim_CATEGORY=	graphics
+_enesim_VERSION=	0
 
 _epeg_CATEGORY=		graphics
 _epeg_VERSION=		9
 
+_esvg_CATEGORY=		www
+_esvg_PORTNAME=		egueb
+_esvg_VERSION=		0
+
+_etch_CATEGORY=		graphics
+_etch_VERSION=		0
+
+_ethumb_CATEGORY=	graphics
+_ethumb_VERSION=	8
+
 _evas_CATEGORY=		graphics
-_evas_DEPENDS=		eina eet
 _evas_PORTNAME=		evas-core
-_evas_VERSION=		2
+_evas_VERSION=		8
 
 _imlib2_CATEGORY=	graphics
 _imlib2_VERSION=	5
@@ -105,9 +109,6 @@ _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
@@ -128,14 +129,15 @@ _${LIB}_PREFIX=${LOCALBASE}
 #
 
 # All components that are currently supported
-_EFL_EVAS_ENGINES_ALL= buffer opengl sdl x11
-_EFL_EVAS_LOADERS_ALL= bmp edb eet gif ico jpeg png pmaps psd svg tga tiff wbmp xpm
+_EFL_EVAS_ENGINES_ALL=	buffer opengl sdl x11
+_EFL_EVAS_LOADERS_ALL=	bmp edb eet generic gif ico jpeg \
+			png pmaps psd svg tga tiff wbmp xpm
 
 #
 # Generic evas engines definitions
 #
-_EFL_EVAS_CATEGORY=	graphics
-_EFL_EVAS_MODDIR=	${LOCALBASE}/lib/evas/modules/
+_EFL_EVAS_CATEGORY=		graphics
+_EFL_EVAS_MODDIR=		${LOCALBASE}/lib/evas/modules/
 _EFL_EVAS_ENGINES_MODDIR=	${_EFL_EVAS_MODDIR}/engines/
 _EFL_EVAS_LOADERS_MODDIR=	${_EFL_EVAS_MODDIR}/loaders/
 
@@ -145,7 +147,7 @@ _EFL_EVAS_LOADERS_MODDIR=	${_EFL_EVAS_MODDIR}/loaders/
 
 _evas_engine_buffer_DIR=	buffer
 _evas_engine_opengl_DIR=	gl_x11
-_evas_engine_sdl_DIR=		software_sdl
+_evas_engine_sdl_DIR=		software_16_sdl
 _evas_engine_x11_DIR=		software_x11
 
 #
@@ -184,8 +186,8 @@ _evas_loader_${COMP}_DIR=	${COMP}
 #
 
 # All components that are currently supported
-_EFL_ECORE_ALL=	con config desktop evas file imf imf_evas input \
-		input_evas ipc job sdl txt x11
+_EFL_ECORE_ALL=	con config desktop evas file imf imf_evas \
+		input input_evas ipc job sdl txt x11
 
 #
 # Generic ecore definitions
@@ -215,10 +217,10 @@ _ecore_x11_NAME=		ecore_x
 #
 .for COMP in ${_EFL_ECORE_ALL}
 . if !defined(_ecore_${COMP}_CATEGORY)
-_ecore_${COMP}_CATEGORY=	${_EFL_ECORE_CATEGORY}
+_ecore_${COMP}_CATEGORY=${_EFL_ECORE_CATEGORY}
 . endif
 . if !defined(_ecore_${COMP}_PORTNAME)
-_ecore_${COMP}_PORTNAME=	ecore-${COMP}
+_ecore_${COMP}_PORTNAME=ecore-${COMP}
 . endif
 . if !defined(_ecore_${COMP}_NAME)
 _ecore_${COMP}_NAME=	ecore_${COMP}
@@ -368,7 +370,7 @@ _USE_EFL=	#empty
 . if ${_USE_EFL_ALL:M${LIB}}==""
 IGNORE=	cannot install: unknown library ${LIB}
 . else
-_USE_EFL+=	${_${LIB}_DEPENDS} ${LIB}
+_USE_EFL+=	${LIB}
 . endif
 .endfor
 
@@ -405,8 +407,8 @@ PLIST_SUB+=	E17_ARCH=freebsd${OSREL}-${ARCH}
 post-patch: efl_drop_librt
 efl_drop_librt:
 	@${REINPLACE_CMD} -E \
-	    -e '/^[[:space:]]+freebsd\*/,/^[[:space:]];;/s/-lrt//g' \
-	    ${WRKSRC}/configure
+		-e '/^[[:space:]]+freebsd\*/,/^[[:space:]];;/s/-lrt//g' \
+		${WRKSRC}/configure
 .endif
 
 .if defined(_USE_EFL_MODARCH_HACK)
@@ -416,9 +418,9 @@ efl_drop_librt:
 post-patch: efl_patch_modarch
 efl_patch_modarch:
 	@${REINPLACE_CMD} -E \
-	    -e 's/(MODULE_ARCH="\$$host_os-\$$host_cpu)-[^"]+"/\1"/g' \
-	    -e 's/(MODULE_EDJE="\$$host_os-\$$host_cpu)-[^"]+"/\1"/g' \
-	    ${WRKSRC}/configure
+		-e 's/(MODULE_ARCH="\$$host_os-\$$host_cpu)-[^"]+"/\1"/g' \
+		-e 's/(MODULE_EDJE="\$$host_os-\$$host_cpu)-[^"]+"/\1"/g' \
+		${WRKSRC}/configure
 .endif
 
 .if defined(_USE_EFL_LIBTOOL_HACK)
@@ -428,7 +430,7 @@ efl_patch_modarch:
 post-configure: efl_drop_la
 efl_drop_la:
 	${REINPLACE_CMD} -E -e \
-	    '/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool
+		'/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool
 .endif
 
 .endif #USE_EFL
diff --git a/benchmarks/expedite/Makefile b/benchmarks/expedite/Makefile
index 51ac7043..46470bf 100644
--- a/benchmarks/expedite/Makefile
+++ b/benchmarks/expedite/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	expedite
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	benchmarks 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=	Expedite is a benchmark suite for Evas
@@ -20,25 +20,29 @@ USE_EFL_EVAS_ENGINES=	buffer
 USE_GNOME=	gnomehack pkgconfig
 USE_LDCONFIG=	yes
 
-OPTIONS=		OPENGL	"Enable OpenGL engine"	on \
-			SDL	"Enable SDL engine"	off \
-			X11	"Enable X11 engine"	on
+OPTIONS_DEFINE=	OPENGL SDL X11
+OPTIONS_DEFAULT=OPENGL X11
+OPENGL_DESC=	Enable OpenGL evas engine
+SDL_DESC=	Enable SDL evas engine
+X11_DESC=	Enable X11 evas engine
 
-.if !defined(WITHOUT_OPENGL)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MOPENGL}
 USE_EFL_EVAS_ENGINES+=	opengl
 CONFIGURE_ARGS+=	--enable-opengl-x11
 .else
 CONFIGURE_ARGS+=	--disable-opengl-x11
 .endif
 
-.if !defined(WITHOUT_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_EFL_EVAS_ENGINES+=	sdl
 CONFIGURE_ARGS+=	--enable-software-sdl
 .else
 CONFIGURE_ARGS+=	--disable-software-sdl
 .endif
 
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 USE_EFL_EVAS_ENGINES+=	x11
 CONFIGURE_ARGS+=	--enable-software-x11 --enable-xrender-x11
 .else
diff --git a/benchmarks/expedite/distinfo b/benchmarks/expedite/distinfo
index b76b48b..5640bad 100644
--- a/benchmarks/expedite/distinfo
+++ b/benchmarks/expedite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/expedite-1.1.0.tar.bz2) = 47112c44146a91c55bc156b01e710eba9b07109ed09668fd2cdbc558f2db0e8b
-SIZE (e17/expedite-1.1.0.tar.bz2) = 5833503
+SHA256 (e17/expedite-1.7.4.tar.bz2) = 8d547b2cae69045c01765ea5903be17f7174c31133b3309ffc2a9a8409f8c330
+SIZE (e17/expedite-1.7.4.tar.bz2) = 5792836
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
diff --git a/graphics/Makefile b/graphics/Makefile
index 7a6ddc7..003cb8d 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -144,6 +144,8 @@
     SUBDIR += electriceyes
     SUBDIR += electrix
     SUBDIR += enblend
+    SUBDIR += ender
+    SUBDIR += enesim
     SUBDIR += enfle
     SUBDIR += eog
     SUBDIR += eog-plugins
@@ -153,6 +155,7 @@
     SUBDIR += epix
     SUBDIR += eps2png
     SUBDIR += epstool
+    SUBDIR += etch
     SUBDIR += eterm-bg
     SUBDIR += ethumb
     SUBDIR += evas
diff --git a/graphics/ecore-evas/Makefile b/graphics/ecore-evas/Makefile
index f15a8bd..a03dc3d 100644
--- a/graphics/ecore-evas/Makefile
+++ b/graphics/ecore-evas/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	evas
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics 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 (evas module)
@@ -30,14 +30,23 @@ CONFIGURE_ARGS+=	--enable-ecore-evas \
 			--enable-ecore-input \
 			--enable-ecore-input_evas
 
-OPTIONS=	X11	"Enable Evas X11 support"	on \
-		GL	"Enable Evas GL support"	on \
-		BUFFER	"Enable Evas Buffer support"	on \
-		SDL	"Enable Evas SDL support"	off
+OPTIONS_DEFINE=	BUFFER OPENGL SDL X11
+OPTIONS_DEFAULT=BUFFER OPENGL X11
+BUFFER_DESC=	Enable Buffer evas engine
+OPENGL_DESC=	Enable OpenGL evas engine
+SDL_DESC=	Enable SDL evas engine
+X11_DESC=	Enable X11 evas engine
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_GL)
+.if ${PORT_OPTIONS:MBUFFER}
+CONFIGURE_ARGS+=	--enable-ecore-evas-software-buffer
+USE_EFL_EVAS_ENGINES+=	buffer
+.else
+CONFIGURE_ARGS+=	--disable-ecore-evas-software-buffer
+.endif
+
+.if ${PORT_OPTIONS:MOPENGL}
 CONFIGURE_ARGS+=	--enable-ecore-evas-opengl-x11
 USE_EFL_EVAS_ENGINES+=	opengl
 WITH_X=			yes
@@ -45,22 +54,7 @@ WITH_X=			yes
 CONFIGURE_ARGS+=	--disable-ecore-evas-opengl-x11
 .endif
 
-.if !defined(WITHOUT_X11)
-CONFIGURE_ARGS+=	--enable-ecore-x
-USE_EFL_ECORE+=		x11
-USE_EFL_EVAS_ENGINES+=	x11
-.else
-CONFIGURE_ARGS+=	--disable-ecore-x
-.endif
-
-.if !defined(WITHOUT_BUFFER)
-CONFIGURE_ARGS+=	--enable-ecore-evas-software-buffer
-USE_EFL_EVAS_ENGINES+=	buffer
-.else
-CONFIGURE_ARGS+=	--disable-ecore-evas-software-buffer
-.endif
-
-.if !defined(WITHOUT_SDL)
+.if ${PORT_OPTIONS:MSDL}
 CONFIGURE_ARGS+=	--enable-ecore-evas-software-sdl --enable-ecore-sdl
 USE_EFL_EVAS_ENGINES+=	sdl
 USE_EFL_ECORE+=	sdl
@@ -68,6 +62,14 @@ USE_EFL_ECORE+=	sdl
 CONFIGURE_ARGS+=	--disable-ecore-evas-software-sdl --disable-ecore-sdl
 .endif
 
+.if ${PORT_OPTIONS:MX11}
+CONFIGURE_ARGS+=	--enable-ecore-x
+USE_EFL_ECORE+=		x11
+USE_EFL_EVAS_ENGINES+=	x11
+.else
+CONFIGURE_ARGS+=	--disable-ecore-x
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -E \
 		-e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
@@ -86,4 +88,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ecore-evas.pc \
 		${PREFIX}/libdata/pkgconfig/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/ecore-evas/distinfo b/graphics/ecore-evas/distinfo
index 30f1fae..e479425 100644
--- a/graphics/ecore-evas/distinfo
+++ b/graphics/ecore-evas/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/graphics/ecore-evas/pkg-plist b/graphics/ecore-evas/pkg-plist
index fd77c7c..3bb2faa 100644
--- a/graphics/ecore-evas/pkg-plist
+++ b/graphics/ecore-evas/pkg-plist
@@ -1,4 +1,4 @@
 include/ecore-1/Ecore_Evas.h
 lib/libecore_evas.so
-lib/libecore_evas.so.2
+lib/libecore_evas.so.8
 libdata/pkgconfig/ecore-evas.pc
diff --git a/graphics/ecore-sdl/Makefile b/graphics/ecore-sdl/Makefile
index 1bd9631..dd5f8be 100644
--- a/graphics/ecore-sdl/Makefile
+++ b/graphics/ecore-sdl/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	sdl
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics 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 (sdl module)
@@ -17,10 +17,10 @@ LICENSE=	BSD
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_SDL=	sdl
 USE_EFL=	ecore libtool_hack
 USE_EFL_ECORE=	input
 USE_GNOME=	gnomehack pkgconfig
+USE_SDL=	sdl
 USE_LDCONFIG=	yes
 BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_sdl
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
diff --git a/graphics/ecore-sdl/distinfo b/graphics/ecore-sdl/distinfo
index 30f1fae..e479425 100644
--- a/graphics/ecore-sdl/distinfo
+++ b/graphics/ecore-sdl/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/graphics/ecore-sdl/pkg-plist b/graphics/ecore-sdl/pkg-plist
index ef485f2..4e71bdd 100644
--- a/graphics/ecore-sdl/pkg-plist
+++ b/graphics/ecore-sdl/pkg-plist
@@ -1,4 +1,4 @@
 include/ecore-1/Ecore_Sdl.h
 lib/libecore_sdl.so
-lib/libecore_sdl.so.2
+lib/libecore_sdl.so.8
 libdata/pkgconfig/ecore-sdl.pc
diff --git a/graphics/edje/Makefile b/graphics/edje/Makefile
index 0244f24..f50f678 100644
--- a/graphics/edje/Makefile
+++ b/graphics/edje/Makefile
@@ -2,18 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	edje
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 PORTEPOCH=	2
 CATEGORIES=	graphics 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=	Edje is a complex graphical design and layout engine
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	lua-5.1:${PORTSDIR}/lang/lua
+LIB_DEPENDS=	lua-5:${PORTSDIR}/lang/lua
 RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
 
 DIST_SUBDIR=	e17
@@ -27,12 +27,6 @@ USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS+=	--without-vim
 
-.if !defined(NOPORTEXAMPLES)
-CONFIGURE_ARGS+=	--enable-install-examples
-.else
-CONFIGURE_ARGS+=	--disable-install-examples
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -E -e "/^SUBDIRS[[:space:]]+=/s/utils//" \
 	    ${WRKSRC}/Makefile.in
@@ -41,8 +35,5 @@ post-patch:
 
 post-install:
 	-update-mime-database ${PREFIX}/share/mime
-.if defined(NOPORTEXAMPLES)
-	@${RMDIR} ${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/edje/distinfo b/graphics/edje/distinfo
index dda4802..5582b62 100644
--- a/graphics/edje/distinfo
+++ b/graphics/edje/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/edje-1.1.0.tar.bz2) = c662a65897a985b08a3f63a41672e33e20de4c53657859742ab66024977641bd
-SIZE (e17/edje-1.1.0.tar.bz2) = 933474
+SHA256 (e17/edje-1.7.4.tar.bz2) = fed509fac974c1f831b796678a693cf319807c8b869505490d4e4cdc7b7d0b8b
+SIZE (e17/edje-1.7.4.tar.bz2) = 1090395
diff --git a/graphics/edje/pkg-plist b/graphics/edje/pkg-plist
index 65ee429..94b9a5d 100644
--- a/graphics/edje/pkg-plist
+++ b/graphics/edje/pkg-plist
@@ -7,46 +7,68 @@ bin/edje_player
 include/edje-1/Edje.h
 include/edje-1/Edje_Edit.h
 lib/libedje.so
-lib/libedje.so.2
+lib/libedje.so.8
 lib/edje/utils/epp
 libdata/pkgconfig/edje.pc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Vera.ttf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animations.edc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic.edc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/box.edc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bubble.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/color-class.edc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drag.edc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/edje-animations.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/edje-basic.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/edje-box.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/edje-box2.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/edje-color-class.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/edje-drag.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/edje-perspective.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/edje-signals-messages.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/edje-swallow.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/edje-table.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/edje-text.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lua_script.edc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perspective.edc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/red.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/signals-messages.edc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sigtest.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sigtest.edc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swallow.edc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/table.edc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/text.edc
+%%EXAMPLESDIR%%/Vera.ttf
+%%EXAMPLESDIR%%/animations.edc
+%%EXAMPLESDIR%%/animations2.c
+%%EXAMPLESDIR%%/animations2.edc
+%%EXAMPLESDIR%%/basic.edc
+%%EXAMPLESDIR%%/basic2.edc
+%%EXAMPLESDIR%%/box.edc
+%%EXAMPLESDIR%%/bubble.png
+%%EXAMPLESDIR%%/color-class.edc
+%%EXAMPLESDIR%%/drag.edc
+%%EXAMPLESDIR%%/duck.wav
+%%EXAMPLESDIR%%/edje-animations.c
+%%EXAMPLESDIR%%/edje-basic.c
+%%EXAMPLESDIR%%/edje-basic2.c
+%%EXAMPLESDIR%%/edje-box.c
+%%EXAMPLESDIR%%/edje-box2.c
+%%EXAMPLESDIR%%/edje-color-class.c
+%%EXAMPLESDIR%%/edje-drag.c
+%%EXAMPLESDIR%%/edje-perspective.c
+%%EXAMPLESDIR%%/edje-signals-messages.c
+%%EXAMPLESDIR%%/edje-swallow.c
+%%EXAMPLESDIR%%/edje-swallow2.c
+%%EXAMPLESDIR%%/edje-table.c
+%%EXAMPLESDIR%%/edje-text.c
+%%EXAMPLESDIR%%/edje_example.c
+%%EXAMPLESDIR%%/edje_example.edc
+%%EXAMPLESDIR%%/embryo_custom_state.edc
+%%EXAMPLESDIR%%/embryo_pong.edc
+%%EXAMPLESDIR%%/embryo_run_program.edc
+%%EXAMPLESDIR%%/embryo_set_state.edc
+%%EXAMPLESDIR%%/embryo_set_text.edc
+%%EXAMPLESDIR%%/embryo_timer.edc
+%%EXAMPLESDIR%%/external_elm_anchorblock.edc
+%%EXAMPLESDIR%%/external_elm_button.edc
+%%EXAMPLESDIR%%/external_elm_check.edc
+%%EXAMPLESDIR%%/external_elm_panes.edc
+%%EXAMPLESDIR%%/external_emotion_elm.edc
+%%EXAMPLESDIR%%/lua_script.edc
+%%EXAMPLESDIR%%/perspective.edc
+%%EXAMPLESDIR%%/red.png
+%%EXAMPLESDIR%%/signals-messages.edc
+%%EXAMPLESDIR%%/signalsBubble.edc
+%%EXAMPLESDIR%%/signals2.c
+%%EXAMPLESDIR%%/sigtest.c
+%%EXAMPLESDIR%%/sigtest.edc
+%%EXAMPLESDIR%%/swallow.edc
+%%EXAMPLESDIR%%/table.edc
+%%EXAMPLESDIR%%/test.png
+%%EXAMPLESDIR%%/text.edc
+%%EXAMPLESDIR%%/toggle_using_filter.edc
 %%DATADIR%%/include/edje.inc
 share/mime/packages/edje.xml
 @dirrmtry share/mime/packages
 @dirrmtry share/mime
 @dirrm lib/edje/utils
-@dirrm lib/edje
+@dirrmtry lib/edje
 @dirrm include/edje-1
 @dirrm %%DATADIR%%/include
 @dirrm %%DATADIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+@dirrm %%EXAMPLESDIR%%
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
diff --git a/graphics/edje_viewer/Makefile b/graphics/edje_viewer/Makefile
index 9b72b7e..10de1f0 100644
--- a/graphics/edje_viewer/Makefile
+++ b/graphics/edje_viewer/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	edje_viewer
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/extra/
 
@@ -15,7 +15,6 @@ GNU_CONFIGURE=	yes
 USE_EFL=	evas ecore edje elementary
 USE_EFL_ECORE=	file
 USE_GNOME=	gnomehack pkgconfig
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/edje_viewer/distinfo b/graphics/edje_viewer/distinfo
index 61e2783..655ce45 100644
--- a/graphics/edje_viewer/distinfo
+++ b/graphics/edje_viewer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/edje_viewer-20111128.tar.bz2) = e42c94981640a7fbd5d4e6c986e6cff82baec1ee32f7d4705fa2cd025d967d80
-SIZE (e17/edje_viewer-20111128.tar.bz2) = 255382
+SHA256 (e17/edje_viewer-20120918.tar.bz2) = ab96879da389de093ff94816162343f49a81a8a7d28d196898070599d5343d22
+SIZE (e17/edje_viewer-20120918.tar.bz2) = 276412
diff --git a/graphics/ender/Makefile b/graphics/ender/Makefile
new file mode 100644
index 0000000..82c9dba
--- /dev/null
+++ b/graphics/ender/Makefile
@@ -0,0 +1,30 @@
+# Created by: Grzegorz Blach <gblach@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	ender
+PORTVERSION=	20121003
+CATEGORIES=	graphics enlightenment
+MASTER_SITES=	http://files.roorback.net/e17/extra/
+
+MAINTAINER=	gblach@FreeBSD.org
+COMMENT=	Ender provide common API for enesim renderers
+
+LICENSE=	LGPL21
+
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+
+DIST_SUBDIR=	e17
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_BISON=	build
+USE_EFL=	eina enesim libtool_hack
+USE_GNOME=	gnomehack pkgconfig
+USE_LDCONFIG=	yes
+
+CONFIGURE_ARGS=	--disable-static
+
+post-patch:
+	@${REINPLACE_CMD} -e "s|@LEX@|${LOCALBASE}/bin/flex|" \
+		${WRKSRC}/src/lib/Makefile.in
+
+.include <bsd.port.mk>
diff --git a/graphics/ender/distinfo b/graphics/ender/distinfo
new file mode 100644
index 0000000..529c4f8
--- /dev/null
+++ b/graphics/ender/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/ender-20121003.tar.bz2) = 91b505a85e1b7c33dbe0352920fa3e2a5007744e2e57744a67813c654458b120
+SIZE (e17/ender-20121003.tar.bz2) = 542973
diff --git a/graphics/ender/pkg-descr b/graphics/ender/pkg-descr
new file mode 100644
index 0000000..4c0e179
--- /dev/null
+++ b/graphics/ender/pkg-descr
@@ -0,0 +1,4 @@
+Ender is a library that loads descriptions of enesim renderers and abstracts
+them into a collection of properties that are accesible through a common API.
+
+WWW: http://code.google.com/p/enesim/
diff --git a/graphics/ender/pkg-plist b/graphics/ender/pkg-plist
new file mode 100644
index 0000000..8c62f4c
--- /dev/null
+++ b/graphics/ender/pkg-plist
@@ -0,0 +1,9 @@
+bin/ender_generator
+bin/ender_inspect
+include/Ender.h
+lib/libender.so
+lib/libender.so.0
+libdata/pkgconfig/ender.pc
+%%DATADIR%%/enesim.ender
+%%DATADIR%%/etex.ender
+@dirrmtry %%DATADIR%%
diff --git a/graphics/enesim/Makefile b/graphics/enesim/Makefile
new file mode 100644
index 0000000..4e25007
--- /dev/null
+++ b/graphics/enesim/Makefile
@@ -0,0 +1,23 @@
+# Created by: Grzegorz Blach <gblach@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	enesim
+PORTVERSION=	20121003
+CATEGORIES=	graphics enlightenment
+MASTER_SITES=	http://files.roorback.net/e17/extra/
+
+MAINTAINER=	gblach@FreeBSD.org
+COMMENT=	Rendering library focused on flexibility and extensibility
+
+LICENSE=	LGPL21
+
+DIST_SUBDIR=	e17
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_EFL=	eina libtool_hack
+USE_GNOME=	gnomehack pkgconfig
+USE_LDCONFIG=	yes
+
+CONFIGURE_ARGS=	--disable-static
+
+.include <bsd.port.mk>
diff --git a/graphics/enesim/distinfo b/graphics/enesim/distinfo
new file mode 100644
index 0000000..b6e8d16
--- /dev/null
+++ b/graphics/enesim/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/enesim-20121003.tar.bz2) = 75b43f36279a4569fd884a249bd274fbecfc84a10443544f741ec7a73862c766
+SIZE (e17/enesim-20121003.tar.bz2) = 755472
diff --git a/graphics/enesim/pkg-descr b/graphics/enesim/pkg-descr
new file mode 100644
index 0000000..5fa80be
--- /dev/null
+++ b/graphics/enesim/pkg-descr
@@ -0,0 +1,7 @@
+Enesim basically it is a rendering library, that is, it allows you
+to draw different graphics primitives (in Enesim it is called a Renderer)
+into a target drawable (in Enesim a Surface). Given that a Renderer
+can draw anything, it has its own state that is modified through
+the renderer's specific properties setters and getters.
+
+WWW: http://code.google.com/p/enesim/
diff --git a/graphics/enesim/pkg-plist b/graphics/enesim/pkg-plist
new file mode 100644
index 0000000..d79fe5e
--- /dev/null
+++ b/graphics/enesim/pkg-plist
@@ -0,0 +1,52 @@
+bin/emage_example01
+bin/emage_example02
+include/Emage.h
+include/Enesim.h
+include/Etex.h
+include/enesim/enesim_buffer.h
+include/enesim/enesim_color.h
+include/enesim/enesim_compositor.h
+include/enesim/enesim_converter.h
+include/enesim/enesim_eina.h
+include/enesim/enesim_error.h
+include/enesim/enesim_main.h
+include/enesim/enesim_matrix.h
+include/enesim/enesim_perlin.h
+include/enesim/enesim_pool.h
+include/enesim/enesim_rectangle.h
+include/enesim/enesim_renderer.h
+include/enesim/enesim_renderer_background.h
+include/enesim/enesim_renderer_checker.h
+include/enesim/enesim_renderer_circle.h
+include/enesim/enesim_renderer_clipper.h
+include/enesim/enesim_renderer_compound.h
+include/enesim/enesim_renderer_dispmap.h
+include/enesim/enesim_renderer_ellipse.h
+include/enesim/enesim_renderer_figure.h
+include/enesim/enesim_renderer_gradient.h
+include/enesim/enesim_renderer_gradient_linear.h
+include/enesim/enesim_renderer_gradient_radial.h
+include/enesim/enesim_renderer_grid.h
+include/enesim/enesim_renderer_image.h
+include/enesim/enesim_renderer_importer.h
+include/enesim/enesim_renderer_line.h
+include/enesim/enesim_renderer_path.h
+include/enesim/enesim_renderer_pattern.h
+include/enesim/enesim_renderer_perlin.h
+include/enesim/enesim_renderer_proxy.h
+include/enesim/enesim_renderer_raddist.h
+include/enesim/enesim_renderer_rectangle.h
+include/enesim/enesim_renderer_shape.h
+include/enesim/enesim_renderer_stripes.h
+include/enesim/enesim_renderer_transition.h
+include/enesim/enesim_surface.h
+lib/libemage.so
+lib/libemage.so.0
+lib/libenesim.so
+lib/libenesim.so.0
+lib/libetex.so
+lib/libetex.so.0
+libdata/pkgconfig/emage.pc
+libdata/pkgconfig/enesim.pc
+libdata/pkgconfig/etex.pc
+@dirrm include/enesim
diff --git a/graphics/etch/Makefile b/graphics/etch/Makefile
new file mode 100644
index 0000000..7960e53
--- /dev/null
+++ b/graphics/etch/Makefile
@@ -0,0 +1,23 @@
+# Created by: Grzegorz Blach <gblach@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	etch
+PORTVERSION=	20121003
+CATEGORIES=	graphics enlightenment
+MASTER_SITES=	http://files.roorback.net/e17/extra/
+
+MAINTAINER=	gblach@FreeBSD.org
+COMMENT=	Etch is an abstract time based animation library
+
+LICENSE=	LGPL21
+
+DIST_SUBDIR=	e17
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_EFL=	eina enesim libtool_hack
+USE_GNOME=	gnomehack pkgconfig
+USE_LDCONFIG=	yes
+
+CONFIGURE_ARGS=	--disable-static
+
+.include <bsd.port.mk>
diff --git a/graphics/etch/distinfo b/graphics/etch/distinfo
new file mode 100644
index 0000000..149f375
--- /dev/null
+++ b/graphics/etch/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/etch-20121003.tar.bz2) = 8b1294f1f091dff02c3738e67e35c2ce3f44bf3bf1f1ae7cd6709564f2b3b9ac
+SIZE (e17/etch-20121003.tar.bz2) = 482236
diff --git a/graphics/etch/pkg-descr b/graphics/etch/pkg-descr
new file mode 100644
index 0000000..b79abd6
--- /dev/null
+++ b/graphics/etch/pkg-descr
@@ -0,0 +1,3 @@
+Etch is an abstract time based animation library.
+
+WWW: http://code.google.com/p/enesim/
diff --git a/graphics/etch/pkg-plist b/graphics/etch/pkg-plist
new file mode 100644
index 0000000..f788fc7
--- /dev/null
+++ b/graphics/etch/pkg-plist
@@ -0,0 +1,5 @@
+bin/etch_test
+include/Etch.h
+lib/libetch.so
+lib/libetch.so.0
+libdata/pkgconfig/etch.pc
diff --git a/graphics/ethumb/Makefile b/graphics/ethumb/Makefile
index e5b6b2f..acdd263 100644
--- a/graphics/ethumb/Makefile
+++ b/graphics/ethumb/Makefile
@@ -2,17 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	ethumb
-PORTVERSION=	0.1.1.65643
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics 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=	Thumbnail generator library
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif
+LIB_DEPENDS=	exif:${PORTSDIR}/graphics/libexif
 
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
@@ -24,12 +24,14 @@ USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--disable-epdf
 
-OPTIONS=	EMOTION "Build with Emotion module" on \
-		ETHUMBD "Build ethumbd daemon (requires dbus)" on
+OPTIONS_DEFINE=	EMOTION ETHUMBD
+OPTIONS_DEFAULT=EMOTION ETHUMBD
+EMOTION_DESC=	Build with Emotion module
+ETHUMBD_DESC=	Build ethumbd daemon (requires dbus)
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_EMOTION)
+.if ${PORT_OPTIONS:MEMOTION}
 USE_EFL+=	emotion
 CONFIGURE_ARGS+=	--enable-emotion
 PLIST_SUB+=	EMOTION=""
@@ -38,7 +40,7 @@ CONFIGURE_ARGS+=	--disable-emotion
 PLIST_SUB+=	EMOTION="@comment "
 .endif
 
-.if !defined(WITHOUT_ETHUMBD)
+.if ${PORT_OPTIONS:METHUMBD}
 USE_EFL+=	edbus
 PLIST_SUB+=	ETHUMBD=""
 CONFIGURE_ARGS+=	--enable-ethumbd
@@ -47,4 +49,4 @@ PLIST_SUB+=	ETHUMBD="@comment "
 CONFIGURE_ARGS+=	--disable-ethumbd
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/ethumb/distinfo b/graphics/ethumb/distinfo
index f9b5370..52481c3 100644
--- a/graphics/ethumb/distinfo
+++ b/graphics/ethumb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/ethumb-0.1.1.65643.tar.bz2) = 013cddeb21deac8ae107cbc6d9de21f203787dfb8ee4d1b9c5440299465d6863
-SIZE (e17/ethumb-0.1.1.65643.tar.bz2) = 382530
+SHA256 (e17/ethumb-1.7.4.tar.bz2) = bb4938572518334f875b6efacbaa4a541ce61e67d63f56df166fc71a5a5b873b
+SIZE (e17/ethumb-1.7.4.tar.bz2) = 395385
diff --git a/graphics/ethumb/pkg-plist b/graphics/ethumb/pkg-plist
index 84c474c..f05a983 100644
--- a/graphics/ethumb/pkg-plist
+++ b/graphics/ethumb/pkg-plist
@@ -1,13 +1,13 @@
 bin/ethumb
 %%ETHUMBD%%bin/ethumbd
 %%ETHUMBD%%bin/ethumbd_client
-include/ethumb-0/Ethumb.h
-include/ethumb-0/Ethumb_Plugin.h
-%%ETHUMBD%%include/ethumb-0/Ethumb_Client.h
+include/ethumb-1/Ethumb.h
+include/ethumb-1/Ethumb_Plugin.h
+%%ETHUMBD%%include/ethumb-1/Ethumb_Client.h
 lib/libethumb.so
-lib/libethumb.so.1
+lib/libethumb.so.8
 %%ETHUMBD%%lib/libethumb_client.so
-%%ETHUMBD%%lib/libethumb_client.so.1
+%%ETHUMBD%%lib/libethumb_client.so.8
 %%EMOTION%%lib/ethumb/plugins/data/emotion_template.edj
 %%EMOTION%%lib/ethumb/plugins/emotion.so
 libdata/pkgconfig/ethumb.pc
@@ -15,7 +15,7 @@ libdata/pkgconfig/ethumb.pc
 %%ETHUMBD%%libexec/ethumbd_slave
 %%DATADIR%%/data/frames/default.edj
 %%ETHUMBD%%share/dbus-1/services/org.enlightenment.Ethumb.service
-@dirrm include/ethumb-0
+@dirrm include/ethumb-1 
 @dirrmtry lib/ethumb/plugins/data
 @dirrmtry lib/ethumb/plugins
 @dirrmtry lib/ethumb
diff --git a/graphics/evas-core/Makefile b/graphics/evas-core/Makefile
index 9f642e7..8fbe2c1 100644
--- a/graphics/evas-core/Makefile
+++ b/graphics/evas-core/Makefile
@@ -2,61 +2,63 @@
 # $FreeBSD$
 
 PORTNAME=	core
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas-
-DISTNAME=	evas-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A hardware accelerated canvas API (core library)
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
 
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig
 USE_EFL=	librt_hack libtool_hack
+USE_GNOME=	gnomehack pkgconfig
+USE_LDCONFIG=	yes
 DATADIR=	${PREFIX}/share/evas
+EXAMPLESDIR=	${PREFIX}/share/examples/evas
 
 .include "Makefile.inc"
 
-OPTIONS=	FONTCONFIG	"Enable fontconfig support" on \
-		FRIBIDI		"Enable bidirectional text support" on \
-		EET		"Enable EET font loader" on
+OPTIONS_DEFINE=	EET FONTCONFIG FRIBIDI
+OPTIONS_DEFAULT=EET FONTCONFIG FRIBIDI
+EET_DESC=	EET font loader
+FRIBIDI_DESC=	Bidirectional text support
 
-EXAMPLESDIR=	${PREFIX}/share/examples/evas
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_FONTCONFIG)
-CONFIGURE_ARGS+=	--enable-fontconfig
-LIB_DEPENDS+=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
+.if ${PORT_OPTIONS:MFONTCONFIG}
+LIB_DEPENDS+=	fontconfig:${PORTSDIR}/x11-fonts/fontconfig
+CONFIGURE_ARGS+=--enable-fontconfig
 .else
-CONFIGURE_ARGS+=	--disable-fontconfig
+CONFIGURE_ARGS+=--disable-fontconfig
 .endif
 
-.if !defined(WITHOUT_FRIBIDI)
-CONFIGURE_ARGS+=	--enable-fribidi
-LIB_DEPENDS+=		fribidi.3:${PORTSDIR}/converters/fribidi
+.if ${PORT_OPTIONS:MFRIBIDI}
+LIB_DEPENDS+=	fribidi:${PORTSDIR}/converters/fribidi
+CONFIGURE_ARGS+=--enable-fribidi
 .else
-CONFIGURE_ARGS+=	--disable-fribidi
+CONFIGURE_ARGS+=--disable-fribidi
 .endif
 
-.if !defined(WITHOUT_EET)
-CONFIGURE_ARGS+=	--enable-font-loader-eet
+.if ${PORT_OPTIONS:MEET}
 USE_EFL+=	eet
+CONFIGURE_ARGS+=--enable-font-loader-eet
 .else
-CONFIGURE_ARGS+=	--disable-font-loader-eet
+CONFIGURE_ARGS+=--disable-font-loader-eet
 .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:
@@ -64,7 +66,7 @@ post-patch:
 		${WRKSRC}/src/examples/Makefile.in
 
 post-install:
-.if defined(NOPORTEXAMPLES)
+.if empty(PORT_OPTIONS:MEXAMPLES)
 	@${RMDIR} ${EXAMPLESDIR}
 .endif
 
diff --git a/graphics/evas-core/Makefile.inc b/graphics/evas-core/Makefile.inc
index 2fdc634..62300f3 100644
--- a/graphics/evas-core/Makefile.inc
+++ b/graphics/evas-core/Makefile.inc
@@ -3,7 +3,6 @@ CONFIGURE_ARGS=	--disable-software-xcb \
 		--disable-software-8-x11 \
 		--disable-software-16-x11 \
 		--disable-directfb \
-		--disable-software-sdl \
 		--disable-software-16-sdl \
 		--disable-gl-sdl \
 		--disable-buffer \
@@ -24,6 +23,8 @@ CONFIGURE_ARGS=	--disable-software-xcb \
 		--disable-image-loader-tiff \
 		--disable-image-loader-wbmp \
 		--disable-image-loader-xpm \
+		--disable-wayland-shm \
+		--disable-wayland-egl \
 		--disable-cpu-sse3
 
 PATCHDIR=	"../../graphics/evas-core/files"
diff --git a/graphics/evas-core/distinfo b/graphics/evas-core/distinfo
index 0159d76..82db61b 100644
--- a/graphics/evas-core/distinfo
+++ b/graphics/evas-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas-1.1.0.tar.bz2) = 7702a315dc22f4abc269f6a3ef2695b365a3eab4fd2fcdd07275e41221b03930
-SIZE (e17/evas-1.1.0.tar.bz2) = 9235732
+SHA256 (e17/evas-1.7.4.tar.bz2) = 53f3e58c876c38a6de9aa65ae660e526bc4671d05397c2c347f11e5e61f50a8f
+SIZE (e17/evas-1.7.4.tar.bz2) = 9365979
diff --git a/graphics/evas-core/pkg-plist b/graphics/evas-core/pkg-plist
index bfbc3a7..b241c50 100644
--- a/graphics/evas-core/pkg-plist
+++ b/graphics/evas-core/pkg-plist
@@ -1,8 +1,12 @@
+bin/evas_cserve
+bin/evas_cserve_tool
 include/evas-1/Evas.h
+include/evas-1/Evas_GL.h
 lib/libevas.so
-lib/libevas.so.2
+lib/libevas.so.8
 lib/evas/modules/engines/software_generic/%%E17_ARCH%%/module.so
 libdata/pkgconfig/evas.pc
+%%DATADIR%%/checkme
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/aspect.edc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cube1.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/enlightenment.png
@@ -13,9 +17,11 @@ libdata/pkgconfig/evas.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/evas-hints.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/evas-images.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/evas-images2.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/evas-images3.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/evas-init-shutdown.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/evas-map-utils.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/evas-object-manipulation.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/evas-smart-interface.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/evas-smart-object.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/evas-stacking.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/evas-text.c
@@ -27,4 +33,5 @@ libdata/pkgconfig/evas.pc
 @dirrmtry lib/evas/modules/engines
 @dirrmtry lib/evas/modules
 @dirrmtry lib/evas
+@dirrm %%DATADIR%%
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/graphics/evas-engine-buffer/Makefile b/graphics/evas-engine-buffer/Makefile
index 0873a015..5329ead 100644
--- a/graphics/evas-engine-buffer/Makefile
+++ b/graphics/evas-engine-buffer/Makefile
@@ -2,26 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	engine-buffer
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas-
-DISTNAME=	evas-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A hardware accelerated canvas API (buffer engine)
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
 
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig
 USE_EFL=	evas librt_hack libtool_hack
+USE_GNOME=	gnomehack pkgconfig
+USE_LDCONFIG=	yes
 BUILD_WRKSRC=	${WRKSRC}/src/modules/engines/buffer
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
diff --git a/graphics/evas-engine-buffer/distinfo b/graphics/evas-engine-buffer/distinfo
index 0159d76..82db61b 100644
--- a/graphics/evas-engine-buffer/distinfo
+++ b/graphics/evas-engine-buffer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas-1.1.0.tar.bz2) = 7702a315dc22f4abc269f6a3ef2695b365a3eab4fd2fcdd07275e41221b03930
-SIZE (e17/evas-1.1.0.tar.bz2) = 9235732
+SHA256 (e17/evas-1.7.4.tar.bz2) = 53f3e58c876c38a6de9aa65ae660e526bc4671d05397c2c347f11e5e61f50a8f
+SIZE (e17/evas-1.7.4.tar.bz2) = 9365979
diff --git a/graphics/evas-engine-opengl/Makefile b/graphics/evas-engine-opengl/Makefile
index 73936d0..7c98f85 100644
--- a/graphics/evas-engine-opengl/Makefile
+++ b/graphics/evas-engine-opengl/Makefile
@@ -2,28 +2,28 @@
 # $FreeBSD$
 
 PORTNAME=	engine-opengl
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas-
-DISTNAME=	evas-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A hardware accelerated canvas API (OpenGL engine)
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
 
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig
 USE_EFL=	evas librt_hack libtool_hack
+USE_GNOME=	gnomehack pkgconfig
 USE_XORG=	x11 xext xrender
 USE_GL=		gl glu
+USE_LDCONFIG=	yes
 BUILD_WRKSRC=	${WRKSRC}/src/modules/engines/gl_x11
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
diff --git a/graphics/evas-engine-opengl/distinfo b/graphics/evas-engine-opengl/distinfo
index 0159d76..82db61b 100644
--- a/graphics/evas-engine-opengl/distinfo
+++ b/graphics/evas-engine-opengl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas-1.1.0.tar.bz2) = 7702a315dc22f4abc269f6a3ef2695b365a3eab4fd2fcdd07275e41221b03930
-SIZE (e17/evas-1.1.0.tar.bz2) = 9235732
+SHA256 (e17/evas-1.7.4.tar.bz2) = 53f3e58c876c38a6de9aa65ae660e526bc4671d05397c2c347f11e5e61f50a8f
+SIZE (e17/evas-1.7.4.tar.bz2) = 9365979
diff --git a/graphics/evas-engine-sdl/Makefile b/graphics/evas-engine-sdl/Makefile
index 2bcac1c..b397028e 100644
--- a/graphics/evas-engine-sdl/Makefile
+++ b/graphics/evas-engine-sdl/Makefile
@@ -2,32 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	engine-sdl
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas-
-DISTNAME=	evas-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A hardware accelerated canvas API (SDL engine)
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
 
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig
 USE_EFL=	evas librt_hack libtool_hack
+USE_GNOME=	gnomehack pkgconfig
 USE_SDL=	sdl
-BUILD_WRKSRC=	${WRKSRC}/src/modules/engines/software_sdl
+USE_LDCONFIG=	yes
+BUILD_WRKSRC=	${WRKSRC}/src/modules/engines/software_16_sdl
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 .include "../evas-core/Makefile.inc"
-CONFIGURE_ARGS+=	--enable-software-sdl
+CONFIGURE_ARGS+=	--enable-software-16-sdl
 
 post-patch:
 	@${REINPLACE_CMD} -E \
diff --git a/graphics/evas-engine-sdl/distinfo b/graphics/evas-engine-sdl/distinfo
index 0159d76..82db61b 100644
--- a/graphics/evas-engine-sdl/distinfo
+++ b/graphics/evas-engine-sdl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas-1.1.0.tar.bz2) = 7702a315dc22f4abc269f6a3ef2695b365a3eab4fd2fcdd07275e41221b03930
-SIZE (e17/evas-1.1.0.tar.bz2) = 9235732
+SHA256 (e17/evas-1.7.4.tar.bz2) = 53f3e58c876c38a6de9aa65ae660e526bc4671d05397c2c347f11e5e61f50a8f
+SIZE (e17/evas-1.7.4.tar.bz2) = 9365979
diff --git a/graphics/evas-engine-sdl/pkg-plist b/graphics/evas-engine-sdl/pkg-plist
index 8113297..e09ded0 100644
--- a/graphics/evas-engine-sdl/pkg-plist
+++ b/graphics/evas-engine-sdl/pkg-plist
@@ -1,8 +1,8 @@
-include/evas-1/Evas_Engine_SDL.h
-lib/evas/modules/engines/software_sdl/%%E17_ARCH%%/module.so
+include/evas-1/Evas_Engine_SDL_16.h
+lib/evas/modules/engines/software_16_sdl/%%E17_ARCH%%/module.so
 libdata/pkgconfig/evas-software-sdl.pc
-@dirrm lib/evas/modules/engines/software_sdl/%%E17_ARCH%%
-@dirrm lib/evas/modules/engines/software_sdl
+@dirrm lib/evas/modules/engines/software_16_sdl/%%E17_ARCH%%
+@dirrm lib/evas/modules/engines/software_16_sdl
 @dirrmtry lib/evas/modules/engines
 @dirrmtry lib/evas/modules
 @dirrmtry lib/evas
diff --git a/graphics/evas-engine-x11/Makefile b/graphics/evas-engine-x11/Makefile
index 7c7b5f4..2d6ccb2 100644
--- a/graphics/evas-engine-x11/Makefile
+++ b/graphics/evas-engine-x11/Makefile
@@ -2,27 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	engine-x11
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas-
-DISTNAME=	evas-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A hardware accelerated canvas API (X11 engine)
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
 
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig
 USE_EFL=	evas librt_hack libtool_hack
+USE_GNOME=	gnomehack pkgconfig
 USE_XORG=	x11 xext
+USE_LDCONFIG=	yes
 BUILD_WRKSRC=	${WRKSRC}/src/modules/engines/software_x11
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
diff --git a/graphics/evas-engine-x11/distinfo b/graphics/evas-engine-x11/distinfo
index 0159d76..82db61b 100644
--- a/graphics/evas-engine-x11/distinfo
+++ b/graphics/evas-engine-x11/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas-1.1.0.tar.bz2) = 7702a315dc22f4abc269f6a3ef2695b365a3eab4fd2fcdd07275e41221b03930
-SIZE (e17/evas-1.1.0.tar.bz2) = 9235732
+SHA256 (e17/evas-1.7.4.tar.bz2) = 53f3e58c876c38a6de9aa65ae660e526bc4671d05397c2c347f11e5e61f50a8f
+SIZE (e17/evas-1.7.4.tar.bz2) = 9365979
diff --git a/graphics/evas-loader-bmp/Makefile b/graphics/evas-loader-bmp/Makefile
index 080104d..47d1779 100644
--- a/graphics/evas-loader-bmp/Makefile
+++ b/graphics/evas-loader-bmp/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	loader-bmp
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas-
-DISTNAME=	evas-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A hardware accelerated canvas API (BMP loader)
diff --git a/graphics/evas-loader-bmp/distinfo b/graphics/evas-loader-bmp/distinfo
index 0159d76..82db61b 100644
--- a/graphics/evas-loader-bmp/distinfo
+++ b/graphics/evas-loader-bmp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas-1.1.0.tar.bz2) = 7702a315dc22f4abc269f6a3ef2695b365a3eab4fd2fcdd07275e41221b03930
-SIZE (e17/evas-1.1.0.tar.bz2) = 9235732
+SHA256 (e17/evas-1.7.4.tar.bz2) = 53f3e58c876c38a6de9aa65ae660e526bc4671d05397c2c347f11e5e61f50a8f
+SIZE (e17/evas-1.7.4.tar.bz2) = 9365979
diff --git a/graphics/evas-loader-eet/Makefile b/graphics/evas-loader-eet/Makefile
index 539e053..dfddc80 100644
--- a/graphics/evas-loader-eet/Makefile
+++ b/graphics/evas-loader-eet/Makefile
@@ -2,26 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	loader-eet
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas-
-DISTNAME=	evas-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A hardware accelerated canvas API (EET loader)
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
 
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig
 USE_EFL=	evas eet librt_hack libtool_hack
+USE_GNOME=	gnomehack pkgconfig
+USE_LDCONFIG=	yes
 
 MAKEDIRS=	${WRKSRC}/src/modules/loaders/eet \
 		${WRKSRC}/src/modules/savers/eet
diff --git a/graphics/evas-loader-eet/distinfo b/graphics/evas-loader-eet/distinfo
index 0159d76..82db61b 100644
--- a/graphics/evas-loader-eet/distinfo
+++ b/graphics/evas-loader-eet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas-1.1.0.tar.bz2) = 7702a315dc22f4abc269f6a3ef2695b365a3eab4fd2fcdd07275e41221b03930
-SIZE (e17/evas-1.1.0.tar.bz2) = 9235732
+SHA256 (e17/evas-1.7.4.tar.bz2) = 53f3e58c876c38a6de9aa65ae660e526bc4671d05397c2c347f11e5e61f50a8f
+SIZE (e17/evas-1.7.4.tar.bz2) = 9365979
diff --git a/graphics/evas-loader-generic/Makefile b/graphics/evas-loader-generic/Makefile
index d6c5c07..480f2f1 100644
--- a/graphics/evas-loader-generic/Makefile
+++ b/graphics/evas-loader-generic/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	loader-generic
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas-
-DISTNAME=	evas-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A hardware accelerated canvas API (generic loader)
@@ -23,9 +23,9 @@ OPTIONS+=	${NODE:U} "Install ${NODE} evas generic loader" on
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig
 USE_EFL=	evas librt_hack libtool_hack
+USE_GNOME=	gnomehack pkgconfig
+USE_LDCONFIG=	yes
 
 MAKEDIRS=	${WRKSRC}/src/modules/loaders/generic
 
diff --git a/graphics/evas-loader-generic/distinfo b/graphics/evas-loader-generic/distinfo
index 0159d76..82db61b 100644
--- a/graphics/evas-loader-generic/distinfo
+++ b/graphics/evas-loader-generic/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas-1.1.0.tar.bz2) = 7702a315dc22f4abc269f6a3ef2695b365a3eab4fd2fcdd07275e41221b03930
-SIZE (e17/evas-1.1.0.tar.bz2) = 9235732
+SHA256 (e17/evas-1.7.4.tar.bz2) = 53f3e58c876c38a6de9aa65ae660e526bc4671d05397c2c347f11e5e61f50a8f
+SIZE (e17/evas-1.7.4.tar.bz2) = 9365979
diff --git a/graphics/evas-loader-gif/Makefile b/graphics/evas-loader-gif/Makefile
index 6fa22af..6ab8e25 100644
--- a/graphics/evas-loader-gif/Makefile
+++ b/graphics/evas-loader-gif/Makefile
@@ -2,27 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	loader-gif
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas-
-DISTNAME=	evas-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A hardware accelerated canvas API (GIF loader)
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	gif.5:${PORTSDIR}/graphics/giflib \
-		freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	gif:${PORTSDIR}/graphics/giflib \
+		freetype:${PORTSDIR}/print/freetype2
 
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig
 USE_EFL=	evas librt_hack libtool_hack
+USE_GNOME=	gnomehack pkgconfig
+USE_LDCONFIG=	yes
 
 MAKEDIRS=	${WRKSRC}/src/modules/loaders/gif
 
diff --git a/graphics/evas-loader-gif/distinfo b/graphics/evas-loader-gif/distinfo
index 0159d76..82db61b 100644
--- a/graphics/evas-loader-gif/distinfo
+++ b/graphics/evas-loader-gif/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas-1.1.0.tar.bz2) = 7702a315dc22f4abc269f6a3ef2695b365a3eab4fd2fcdd07275e41221b03930
-SIZE (e17/evas-1.1.0.tar.bz2) = 9235732
+SHA256 (e17/evas-1.7.4.tar.bz2) = 53f3e58c876c38a6de9aa65ae660e526bc4671d05397c2c347f11e5e61f50a8f
+SIZE (e17/evas-1.7.4.tar.bz2) = 9365979
diff --git a/graphics/evas-loader-ico/Makefile b/graphics/evas-loader-ico/Makefile
index d427a4a..577647c 100644
--- a/graphics/evas-loader-ico/Makefile
+++ b/graphics/evas-loader-ico/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	loader-ico
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas-
-DISTNAME=	evas-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A hardware accelerated canvas API (ICO loader)
diff --git a/graphics/evas-loader-ico/distinfo b/graphics/evas-loader-ico/distinfo
index 0159d76..82db61b 100644
--- a/graphics/evas-loader-ico/distinfo
+++ b/graphics/evas-loader-ico/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas-1.1.0.tar.bz2) = 7702a315dc22f4abc269f6a3ef2695b365a3eab4fd2fcdd07275e41221b03930
-SIZE (e17/evas-1.1.0.tar.bz2) = 9235732
+SHA256 (e17/evas-1.7.4.tar.bz2) = 53f3e58c876c38a6de9aa65ae660e526bc4671d05397c2c347f11e5e61f50a8f
+SIZE (e17/evas-1.7.4.tar.bz2) = 9365979
diff --git a/graphics/evas-loader-jpeg/Makefile b/graphics/evas-loader-jpeg/Makefile
index c0f1036..f109720 100644
--- a/graphics/evas-loader-jpeg/Makefile
+++ b/graphics/evas-loader-jpeg/Makefile
@@ -2,27 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	loader-jpeg
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas-
-DISTNAME=	evas-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A hardware accelerated canvas API (JPEG loader)
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
+		freetype:${PORTSDIR}/print/freetype2
 
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig
 USE_EFL=	evas librt_hack libtool_hack
+USE_GNOME=	gnomehack pkgconfig
+USE_LDCONFIG=	yes
 
 MAKEDIRS=	${WRKSRC}/src/modules/loaders/jpeg \
 		${WRKSRC}/src/modules/savers/jpeg
diff --git a/graphics/evas-loader-jpeg/distinfo b/graphics/evas-loader-jpeg/distinfo
index 0159d76..82db61b 100644
--- a/graphics/evas-loader-jpeg/distinfo
+++ b/graphics/evas-loader-jpeg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas-1.1.0.tar.bz2) = 7702a315dc22f4abc269f6a3ef2695b365a3eab4fd2fcdd07275e41221b03930
-SIZE (e17/evas-1.1.0.tar.bz2) = 9235732
+SHA256 (e17/evas-1.7.4.tar.bz2) = 53f3e58c876c38a6de9aa65ae660e526bc4671d05397c2c347f11e5e61f50a8f
+SIZE (e17/evas-1.7.4.tar.bz2) = 9365979
diff --git a/graphics/evas-loader-pmaps/Makefile b/graphics/evas-loader-pmaps/Makefile
index a2eb5ce..ba7c992 100644
--- a/graphics/evas-loader-pmaps/Makefile
+++ b/graphics/evas-loader-pmaps/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	loader-pmaps
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas-
-DISTNAME=	evas-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A hardware accelerated canvas API (PMAPS loader)
diff --git a/graphics/evas-loader-pmaps/distinfo b/graphics/evas-loader-pmaps/distinfo
index 0159d76..82db61b 100644
--- a/graphics/evas-loader-pmaps/distinfo
+++ b/graphics/evas-loader-pmaps/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas-1.1.0.tar.bz2) = 7702a315dc22f4abc269f6a3ef2695b365a3eab4fd2fcdd07275e41221b03930
-SIZE (e17/evas-1.1.0.tar.bz2) = 9235732
+SHA256 (e17/evas-1.7.4.tar.bz2) = 53f3e58c876c38a6de9aa65ae660e526bc4671d05397c2c347f11e5e61f50a8f
+SIZE (e17/evas-1.7.4.tar.bz2) = 9365979
diff --git a/graphics/evas-loader-png/Makefile b/graphics/evas-loader-png/Makefile
index a643b81..6d11324 100644
--- a/graphics/evas-loader-png/Makefile
+++ b/graphics/evas-loader-png/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	loader-png
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas-
-DISTNAME=	evas-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A hardware accelerated canvas API (PNG loader)
@@ -15,14 +15,14 @@ COMMENT=	A hardware accelerated canvas API (PNG loader)
 LICENSE=	BSD
 
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
-		freetype.9:${PORTSDIR}/print/freetype2
+		freetype:${PORTSDIR}/print/freetype2
 
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig
 USE_EFL=	evas librt_hack libtool_hack
+USE_GNOME=	gnomehack pkgconfig
+USE_LDCONFIG=	yes
 
 MAKEDIRS=	${WRKSRC}/src/modules/loaders/png \
 		${WRKSRC}/src/modules/savers/png
diff --git a/graphics/evas-loader-png/distinfo b/graphics/evas-loader-png/distinfo
index 0159d76..82db61b 100644
--- a/graphics/evas-loader-png/distinfo
+++ b/graphics/evas-loader-png/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas-1.1.0.tar.bz2) = 7702a315dc22f4abc269f6a3ef2695b365a3eab4fd2fcdd07275e41221b03930
-SIZE (e17/evas-1.1.0.tar.bz2) = 9235732
+SHA256 (e17/evas-1.7.4.tar.bz2) = 53f3e58c876c38a6de9aa65ae660e526bc4671d05397c2c347f11e5e61f50a8f
+SIZE (e17/evas-1.7.4.tar.bz2) = 9365979
diff --git a/graphics/evas-loader-psd/Makefile b/graphics/evas-loader-psd/Makefile
index da6ef6b..7fb2d07 100644
--- a/graphics/evas-loader-psd/Makefile
+++ b/graphics/evas-loader-psd/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	loader-psd
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas-
-DISTNAME=	evas-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A hardware accelerated canvas API (PSD loader)
diff --git a/graphics/evas-loader-psd/distinfo b/graphics/evas-loader-psd/distinfo
index 0159d76..82db61b 100644
--- a/graphics/evas-loader-psd/distinfo
+++ b/graphics/evas-loader-psd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas-1.1.0.tar.bz2) = 7702a315dc22f4abc269f6a3ef2695b365a3eab4fd2fcdd07275e41221b03930
-SIZE (e17/evas-1.1.0.tar.bz2) = 9235732
+SHA256 (e17/evas-1.7.4.tar.bz2) = 53f3e58c876c38a6de9aa65ae660e526bc4671d05397c2c347f11e5e61f50a8f
+SIZE (e17/evas-1.7.4.tar.bz2) = 9365979
diff --git a/graphics/evas-loader-svg/Makefile b/graphics/evas-loader-svg/Makefile
index 86dcc51..e019139 100644
--- a/graphics/evas-loader-svg/Makefile
+++ b/graphics/evas-loader-svg/Makefile
@@ -2,27 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	loader-svg
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas-
-DISTNAME=	evas-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A hardware accelerated canvas API (SVG loader)
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo \
-		freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
 
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USE_EFL=	evas esvg librt_hack libtool_hack
+USE_GNOME=	gnomehack pkgconfig
 USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig librsvg2
-USE_EFL=	evas librt_hack libtool_hack
 
 MAKEDIRS=	${WRKSRC}/src/modules/loaders/svg
 
diff --git a/graphics/evas-loader-svg/distinfo b/graphics/evas-loader-svg/distinfo
index 0159d76..82db61b 100644
--- a/graphics/evas-loader-svg/distinfo
+++ b/graphics/evas-loader-svg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas-1.1.0.tar.bz2) = 7702a315dc22f4abc269f6a3ef2695b365a3eab4fd2fcdd07275e41221b03930
-SIZE (e17/evas-1.1.0.tar.bz2) = 9235732
+SHA256 (e17/evas-1.7.4.tar.bz2) = 53f3e58c876c38a6de9aa65ae660e526bc4671d05397c2c347f11e5e61f50a8f
+SIZE (e17/evas-1.7.4.tar.bz2) = 9365979
diff --git a/graphics/evas-loader-tga/Makefile b/graphics/evas-loader-tga/Makefile
index e216068..53214bb 100644
--- a/graphics/evas-loader-tga/Makefile
+++ b/graphics/evas-loader-tga/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	loader-tga
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas-
-DISTNAME=	evas-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A hardware accelerated canvas API (TGA loader)
diff --git a/graphics/evas-loader-tga/distinfo b/graphics/evas-loader-tga/distinfo
index 0159d76..82db61b 100644
--- a/graphics/evas-loader-tga/distinfo
+++ b/graphics/evas-loader-tga/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas-1.1.0.tar.bz2) = 7702a315dc22f4abc269f6a3ef2695b365a3eab4fd2fcdd07275e41221b03930
-SIZE (e17/evas-1.1.0.tar.bz2) = 9235732
+SHA256 (e17/evas-1.7.4.tar.bz2) = 53f3e58c876c38a6de9aa65ae660e526bc4671d05397c2c347f11e5e61f50a8f
+SIZE (e17/evas-1.7.4.tar.bz2) = 9365979
diff --git a/graphics/evas-loader-tiff/Makefile b/graphics/evas-loader-tiff/Makefile
index 1cf46d7..2266deb 100644
--- a/graphics/evas-loader-tiff/Makefile
+++ b/graphics/evas-loader-tiff/Makefile
@@ -2,27 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	loader-tiff
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas-
-DISTNAME=	evas-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A hardware accelerated canvas API (TIFF loader)
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
-		freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	tiff:${PORTSDIR}/graphics/tiff \
+		freetype:${PORTSDIR}/print/freetype2
 
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig
 USE_EFL=	evas librt_hack libtool_hack
+USE_GNOME=	gnomehack pkgconfig
+USE_LDCONFIG=	yes
 
 MAKEDIRS=	${WRKSRC}/src/modules/loaders/tiff \
 		${WRKSRC}/src/modules/savers/tiff
diff --git a/graphics/evas-loader-tiff/distinfo b/graphics/evas-loader-tiff/distinfo
index 0159d76..82db61b 100644
--- a/graphics/evas-loader-tiff/distinfo
+++ b/graphics/evas-loader-tiff/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas-1.1.0.tar.bz2) = 7702a315dc22f4abc269f6a3ef2695b365a3eab4fd2fcdd07275e41221b03930
-SIZE (e17/evas-1.1.0.tar.bz2) = 9235732
+SHA256 (e17/evas-1.7.4.tar.bz2) = 53f3e58c876c38a6de9aa65ae660e526bc4671d05397c2c347f11e5e61f50a8f
+SIZE (e17/evas-1.7.4.tar.bz2) = 9365979
diff --git a/graphics/evas-loader-wbmp/Makefile b/graphics/evas-loader-wbmp/Makefile
index adec003..a76457b 100644
--- a/graphics/evas-loader-wbmp/Makefile
+++ b/graphics/evas-loader-wbmp/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	loader-wbmp
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas-
-DISTNAME=	evas-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A hardware accelerated canvas API (WBMP loader)
diff --git a/graphics/evas-loader-wbmp/distinfo b/graphics/evas-loader-wbmp/distinfo
index 0159d76..82db61b 100644
--- a/graphics/evas-loader-wbmp/distinfo
+++ b/graphics/evas-loader-wbmp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas-1.1.0.tar.bz2) = 7702a315dc22f4abc269f6a3ef2695b365a3eab4fd2fcdd07275e41221b03930
-SIZE (e17/evas-1.1.0.tar.bz2) = 9235732
+SHA256 (e17/evas-1.7.4.tar.bz2) = 53f3e58c876c38a6de9aa65ae660e526bc4671d05397c2c347f11e5e61f50a8f
+SIZE (e17/evas-1.7.4.tar.bz2) = 9365979
diff --git a/graphics/evas-loader-xpm/Makefile b/graphics/evas-loader-xpm/Makefile
index 73fc001..8067e87 100644
--- a/graphics/evas-loader-xpm/Makefile
+++ b/graphics/evas-loader-xpm/Makefile
@@ -2,27 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	loader-xpm
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas-
-DISTNAME=	evas-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A hardware accelerated canvas API (XPM loader)
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
 
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
+USE_EFL=	evas librt_hack libtool_hack
 USE_GNOME=	gnomehack pkgconfig
 USE_XORG=	xpm
-USE_EFL=	evas librt_hack libtool_hack
+USE_LDCONFIG=	yes
 
 MAKEDIRS=	${WRKSRC}/src/modules/loaders/xpm
 
diff --git a/graphics/evas-loader-xpm/distinfo b/graphics/evas-loader-xpm/distinfo
index 0159d76..82db61b 100644
--- a/graphics/evas-loader-xpm/distinfo
+++ b/graphics/evas-loader-xpm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas-1.1.0.tar.bz2) = 7702a315dc22f4abc269f6a3ef2695b365a3eab4fd2fcdd07275e41221b03930
-SIZE (e17/evas-1.1.0.tar.bz2) = 9235732
+SHA256 (e17/evas-1.7.4.tar.bz2) = 53f3e58c876c38a6de9aa65ae660e526bc4671d05397c2c347f11e5e61f50a8f
+SIZE (e17/evas-1.7.4.tar.bz2) = 9365979
diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile
index 0dba1f2..be533a6 100644
--- a/graphics/evas/Makefile
+++ b/graphics/evas/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	evas
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 PORTEPOCH=	2
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	# none
@@ -15,32 +15,37 @@ COMMENT=	A hardware accelerated canvas API (meta-port)
 NO_BUILD=	yes
 USE_EFL=	evas
 
-EVAS_ENGINES=	buffer opengl sdl x11
-EVAS_LOADERS=	bmp eet gif ico jpeg png pmaps psd svg tga tiff wbmp xpm
+OPTIONS_MULTI=	ENGINES
+OPTIONS_MULTI_ENGINES=BUFFER OPENGL SDL X11
+OPTIONS_DEFINE=	BMP EET GENERIC GIF ICO JPEG \
+		PNG PMAPS PSD SVG TGA TIFF WBMP XPM
+OPTIONS_DEFAULT=BUFFER OPENGL X11 \
+		BMP EET GENERIC GIF ICO JPEG \
+		PNG PMAPS PSD TGA TIFF WBMP XPM
 
-.for NODE in ${EVAS_ENGINES}
-OPTIONS+=	${NODE:U} "Install ${NODE} evas engine" on
+.for NODE in ${OPTIONS_MULTI_ENGINES}
+${NODE}_DESC=	Install ${NODE:L} engine
 .endfor
 
-.for NODE in ${EVAS_LOADERS}
-OPTIONS+=	${NODE:U} "Install ${NODE} evas loader" on
+.for NODE in ${OPTIONS_DEFINE}
+${NODE}_DESC=	Install ${NODE:L} loader
 .endfor
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.for NODE in ${EVAS_ENGINES}
-. if !defined(WITHOUT_${NODE:U})
-USE_EFL_EVAS_ENGINES+=	${NODE}
-. endif
+.for NODE in ${OPTIONS_MULTI_ENGINES}
+.  if ${PORT_OPTIONS:M${NODE}}
+USE_EFL_EVAS_ENGINES+=	${NODE:L}
+.  endif
 .endfor
 
-.for NODE in ${EVAS_LOADERS}
-. if !defined(WITHOUT_${NODE:U})
-USE_EFL_EVAS_LOADERS+=	${NODE}
-. endif
+.for NODE in ${OPTIONS_DEFINE}
+.  if ${PORT_OPTIONS:M${NODE}}
+USE_EFL_EVAS_LOADERS+=	${NODE:L}
+.  endif
 .endfor
 
 do-install:
 	${DO_NADA}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/evas_generic_loaders-gst/Makefile b/graphics/evas_generic_loaders-gst/Makefile
index 95ac1ba..0392b30 100644
--- a/graphics/evas_generic_loaders-gst/Makefile
+++ b/graphics/evas_generic_loaders-gst/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	gst
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas_generic_loaders-
-DISTNAME=	${PKGNAMEPREFIX}${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	Additional loader for Evas (GStreamer)
@@ -17,10 +17,10 @@ LICENSE=	GPLv2
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
 USE_EFL=	eina
 USE_GNOME=	gnomehack pkgconfig
 USE_GSTREAMER=	good ffmpeg
+USE_LDCONFIG=	yes
 
 BINSRC=		${WRKSRC}/src/bin/${PORTNAME}
 
diff --git a/graphics/evas_generic_loaders-gst/distinfo b/graphics/evas_generic_loaders-gst/distinfo
index 738ab3a..ad795f8 100644
--- a/graphics/evas_generic_loaders-gst/distinfo
+++ b/graphics/evas_generic_loaders-gst/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas_generic_loaders-1.1.0.tar.bz2) = e3da3d5d1d9108a29b4b3cde1cb8c1cf9332bc48c6c4c4af7c5f7bf9740e5acc
-SIZE (e17/evas_generic_loaders-1.1.0.tar.bz2) = 189476
+SHA256 (e17/evas_generic_loaders-1.7.4.tar.bz2) = 85779f33e8ad483a9b849a74be8ca3aae22127138a325bae0f079133b2fe4e7c
+SIZE (e17/evas_generic_loaders-1.7.4.tar.bz2) = 200620
diff --git a/graphics/evas_generic_loaders-gst/pkg-plist b/graphics/evas_generic_loaders-gst/pkg-plist
index 67d9ce5..72ab5fb 100644
--- a/graphics/evas_generic_loaders-gst/pkg-plist
+++ b/graphics/evas_generic_loaders-gst/pkg-plist
@@ -12,6 +12,7 @@ lib/evas/utils/evas_image_loader.bdm
 lib/evas/utils/evas_image_loader.bdmv
 lib/evas/utils/evas_image_loader.clpi
 lib/evas/utils/evas_image_loader.cpi
+lib/evas/utils/evas_image_loader.dv
 lib/evas/utils/evas_image_loader.fla
 lib/evas/utils/evas_image_loader.flv
 lib/evas/utils/evas_image_loader.m1v
@@ -35,12 +36,14 @@ lib/evas/utils/evas_image_loader.nuv
 lib/evas/utils/evas_image_loader.ogg
 lib/evas/utils/evas_image_loader.ogm
 lib/evas/utils/evas_image_loader.ogv
+lib/evas/utils/evas_image_loader.qt
 lib/evas/utils/evas_image_loader.rm
 lib/evas/utils/evas_image_loader.rmj
 lib/evas/utils/evas_image_loader.rmm
 lib/evas/utils/evas_image_loader.rms
 lib/evas/utils/evas_image_loader.rmx
 lib/evas/utils/evas_image_loader.rmvb
+lib/evas/utils/evas_image_loader.rv
 lib/evas/utils/evas_image_loader.swf
 lib/evas/utils/evas_image_loader.ts
 lib/evas/utils/evas_image_loader.webm
diff --git a/graphics/evas_generic_loaders-pdf/Makefile b/graphics/evas_generic_loaders-pdf/Makefile
index 9b645c1..3123574 100644
--- a/graphics/evas_generic_loaders-pdf/Makefile
+++ b/graphics/evas_generic_loaders-pdf/Makefile
@@ -2,26 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	pdf
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas_generic_loaders-
-DISTNAME=	${PKGNAMEPREFIX}${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	Additional loader for Evas (pdf)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	poppler.18:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS=	poppler:${PORTSDIR}/graphics/poppler
 
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
 USE_EFL=	eina
 USE_GNOME=	gnomehack pkgconfig
+USE_LDCONFIG=	yes
 
 BINSRC=		${WRKSRC}/src/bin/${PORTNAME}
 
diff --git a/graphics/evas_generic_loaders-pdf/distinfo b/graphics/evas_generic_loaders-pdf/distinfo
index 738ab3a..ad795f8 100644
--- a/graphics/evas_generic_loaders-pdf/distinfo
+++ b/graphics/evas_generic_loaders-pdf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas_generic_loaders-1.1.0.tar.bz2) = e3da3d5d1d9108a29b4b3cde1cb8c1cf9332bc48c6c4c4af7c5f7bf9740e5acc
-SIZE (e17/evas_generic_loaders-1.1.0.tar.bz2) = 189476
+SHA256 (e17/evas_generic_loaders-1.7.4.tar.bz2) = 85779f33e8ad483a9b849a74be8ca3aae22127138a325bae0f079133b2fe4e7c
+SIZE (e17/evas_generic_loaders-1.7.4.tar.bz2) = 200620
diff --git a/graphics/evas_generic_loaders-ps/Makefile b/graphics/evas_generic_loaders-ps/Makefile
index 210eb40..d7e94c5 100644
--- a/graphics/evas_generic_loaders-ps/Makefile
+++ b/graphics/evas_generic_loaders-ps/Makefile
@@ -2,26 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	ps
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas_generic_loaders-
-DISTNAME=	${PKGNAMEPREFIX}${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	Additional loader for Evas (ps)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	spectre.1:${PORTSDIR}/print/libspectre
+LIB_DEPENDS=	spectre:${PORTSDIR}/print/libspectre
 
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
 USE_EFL=	eina
 USE_GNOME=	gnomehack pkgconfig
+USE_LDCONFIG=	yes
 
 BINSRC=		${WRKSRC}/src/bin/${PORTNAME}
 
diff --git a/graphics/evas_generic_loaders-ps/distinfo b/graphics/evas_generic_loaders-ps/distinfo
index 738ab3a..ad795f8 100644
--- a/graphics/evas_generic_loaders-ps/distinfo
+++ b/graphics/evas_generic_loaders-ps/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas_generic_loaders-1.1.0.tar.bz2) = e3da3d5d1d9108a29b4b3cde1cb8c1cf9332bc48c6c4c4af7c5f7bf9740e5acc
-SIZE (e17/evas_generic_loaders-1.1.0.tar.bz2) = 189476
+SHA256 (e17/evas_generic_loaders-1.7.4.tar.bz2) = 85779f33e8ad483a9b849a74be8ca3aae22127138a325bae0f079133b2fe4e7c
+SIZE (e17/evas_generic_loaders-1.7.4.tar.bz2) = 200620
diff --git a/graphics/evas_generic_loaders-raw/Makefile b/graphics/evas_generic_loaders-raw/Makefile
index 84151d4..67568e8 100644
--- a/graphics/evas_generic_loaders-raw/Makefile
+++ b/graphics/evas_generic_loaders-raw/Makefile
@@ -2,26 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	raw
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas_generic_loaders-
-DISTNAME=	${PKGNAMEPREFIX}${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	Additional loader for Evas (raw)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	raw.5:${PORTSDIR}/graphics/libraw
+LIB_DEPENDS=	raw:${PORTSDIR}/graphics/libraw
 
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
 USE_EFL=	eina
 USE_GNOME=	gnomehack pkgconfig
+USE_LDCONFIG=	yes
 
 BINSRC=		${WRKSRC}/src/bin/${PORTNAME}
 
diff --git a/graphics/evas_generic_loaders-raw/distinfo b/graphics/evas_generic_loaders-raw/distinfo
index 738ab3a..ad795f8 100644
--- a/graphics/evas_generic_loaders-raw/distinfo
+++ b/graphics/evas_generic_loaders-raw/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas_generic_loaders-1.1.0.tar.bz2) = e3da3d5d1d9108a29b4b3cde1cb8c1cf9332bc48c6c4c4af7c5f7bf9740e5acc
-SIZE (e17/evas_generic_loaders-1.1.0.tar.bz2) = 189476
+SHA256 (e17/evas_generic_loaders-1.7.4.tar.bz2) = 85779f33e8ad483a9b849a74be8ca3aae22127138a325bae0f079133b2fe4e7c
+SIZE (e17/evas_generic_loaders-1.7.4.tar.bz2) = 200620
diff --git a/graphics/evas_generic_loaders-xcf/Makefile b/graphics/evas_generic_loaders-xcf/Makefile
index 3121309..7d1f56e 100644
--- a/graphics/evas_generic_loaders-xcf/Makefile
+++ b/graphics/evas_generic_loaders-xcf/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	xcf
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	evas_generic_loaders-
-DISTNAME=	${PKGNAMEPREFIX}${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	Additional loader for Evas (xcf)
@@ -17,9 +17,9 @@ LICENSE=	GPLv2
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
 USE_EFL=	eina
 USE_GNOME=	gnomehack pkgconfig
+USE_LDCONFIG=	yes
 
 BINSRC=		${WRKSRC}/src/bin/${PORTNAME}
 
diff --git a/graphics/evas_generic_loaders-xcf/distinfo b/graphics/evas_generic_loaders-xcf/distinfo
index 738ab3a..ad795f8 100644
--- a/graphics/evas_generic_loaders-xcf/distinfo
+++ b/graphics/evas_generic_loaders-xcf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/evas_generic_loaders-1.1.0.tar.bz2) = e3da3d5d1d9108a29b4b3cde1cb8c1cf9332bc48c6c4c4af7c5f7bf9740e5acc
-SIZE (e17/evas_generic_loaders-1.1.0.tar.bz2) = 189476
+SHA256 (e17/evas_generic_loaders-1.7.4.tar.bz2) = 85779f33e8ad483a9b849a74be8ca3aae22127138a325bae0f079133b2fe4e7c
+SIZE (e17/evas_generic_loaders-1.7.4.tar.bz2) = 200620
diff --git a/lang/embryo/Makefile b/lang/embryo/Makefile
index 0f69581..d7784c0 100644
--- a/lang/embryo/Makefile
+++ b/lang/embryo/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	embryo
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 PORTEPOCH=	2
 CATEGORIES=	lang 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=	A C like scripting language used in Enlightenment
@@ -20,4 +20,10 @@ USE_EFL=	eina libtool_hack librt_hack
 USE_GNOME=	gnomehack pkgconfig
 USE_LDCONFIG=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 803000
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src-lib-embryo_float.c
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/lang/embryo/distinfo b/lang/embryo/distinfo
index 07da706..0e0a99b 100644
--- a/lang/embryo/distinfo
+++ b/lang/embryo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/embryo-1.1.0.tar.bz2) = a95fa6ac4ec4c98c9a237214d2c4bde561dbe1daefaa2ed5e9c2944c2c8e9e5b
-SIZE (e17/embryo-1.1.0.tar.bz2) = 443457
+SHA256 (e17/embryo-1.7.4.tar.bz2) = c8886dd5df2948cdb1463f627c2ce92faf642f29e38f0692f80f51ad3495ee67
+SIZE (e17/embryo-1.7.4.tar.bz2) = 459454
diff --git a/lang/embryo/files/extra-patch-src-lib-embryo_float.c b/lang/embryo/files/extra-patch-src-lib-embryo_float.c
new file mode 100644
index 0000000..676836f
--- /dev/null
+++ b/lang/embryo/files/extra-patch-src-lib-embryo_float.c
@@ -0,0 +1,10 @@
+--- src/lib/embryo_float.c.orig	2012-11-12 14:59:38.000000000 +0100
++++ src/lib/embryo_float.c	2012-11-12 15:00:04.000000000 +0100
+@@ -263,7 +263,6 @@
+ 	return 0;
+      }
+     if (ff == 10.0) f = log10f(f);
+-    else if (ff == 2.0) f = log2f(f);
+     else
+      {
+         tf = logf(ff);
diff --git a/lang/embryo/pkg-plist b/lang/embryo/pkg-plist
index 525810e..9505c68 100644
--- a/lang/embryo/pkg-plist
+++ b/lang/embryo/pkg-plist
@@ -1,7 +1,7 @@
 bin/embryo_cc
 include/embryo-1/Embryo.h
 lib/libembryo.so
-lib/libembryo.so.2
+lib/libembryo.so.8
 libdata/pkgconfig/embryo.pc
 %%DATADIR%%/include/default.inc
 @dirrm %%DATADIR%%/include
diff --git a/multimedia/emotion/Makefile b/multimedia/emotion/Makefile
index 242fcea..bb79080 100644
--- a/multimedia/emotion/Makefile
+++ b/multimedia/emotion/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	emotion
-PORTVERSION=	0.2.0.65643
+PORTVERSION=	1.7.4
 PORTEPOCH=	1
 CATEGORIES=	multimedia 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=	Video playback wrapper library for Enlightenment
@@ -14,33 +14,38 @@ COMMENT=	Video playback wrapper library for Enlightenment
 LICENSE=	BSD
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 USE_EFL=	ecore edje eet eio embryo evas libtool_hack modarch_hack
 USE_EFL_EVAS_LOADERS=	png jpeg
 USE_GNOME=	gnomehack pkgconfig
 USE_LDCONFIG=	yes
 
-OPTIONS=	GST	"Build GStreamer module"	on \
-		XINE	"Build Xine module"		off
-
 # emotion's vlc plugin needs updating due to libvlc API changes
 # details: http://trac.enlightenment.org/e/ticket/601
 CONFIGURE_ARGS=	--disable-generic-vlc
 
-.include <bsd.port.pre.mk>
+OPTIONS_MULTI=	BACKEND
+OPTIONS_MULTI_BACKEND=	GSTREAMER LIBXINE
+OPTIONS_DEFAULT=GSTREAMER
+
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not install on sparc64: coredump
 .endif
 
-.if defined(WITHOUT_XINE) && defined(WITHOUT_GST)
-IGNORE=	is useless without playback library. Please run 'make config' and choose one of XINE and GST
+.if ${PORT_OPTIONS:MGSTREAMER}
+USE_GSTREAMER=	ffmpeg good
+CONFIGURE_ARGS+=--enable-gstreamer
+PLIST_SUB+=	GST=""
+.else
+CONFIGURE_ARGS+=--disable-gstreamer
+PLIST_SUB+=	GST="@comment "
 .endif
 
-.if !defined(WITHOUT_XINE)
-LIB_DEPENDS+=	xine.2:${PORTSDIR}/multimedia/libxine
+.if ${PORT_OPTIONS:MLIBXINE}
+LIB_DEPENDS+=	xine:${PORTSDIR}/multimedia/libxine
 CONFIGURE_ARGS+=--enable-xine
 PLIST_SUB+=	XINE=""
 .else
@@ -48,19 +53,10 @@ CONFIGURE_ARGS+=--disable-xine
 PLIST_SUB+=	XINE="@comment "
 .endif
 
-.if !defined(WITHOUT_GST)
-USE_GSTREAMER=	ffmpeg good
-CONFIGURE_ARGS+=--enable-gstreamer
-PLIST_SUB+=	GST=""
-.else
-CONFIGURE_ARGS+=--disable-gstreamer
-PLIST_SUB+=	GST="@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:
@@ -68,8 +64,8 @@ post-patch:
 		${WRKSRC}/src/examples/Makefile.in
 
 post-install:
-.if defined(NOPORTEXAMPLES)
+.if empty(PORT_OPTIONS:MEXAMPLES)
 	@${RMDIR} ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/emotion/distinfo b/multimedia/emotion/distinfo
index 16ea213..1197dc4 100644
--- a/multimedia/emotion/distinfo
+++ b/multimedia/emotion/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/emotion-0.2.0.65643.tar.bz2) = 4a149d3c0e3c6617ff949b9d8f691556eeea4622ae4d698d0b6c1893f26c88d7
-SIZE (e17/emotion-0.2.0.65643.tar.bz2) = 477814
+SHA256 (e17/emotion-1.7.4.tar.bz2) = 44fd9061ffa0939a99e238044efefc0077ac0422781ea51be2d94a6735008111
+SIZE (e17/emotion-1.7.4.tar.bz2) = 499639
diff --git a/multimedia/emotion/pkg-plist b/multimedia/emotion/pkg-plist
index 88da5c5..3da92f6 100644
--- a/multimedia/emotion/pkg-plist
+++ b/multimedia/emotion/pkg-plist
@@ -1,12 +1,12 @@
 bin/emotion_test
-include/emotion-0/Emotion.h
-include/emotion-0/Emotion_Generic_Plugin.h
+include/emotion-1/Emotion.h
+include/emotion-1/Emotion_Generic_Plugin.h
 lib/emotion/em_generic.so
 %%GST%%lib/emotion/gstreamer.so
 %%XINE%%lib/emotion/xine.so
 lib/edje/modules/emotion/%%E17_ARCH%%/module.so
 lib/libemotion.so
-lib/libemotion.so.2
+lib/libemotion.so.8
 libdata/pkgconfig/emotion.pc
 %%DATADIR%%/data/theme.edj
 %%DATADIR%%/data/icon.edj
@@ -18,7 +18,7 @@ libdata/pkgconfig/emotion.pc
 @dirrm lib/edje/modules/emotion
 @dirrmtry lib/edje/modules
 @dirrmtry lib/edje
-@dirrm include/emotion-0
+@dirrm include/emotion-1
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
 @dirrm lib/emotion
diff --git a/net/ecore-con/Makefile b/net/ecore-con/Makefile
index 76942e1..bb75d7e 100644
--- a/net/ecore-con/Makefile
+++ b/net/ecore-con/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	con
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	net 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 (con module)
@@ -27,27 +27,26 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 CONFIGURE_ARGS+=	--enable-ecore-con
 
-OPTIONS=	CARES	"Enable async DNS resolving via c-ares" on \
-		CURL	"Enable Curl support"	on \
-		SSL	"Enable SSL support"	on
+OPTIONS_DEFINE=	CARES CURL SSL
+OPTIONS_DEFAULT=CARES CURL SSL
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_CARES)
+.if ${PORT_OPTIONS:MCARES}
 CONFIGURE_ARGS+=	--enable-cares
-LIB_DEPENDS+=		cares.2:${PORTSDIR}/dns/c-ares
+LIB_DEPENDS+=		cares:${PORTSDIR}/dns/c-ares
 .else
 CONFIGURE_ARGS+=	--disable-cares
 .endif
 
-.if !defined(WITHOUT_CURL)
+.if ${PORT_OPTIONS:MCURL}
 CONFIGURE_ARGS+=	--enable-curl
-LIB_DEPENDS+=		curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=		curl:${PORTSDIR}/ftp/curl
 .else
 CONFIGURE_ARGS+=	--disable-curl
 .endif
 
-.if !defined(WITHOUT_SSL)
+.if ${PORT_OPTIONS:MSSL}
 CONFIGURE_ENV=		SSL_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" SSL_LIBS="-lssl"
 CONFIGURE_ARGS+=	--enable-openssl
 .else
@@ -65,4 +64,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ecore-con.pc \
 		${PREFIX}/libdata/pkgconfig/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/ecore-con/distinfo b/net/ecore-con/distinfo
index 30f1fae..e479425 100644
--- a/net/ecore-con/distinfo
+++ b/net/ecore-con/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/net/ecore-con/pkg-plist b/net/ecore-con/pkg-plist
index 51a9a65..cd1c77b 100644
--- a/net/ecore-con/pkg-plist
+++ b/net/ecore-con/pkg-plist
@@ -1,5 +1,5 @@
 include/ecore-1/Ecore_Con.h
 lib/libecore_con.so
-lib/libecore_con.so.2
+lib/libecore_con.so.8
 libdata/pkgconfig/ecore-con.pc
 @dirrmtry include/ecore-1
diff --git a/sysutils/empower/Makefile b/sysutils/empower/Makefile
index b0d9cec..fa8c720 100644
--- a/sysutils/empower/Makefile
+++ b/sysutils/empower/Makefile
@@ -9,24 +9,27 @@ MASTER_SITES=	http://files.roorback.net/e17/extra/
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A graphical sudo tool based on the EFL
 
-DIST_SUBDIR=	e17
-
 RUN_DEPENDS=	sudo:${PORTSDIR}/security/sudo
 
+BROKEN=		Does not build
+
+DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 USE_EFL=	evas ecore edje elementary
 USE_EFL_ECORE=	file imf evas
 USE_GNOME=	gnomehack pkgconfig
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.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
 
diff --git a/www/Makefile b/www/Makefile
index b5435e9..ec4d3ff 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -178,6 +178,7 @@
     SUBDIR += e107
     SUBDIR += eaccelerator
     SUBDIR += efront
+    SUBDIR += egueb
     SUBDIR += eldav.el
     SUBDIR += elgg
     SUBDIR += elinks
diff --git a/www/egueb/Makefile b/www/egueb/Makefile
new file mode 100644
index 0000000..343415f
--- /dev/null
+++ b/www/egueb/Makefile
@@ -0,0 +1,31 @@
+# Created by: Grzegorz Blach <gblach@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	egueb
+PORTVERSION=	20121003
+CATEGORIES=	www enlightenment
+MASTER_SITES=	http://files.roorback.net/e17/extra/
+
+MAINTAINER=	gblach@FreeBSD.org
+COMMENT=	Egueb provides support for www standards
+
+LICENSE=	LGPL21
+
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+
+DIST_SUBDIR=	e17
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_BISON=	build
+USE_EFL=	eina enesim ender etch libtool_hack
+USE_GNOME=	gnomehack pkgconfig
+USE_LDCONFIG=	yes
+
+CONFIGURE_ARGS=	--disable-static
+
+post-patch:
+	@${REINPLACE_CMD} -e "s|@LEX@|${LOCALBASE}/bin/flex|" \
+		${WRKSRC}/ecss/lib/Makefile.in
+
+.include <bsd.port.mk>
diff --git a/www/egueb/distinfo b/www/egueb/distinfo
new file mode 100644
index 0000000..d04b117
--- /dev/null
+++ b/www/egueb/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/egueb-20121003.tar.bz2) = da5a52daefa8df9aea08aba01774a10498fbeae047206fc337576dbe370e8eba
+SIZE (e17/egueb-20121003.tar.bz2) = 605586
diff --git a/www/egueb/pkg-descr b/www/egueb/pkg-descr
new file mode 100644
index 0000000..2a24c6c
--- /dev/null
+++ b/www/egueb/pkg-descr
@@ -0,0 +1,4 @@
+Egueb is the place to put all the www standards.
+Currently provides edom, ecss and esvg.
+
+WWW: http://code.google.com/p/enesim/
diff --git a/www/egueb/pkg-plist b/www/egueb/pkg-plist
new file mode 100644
index 0000000..543bada
--- /dev/null
+++ b/www/egueb/pkg-plist
@@ -0,0 +1,50 @@
+bin/esvg_loader
+include/Ecss.h
+include/Edom.h
+include/Esvg.h
+include/esvg/esvg_a.h
+include/esvg/esvg_animate.h
+include/esvg/esvg_animate_base.h
+include/esvg/esvg_animate_transform.h
+include/esvg/esvg_animation.h
+include/esvg/esvg_circle.h
+include/esvg/esvg_clip_path.h
+include/esvg/esvg_defs.h
+include/esvg/esvg_element.h
+include/esvg/esvg_ellipse.h
+include/esvg/esvg_event.h
+include/esvg/esvg_g.h
+include/esvg/esvg_gradient.h
+include/esvg/esvg_image.h
+include/esvg/esvg_line.h
+include/esvg/esvg_linear_gradient.h
+include/esvg/esvg_main.h
+include/esvg/esvg_paint_server.h
+include/esvg/esvg_parser.h
+include/esvg/esvg_path.h
+include/esvg/esvg_polygon.h
+include/esvg/esvg_polyline.h
+include/esvg/esvg_radial_gradient.h
+include/esvg/esvg_rect.h
+include/esvg/esvg_referenceable.h
+include/esvg/esvg_renderable.h
+include/esvg/esvg_stop.h
+include/esvg/esvg_style.h
+include/esvg/esvg_svg.h
+include/esvg/esvg_text.h
+include/esvg/esvg_types.h
+include/esvg/esvg_use.h
+lib/libecss.so
+lib/libecss.so.0
+lib/libedom.so
+lib/libedom.so.0
+lib/libesvg.so
+lib/libesvg.so.0
+lib/emage/emage_svg.so
+libdata/pkgconfig/ecss.pc
+libdata/pkgconfig/edom.pc
+libdata/pkgconfig/esvg.pc
+share/ender/edom.ender
+@dirrmtry share/ender
+@dirrmtry lib/emage
+@dirrm include/esvg
diff --git a/x11-toolkits/elementary/Makefile b/x11-toolkits/elementary/Makefile
index b64656b..7b487f8 100644
--- a/x11-toolkits/elementary/Makefile
+++ b/x11-toolkits/elementary/Makefile
@@ -2,50 +2,61 @@
 # $FreeBSD$
 
 PORTNAME=	elementary
-PORTVERSION=	0.8.0.65643
+PORTVERSION=	1.7.4
 CATEGORIES=	x11-toolkits 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=	Simple widget toolkit using EFL
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	lua-5.1:${PORTSDIR}/lang/lua
+LIB_DEPENDS=	lua-5:${PORTSDIR}/lang/lua
 
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_EFL=	ecore embryo edje libtool_hack librt_hack modarch_hack
+USE_EFL=	ecore eio edbus efreet embryo edje emotion ethumb \
+		libtool_hack librt_hack modarch_hack
 USE_GNOME=	gnomehack pkgconfig
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
-CONFIGURE_ARGS=	--disable-install-examples
+CONFIGURE_ARGS=	--disable-quick-launch
 
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.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 ${PORT_OPTIONS:MEXAMPLES}
+CONFIGURE_ARGS+=--enable-install-examples
+.else
+CONFIGURE_ARGS+=--disable-install-examples
+.endif
+
 post-patch:
+	@${REINPLACE_CMD} -e 's|= \$$(pkgdatadir)/examples|= $$(datadir)/examples/$$(PACKAGE)|' \
+		${WRKSRC}/src/examples/Makefile.in
 	@${LN} -s profile.src ${WRKSRC}/config/profile.cfg
 	@${LN} -s base.src ${WRKSRC}/config/default/base.cfg
-	@${LN} -s base.src ${WRKSRC}/config/illume/base.cfg
+	@${LN} -s base.src ${WRKSRC}/config/mobile/base.cfg
 	@${LN} -s base.src ${WRKSRC}/config/standard/base.cfg
 
 post-install:
-	@${RMDIR} ${PREFIX}/share/elementary/examples
-
-.include <bsd.port.pre.mk>
+.if empty(PORT_OPTIONS:MEXAMPLES)
+	@${RMDIR} ${EXAMPLESDIR}
+.endif
 
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not install on sparc64: signal 10
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/elementary/distinfo b/x11-toolkits/elementary/distinfo
index e3a3308..ed0661b 100644
--- a/x11-toolkits/elementary/distinfo
+++ b/x11-toolkits/elementary/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/elementary-0.8.0.65643.tar.bz2) = e1d8ab516a6e3556a2fdc1c4188e2d39f6f8fa7b59bf9df178ac6b1f146932da
-SIZE (e17/elementary-0.8.0.65643.tar.bz2) = 8197914
+SHA256 (e17/elementary-1.7.4.tar.bz2) = 3f792bbd1fe004eeb81b5f3fa58cfae5db7d7069e330503490f23e1aa0d4911c
+SIZE (e17/elementary-1.7.4.tar.bz2) = 9374743
diff --git a/x11-toolkits/elementary/pkg-plist b/x11-toolkits/elementary/pkg-plist
index e0666a0..d139209 100644
--- a/x11-toolkits/elementary/pkg-plist
+++ b/x11-toolkits/elementary/pkg-plist
@@ -1,16 +1,157 @@
 bin/elementary_config
-bin/elementary_quicklaunch
-bin/elementary_run
 bin/elementary_test
-bin/elementary_testql
-include/elementary-0/Elementary.h
-include/elementary-0/Elementary_Cursor.h
-include/elementary-0/elm_widget.h
+include/elementary-1/Elementary.h
+include/elementary-1/Elementary_Cursor.h
+include/elementary-1/elc_ctxpopup.h
+include/elementary-1/elc_fileselector.h
+include/elementary-1/elc_fileselector_button.h
+include/elementary-1/elc_fileselector_entry.h
+include/elementary-1/elc_hoversel.h
+include/elementary-1/elc_multibuttonentry.h
+include/elementary-1/elc_naviframe.h
+include/elementary-1/elc_popup.h
+include/elementary-1/elm_actionslider.h
+include/elementary-1/elm_app.h
+include/elementary-1/elm_authors.h
+include/elementary-1/elm_bg.h
+include/elementary-1/elm_box.h
+include/elementary-1/elm_bubble.h
+include/elementary-1/elm_button.h
+include/elementary-1/elm_cache.h
+include/elementary-1/elm_calendar.h
+include/elementary-1/elm_check.h
+include/elementary-1/elm_clock.h
+include/elementary-1/elm_cnp.h
+include/elementary-1/elm_colorselector.h
+include/elementary-1/elm_config.h
+include/elementary-1/elm_conform.h
+include/elementary-1/elm_cursor.h
+include/elementary-1/elm_datetime.h
+include/elementary-1/elm_dayselector.h
+include/elementary-1/elm_debug.h
+include/elementary-1/elm_deprecated.h
+include/elementary-1/elm_diskselector.h
+include/elementary-1/elm_entry.h
+include/elementary-1/elm_finger.h
+include/elementary-1/elm_flip.h
+include/elementary-1/elm_flipselector.h
+include/elementary-1/elm_focus.h
+include/elementary-1/elm_font.h
+include/elementary-1/elm_frame.h
+include/elementary-1/elm_gen.h
+include/elementary-1/elm_general.h
+include/elementary-1/elm_gengrid.h
+include/elementary-1/elm_genlist.h
+include/elementary-1/elm_gesture_layer.h
+include/elementary-1/elm_getting_started.h
+include/elementary-1/elm_glview.h
+include/elementary-1/elm_grid.h
+include/elementary-1/elm_hover.h
+include/elementary-1/elm_icon.h
+include/elementary-1/elm_image.h
+include/elementary-1/elm_index.h
+include/elementary-1/elm_interface_scrollable.h
+include/elementary-1/elm_intro.h
+include/elementary-1/elm_inwin.h
+include/elementary-1/elm_label.h
+include/elementary-1/elm_layout.h
+include/elementary-1/elm_list.h
+include/elementary-1/elm_macros.h
+include/elementary-1/elm_map.h
+include/elementary-1/elm_mapbuf.h
+include/elementary-1/elm_menu.h
+include/elementary-1/elm_mirroring.h
+include/elementary-1/elm_need.h
+include/elementary-1/elm_notify.h
+include/elementary-1/elm_object.h
+include/elementary-1/elm_object_item.h
+include/elementary-1/elm_panel.h
+include/elementary-1/elm_panes.h
+include/elementary-1/elm_photo.h
+include/elementary-1/elm_photocam.h
+include/elementary-1/elm_plug.h
+include/elementary-1/elm_progressbar.h
+include/elementary-1/elm_radio.h
+include/elementary-1/elm_route.h
+include/elementary-1/elm_scale.h
+include/elementary-1/elm_scroll.h
+include/elementary-1/elm_scroller.h
+include/elementary-1/elm_segment_control.h
+include/elementary-1/elm_separator.h
+include/elementary-1/elm_slider.h
+include/elementary-1/elm_slideshow.h
+include/elementary-1/elm_spinner.h
+include/elementary-1/elm_store.h
+include/elementary-1/elm_table.h
+include/elementary-1/elm_theme.h
+include/elementary-1/elm_thumb.h
+include/elementary-1/elm_toolbar.h
+include/elementary-1/elm_tooltip.h
+include/elementary-1/elm_transit.h
+include/elementary-1/elm_video.h
+include/elementary-1/elm_web.h
+include/elementary-1/elm_widget.h
+include/elementary-1/elm_widget_actionslider.h
+include/elementary-1/elm_widget_bg.h
+include/elementary-1/elm_widget_box.h
+include/elementary-1/elm_widget_bubble.h
+include/elementary-1/elm_widget_button.h
+include/elementary-1/elm_widget_calendar.h
+include/elementary-1/elm_widget_check.h
+include/elementary-1/elm_widget_clock.h
+include/elementary-1/elm_widget_colorselector.h
+include/elementary-1/elm_widget_conform.h
+include/elementary-1/elm_widget_container.h
+include/elementary-1/elm_widget_datetime.h
+include/elementary-1/elm_widget_dayselector.h
+include/elementary-1/elm_widget_diskselector.h
+include/elementary-1/elm_widget_fileselector.h
+include/elementary-1/elm_widget_fileselector_button.h
+include/elementary-1/elm_widget_flip.h
+include/elementary-1/elm_widget_flipselector.h
+include/elementary-1/elm_widget_frame.h
+include/elementary-1/elm_widget_gengrid.h
+include/elementary-1/elm_widget_genlist.h
+include/elementary-1/elm_widget_glview.h
+include/elementary-1/elm_widget_grid.h
+include/elementary-1/elm_widget_hover.h
+include/elementary-1/elm_widget_hoversel.h
+include/elementary-1/elm_widget_icon.h
+include/elementary-1/elm_widget_image.h
+include/elementary-1/elm_widget_index.h
+include/elementary-1/elm_widget_inwin.h
+include/elementary-1/elm_widget_label.h
+include/elementary-1/elm_widget_layout.h
+include/elementary-1/elm_widget_list.h
+include/elementary-1/elm_widget_map.h
+include/elementary-1/elm_widget_mapbuf.h
+include/elementary-1/elm_widget_menu.h
+include/elementary-1/elm_widget_naviframe.h
+include/elementary-1/elm_widget_notify.h
+include/elementary-1/elm_widget_panes.h
+include/elementary-1/elm_widget_photo.h
+include/elementary-1/elm_widget_photocam.h
+include/elementary-1/elm_widget_player.h
+include/elementary-1/elm_widget_plug.h
+include/elementary-1/elm_widget_progressbar.h
+include/elementary-1/elm_widget_radio.h
+include/elementary-1/elm_widget_route.h
+include/elementary-1/elm_widget_scroller.h
+include/elementary-1/elm_widget_segment_control.h
+include/elementary-1/elm_widget_separator.h
+include/elementary-1/elm_widget_slider.h
+include/elementary-1/elm_widget_slideshow.h
+include/elementary-1/elm_widget_spinner.h
+include/elementary-1/elm_widget_table.h
+include/elementary-1/elm_widget_thumb.h
+include/elementary-1/elm_widget_video.h
+include/elementary-1/elm_widget_web.h
+include/elementary-1/elm_win.h
 lib/libelementary.so
 lib/libelementary.so.8
 lib/edje/modules/elm/%%E17_ARCH%%/module.so
-lib/elementary_testql.so
 lib/elementary/modules/access_output/%%E17_ARCH%%/module.so
+lib/elementary/modules/datetime_input_ctxpopup/%%E17_ARCH%%/module.so
 lib/elementary/modules/test_entry/%%E17_ARCH%%/module.so
 lib/elementary/modules/test_map/%%E17_ARCH%%/module.so
 libdata/pkgconfig/elementary.pc
@@ -20,9 +161,9 @@ share/icons/elementary.png
 %%DATADIR%%/config/default/base.cfg
 %%DATADIR%%/config/default/icon.png
 %%DATADIR%%/config/default/profile.desktop
-%%DATADIR%%/config/illume/base.cfg
-%%DATADIR%%/config/illume/icon.png
-%%DATADIR%%/config/illume/profile.desktop
+%%DATADIR%%/config/mobile/base.cfg
+%%DATADIR%%/config/mobile/icon.png
+%%DATADIR%%/config/mobile/profile.desktop
 %%DATADIR%%/config/profile.cfg
 %%DATADIR%%/config/standard/base.cfg
 %%DATADIR%%/config/standard/icon.png
@@ -117,11 +258,111 @@ share/icons/elementary.png
 %%DATADIR%%/objects/multip.edj
 %%DATADIR%%/objects/postit_ent.edj
 %%DATADIR%%/objects/test.edj
-%%DATADIR%%/objects/colorpreview.edj
 %%DATADIR%%/objects/cursors.edj
 %%DATADIR%%/objects/font_preview.edj
 %%DATADIR%%/themes/default.edj
 %%DATADIR%%/themes/default-desktop.edj
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/actionslider_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bg_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bg_example_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bg_example_03.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/box_example_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bubble_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/button_example_00.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/button_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar_example_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar_example_03.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar_example_04.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar_example_05.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar_example_06.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/check_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clock_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorselector_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conformant_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conformant_example_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ctxpopup_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datetime_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dayselector_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dict.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diskselector_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diskselector_example_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/efl_thread_1.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/efl_thread_2.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/efl_thread_3.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/efl_thread_4.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/efl_thread_5.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/efl_thread_6.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/efl_thread_win32_1.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/efl_thread_win32_2.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/efl_thread_win32_3.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/efl_thread_win32_4.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/entry_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fileselector_button_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fileselector_entry_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fileselector_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/flip_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/flipselector_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/frame_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/general_funcs_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gengrid_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/genlist_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/genlist_example_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/genlist_example_03.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/genlist_example_04.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/genlist_example_05.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glview_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hover_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hoversel_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/icon_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/image_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/index_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/index_example_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inwin_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/label_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/layout_example.edc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/layout_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/layout_example_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/layout_example_03.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/list_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/list_example_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/list_example_03.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/map_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/map_example_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/map_example_03.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mapbuf_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menu_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panes_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/photocam_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/popup_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/popup_example_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/popup_example_03.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/progressbar_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/radio_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scroller_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segment_control_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/separator_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/slider_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/slideshow_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spinner_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/table_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/table_example_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/theme_example.edc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/theme_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/theme_example_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thumb_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/toolbar_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/toolbar_example_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/toolbar_example_03.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/transit_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/transit_example_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/transit_example_03.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/transit_example_04.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/web_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/web_example_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/win_example.c
 %%NLS%%share/locale/ar/LC_MESSAGES/elementary.mo
 %%NLS%%share/locale/az_IR/LC_MESSAGES/elementary.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/elementary.mo
@@ -136,7 +377,7 @@ share/icons/elementary.png
 %%NLS%%share/locale/pt/LC_MESSAGES/elementary.mo
 %%NLS%%share/locale/ur/LC_MESSAGES/elementary.mo
 %%NLS%%share/locale/yi/LC_MESSAGES/elementary.mo
-@dirrm include/elementary-0
+@dirrm include/elementary-1
 @dirrm lib/edje/modules/elm/%%E17_ARCH%%
 @dirrm lib/edje/modules/elm
 @dirrmtry lib/edje/modules
@@ -145,17 +386,20 @@ share/icons/elementary.png
 @dirrm lib/elementary/modules/test_map
 @dirrm lib/elementary/modules/test_entry/%%E17_ARCH%%
 @dirrm lib/elementary/modules/test_entry
+@dirrm lib/elementary/modules/datetime_input_ctxpopup/%%E17_ARCH%%
+@dirrm lib/elementary/modules/datetime_input_ctxpopup
 @dirrm lib/elementary/modules/access_output/%%E17_ARCH%%
 @dirrm lib/elementary/modules/access_output
 @dirrm lib/elementary/modules
 @dirrm lib/elementary
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%/objects
 @dirrm %%DATADIR%%/images/g_layer
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%/edje_externals
 @dirrm %%DATADIR%%/config/standard
-@dirrm %%DATADIR%%/config/illume
+@dirrm %%DATADIR%%/config/mobile
 @dirrm %%DATADIR%%/config/default
 @dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%
diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index f3f37de..7d98e26 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -38,6 +38,7 @@
     SUBDIR += e17-module-diskio
     SUBDIR += e17-module-drawer
     SUBDIR += e17-module-e-tiling
+    SUBDIR += e17-module-eektool
     SUBDIR += e17-module-elfe
     SUBDIR += e17-module-empris
     SUBDIR += e17-module-engage
@@ -67,6 +68,7 @@
     SUBDIR += e17-module-places
     SUBDIR += e17-module-quickaccess
     SUBDIR += e17-module-rain
+    SUBDIR += e17-module-rmb
     SUBDIR += e17-module-screenshot
     SUBDIR += e17-module-slideshow
     SUBDIR += e17-module-snow
diff --git a/x11-wm/e17-module-alarm/Makefile b/x11-wm/e17-module-alarm/Makefile
index 0377e63..2837857 100644
--- a/x11-wm/e17-module-alarm/Makefile
+++ b/x11-wm/e17-module-alarm/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	alarm
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -10,22 +10,26 @@ PKGNAMEPREFIX=	e17-module-
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A module to set Alarms in Enlightenment 17
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-alarm/distinfo b/x11-wm/e17-module-alarm/distinfo
index 4a9d2f7..95317b4 100644
--- a/x11-wm/e17-module-alarm/distinfo
+++ b/x11-wm/e17-module-alarm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/alarm-20111128.tar.bz2) = 182518f42a96ba1c737adcb7eae5209671e506bcfc15ee14b83696960592a5ce
-SIZE (e17/alarm-20111128.tar.bz2) = 635949
+SHA256 (e17/alarm-20120918.tar.bz2) = 19983005b8243934f93704558e5d46b40590b19ae948ebb9725559539052c3d9
+SIZE (e17/alarm-20120918.tar.bz2) = 638520
diff --git a/x11-wm/e17-module-calendar/Makefile b/x11-wm/e17-module-calendar/Makefile
index 7ff2775..7e36350 100644
--- a/x11-wm/e17-module-calendar/Makefile
+++ b/x11-wm/e17-module-calendar/Makefile
@@ -14,18 +14,24 @@ COMMENT=	Nice calendar module for e17
 BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
+DEPRECATED=	Deprecated upstream
+EXPIRATION_DATE=2013-01-31
+
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	ecore evas edje eet libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-comp-scale/Makefile b/x11-wm/e17-module-comp-scale/Makefile
index f7e1e90..9fe8d1b 100644
--- a/x11-wm/e17-module-comp-scale/Makefile
+++ b/x11-wm/e17-module-comp-scale/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	comp-scale
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,18 +14,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-comp-scale/distinfo b/x11-wm/e17-module-comp-scale/distinfo
index 91572ca..49e0e9d 100644
--- a/x11-wm/e17-module-comp-scale/distinfo
+++ b/x11-wm/e17-module-comp-scale/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/comp-scale-20111128.tar.bz2) = 1a9075a222e042b2b4787cfbe7357d5798e5a84b807e0ad6a976b9a13b61d7df
-SIZE (e17/comp-scale-20111128.tar.bz2) = 587174
+SHA256 (e17/comp-scale-20120918.tar.bz2) = 6648f5ccb86eab94b6f78cd80108dbb187266a35b0ed82716333aba625e60b72
+SIZE (e17/comp-scale-20120918.tar.bz2) = 583838
diff --git a/x11-wm/e17-module-cpu/Makefile b/x11-wm/e17-module-cpu/Makefile
index 40b4a84..e56a4ea 100644
--- a/x11-wm/e17-module-cpu/Makefile
+++ b/x11-wm/e17-module-cpu/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cpu
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,17 +14,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-cpu/distinfo b/x11-wm/e17-module-cpu/distinfo
index 65682ba..4305b28 100644
--- a/x11-wm/e17-module-cpu/distinfo
+++ b/x11-wm/e17-module-cpu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/cpu-20111128.tar.bz2) = fda0c1ba2c62124577a8f31e97688d0e0b79041ac383aeaebd8cdb03e67ea9e4
-SIZE (e17/cpu-20111128.tar.bz2) = 519440
+SHA256 (e17/cpu-20120918.tar.bz2) = ab27ae21560703a35652452d70e51319523c6c482718333898c5d46330692d68
+SIZE (e17/cpu-20120918.tar.bz2) = 540789
diff --git a/x11-wm/e17-module-deskshow/Makefile b/x11-wm/e17-module-deskshow/Makefile
index d22e088..5c09bae 100644
--- a/x11-wm/e17-module-deskshow/Makefile
+++ b/x11-wm/e17-module-deskshow/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	deskshow
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,10 +14,10 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
 
 .include <bsd.port.mk>
diff --git a/x11-wm/e17-module-deskshow/distinfo b/x11-wm/e17-module-deskshow/distinfo
index fe7f751..41c2c28 100644
--- a/x11-wm/e17-module-deskshow/distinfo
+++ b/x11-wm/e17-module-deskshow/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/deskshow-20111128.tar.bz2) = 27c542f376629de643a2fd8b8e68ed9adb77a15cdab9cd74a391cb0b00ec7a2c
-SIZE (e17/deskshow-20111128.tar.bz2) = 397639
+SHA256 (e17/deskshow-20120918.tar.bz2) = d192c2979ab95658fcee1c1c13033fa419b3b5619ea7d6685e1625d46f2b87b0
+SIZE (e17/deskshow-20120918.tar.bz2) = 411699
diff --git a/x11-wm/e17-module-diskio/Makefile b/x11-wm/e17-module-diskio/Makefile
index 7ee0071..48f4393 100644
--- a/x11-wm/e17-module-diskio/Makefile
+++ b/x11-wm/e17-module-diskio/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	diskio
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,18 +14,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-diskio/distinfo b/x11-wm/e17-module-diskio/distinfo
index e73586a..c142854 100644
--- a/x11-wm/e17-module-diskio/distinfo
+++ b/x11-wm/e17-module-diskio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/diskio-20111128.tar.bz2) = 36d37ad022d3b73615d1533c20ccebc4cb6f2a4c05f66b098e21f9565168f102
-SIZE (e17/diskio-20111128.tar.bz2) = 449929
+SHA256 (e17/diskio-20120918.tar.bz2) = b79da84f66b37cb382a37793212813f4e53f206906dfb8050e9c9e259dc092cc
+SIZE (e17/diskio-20120918.tar.bz2) = 474671
diff --git a/x11-wm/e17-module-drawer/Makefile b/x11-wm/e17-module-drawer/Makefile
index b5065b1..159e755 100644
--- a/x11-wm/e17-module-drawer/Makefile
+++ b/x11-wm/e17-module-drawer/Makefile
@@ -15,19 +15,24 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment \
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment \
 		ethumb:${PORTSDIR}/graphics/ethumb
 
+DEPRECATED=	Deprecated upstream
+EXPIRATION_DATE=2013-01-31
+
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	gnomehack pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-e-tiling/Makefile b/x11-wm/e17-module-e-tiling/Makefile
index c70fc74..f30f802 100644
--- a/x11-wm/e17-module-e-tiling/Makefile
+++ b/x11-wm/e17-module-e-tiling/Makefile
@@ -13,19 +13,24 @@ COMMENT=	A tiling module for Enlightenment 17
 BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
+DEPRECATED=	Deprecated upstream
+EXPIRATION_DATE=2013-01-31
+
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-eektool/Makefile b/x11-wm/e17-module-eektool/Makefile
new file mode 100644
index 0000000..69b3585
--- /dev/null
+++ b/x11-wm/e17-module-eektool/Makefile
@@ -0,0 +1,38 @@
+# Created by: Grzegorz Blach <gblach@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	eektool
+PORTVERSION=	20120918
+CATEGORIES=	x11-wm enlightenment
+MASTER_SITES=	http://files.roorback.net/e17/modules/
+PKGNAMEPREFIX=	e17-module-
+
+MAINTAINER=	gblach@FreeBSD.org
+COMMENT=	An e17 module to execute shell command and display the output
+
+BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR=	e17
+USE_BZIP2=	yes
+USE_AUTOTOOLS=	libtool
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|\-$$release||' ${WRKSRC}/configure.ac
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-eektool/distinfo b/x11-wm/e17-module-eektool/distinfo
new file mode 100644
index 0000000..05222b3
--- /dev/null
+++ b/x11-wm/e17-module-eektool/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/eektool-20120918.tar.bz2) = c6592e5b29015f89149c8cf303e1587e5a2fab56c94c3e0357f55b9c6fe1445e
+SIZE (e17/eektool-20120918.tar.bz2) = 478155
diff --git a/x11-wm/e17-module-eektool/pkg-descr b/x11-wm/e17-module-eektool/pkg-descr
new file mode 100644
index 0000000..11472bd
--- /dev/null
+++ b/x11-wm/e17-module-eektool/pkg-descr
@@ -0,0 +1,3 @@
+Execute a shell command and display the output.
+
+WWW:	http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-eektool/pkg-plist b/x11-wm/e17-module-eektool/pkg-plist
new file mode 100644
index 0000000..e9b695f
--- /dev/null
+++ b/x11-wm/e17-module-eektool/pkg-plist
@@ -0,0 +1,24 @@
+lib/enlightenment/modules/eektool/module.desktop
+lib/enlightenment/modules/eektool/e-module-eektool.edj
+lib/enlightenment/modules/eektool/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/eektool/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/eektool/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/eektool/images/icon.png
+%%NLS%%lib/enlightenment/modules/eektool/locale/de/LC_MESSAGES/eektool.mo
+%%NLS%%lib/enlightenment/modules/eektool/locale/fr/LC_MESSAGES/eektool.mo
+%%NLS%%lib/enlightenment/modules/eektool/locale/it/LC_MESSAGES/eektool.mo
+%%NLS%%lib/enlightenment/modules/eektool/locale/pt/LC_MESSAGES/eektool.mo
+%%NLS%%@dirrm lib/enlightenment/modules/eektool/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/eektool/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/eektool/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/eektool/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/eektool/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/eektool/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/eektool/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/eektool/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/eektool/locale
+@dirrm lib/enlightenment/modules/eektool/images
+@dirrm lib/enlightenment/modules/eektool/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/eektool
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-elfe/Makefile b/x11-wm/e17-module-elfe/Makefile
index 8b19655..b40f685 100644
--- a/x11-wm/e17-module-elfe/Makefile
+++ b/x11-wm/e17-module-elfe/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	elfe
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,19 +14,10 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje elementary libtool_hack modarch_hack
-
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+USE_GNOME=	pkgconfig
 
 .include <bsd.port.mk>
diff --git a/x11-wm/e17-module-elfe/distinfo b/x11-wm/e17-module-elfe/distinfo
index bab6259..1c12955 100644
--- a/x11-wm/e17-module-elfe/distinfo
+++ b/x11-wm/e17-module-elfe/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/elfe-20111128.tar.bz2) = 7bfe76f05418a6dc16f17dcdf54aa10607ff558906df9faa9dc76b5efd2a7a63
-SIZE (e17/elfe-20111128.tar.bz2) = 891818
+SHA256 (e17/elfe-20120918.tar.bz2) = b9c6175776af3a1a75128054a522282883fd63968c72bc65c7828e1e93c5e4bb
+SIZE (e17/elfe-20120918.tar.bz2) = 935140
diff --git a/x11-wm/e17-module-empris/Makefile b/x11-wm/e17-module-empris/Makefile
index 2e5c57b..94244f1 100644
--- a/x11-wm/e17-module-empris/Makefile
+++ b/x11-wm/e17-module-empris/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	empris
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,19 +14,10 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+USE_GNOME=	pkgconfig
 
 .include <bsd.port.mk>
diff --git a/x11-wm/e17-module-empris/distinfo b/x11-wm/e17-module-empris/distinfo
index a06137b..ce4962c 100644
--- a/x11-wm/e17-module-empris/distinfo
+++ b/x11-wm/e17-module-empris/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/empris-20111128.tar.bz2) = e7d11d46e8c4b9e54a397e682452df0c9f10e136ba37e83255e970be8b891d17
-SIZE (e17/empris-20111128.tar.bz2) = 447219
+SHA256 (e17/empris-20120918.tar.bz2) = b48ed7e8b61095fabdd03581cb69208773dec78b3789fa0303bd84833682ea95
+SIZE (e17/empris-20120918.tar.bz2) = 461895
diff --git a/x11-wm/e17-module-engage/Makefile b/x11-wm/e17-module-engage/Makefile
index fd8940a..3b5f9f7 100644
--- a/x11-wm/e17-module-engage/Makefile
+++ b/x11-wm/e17-module-engage/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	engage
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,18 +14,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-engage/distinfo b/x11-wm/e17-module-engage/distinfo
index fd5873b..ec94533 100644
--- a/x11-wm/e17-module-engage/distinfo
+++ b/x11-wm/e17-module-engage/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/engage-20111128.tar.bz2) = 7dd9764cbf5cd8d173cf03386d33477912b219b11192ed0e9b05ec52f1f231d7
-SIZE (e17/engage-20111128.tar.bz2) = 583408
+SHA256 (e17/engage-20120918.tar.bz2) = 24b52e067c4143cc367f1fb2d8c200cdd7edaa21096549a400beecf029f9a5fb
+SIZE (e17/engage-20120918.tar.bz2) = 577177
diff --git a/x11-wm/e17-module-engage/pkg-plist b/x11-wm/e17-module-engage/pkg-plist
index e9ab6ce..1dc3c6e 100644
--- a/x11-wm/e17-module-engage/pkg-plist
+++ b/x11-wm/e17-module-engage/pkg-plist
@@ -3,6 +3,7 @@ lib/enlightenment/modules/engage/module_icon.png
 lib/enlightenment/modules/engage/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/engage/module.desktop
 lib/enlightenment/modules/engage/e-module-ng.edj
+%%NLS%%lib/enlightenment/modules/engage/locale/ar/LC_MESSAGES/engage.mo
 %%NLS%%lib/enlightenment/modules/engage/locale/fr/LC_MESSAGES/engage.mo
 %%NLS%%lib/enlightenment/modules/engage/locale/de/LC_MESSAGES/engage.mo
 %%NLS%%lib/enlightenment/modules/engage/locale/it/LC_MESSAGES/engage.mo
@@ -21,6 +22,8 @@ lib/enlightenment/modules/engage/e-module-ng.edj
 %%NLS%%@dirrm lib/enlightenment/modules/engage/locale/de
 %%NLS%%@dirrm lib/enlightenment/modules/engage/locale/fr/LC_MESSAGES
 %%NLS%%@dirrm lib/enlightenment/modules/engage/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/engage/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/engage/locale/ar
 %%NLS%%@dirrm lib/enlightenment/modules/engage/locale
 @dirrm lib/enlightenment/modules/engage/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/engage
diff --git a/x11-wm/e17-module-eooorg/Makefile b/x11-wm/e17-module-eooorg/Makefile
index f34a996..29aa91c 100644
--- a/x11-wm/e17-module-eooorg/Makefile
+++ b/x11-wm/e17-module-eooorg/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	eooorg
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,18 +14,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-eooorg/distinfo b/x11-wm/e17-module-eooorg/distinfo
index f5838fd..79db485 100644
--- a/x11-wm/e17-module-eooorg/distinfo
+++ b/x11-wm/e17-module-eooorg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/eooorg-20111128.tar.bz2) = 84c2a8afb3623fc03b4e656aeed4588f43e55b54970678e2d8e7c933be70de20
-SIZE (e17/eooorg-20111128.tar.bz2) = 523204
+SHA256 (e17/eooorg-20120918.tar.bz2) = 4186e504ceb174ffc88dba52567e29b34f3ff6a12c98b40489593fb838894a32
+SIZE (e17/eooorg-20120918.tar.bz2) = 554167
diff --git a/x11-wm/e17-module-eooorg/pkg-plist b/x11-wm/e17-module-eooorg/pkg-plist
index 8889feb..7b5b470 100644
--- a/x11-wm/e17-module-eooorg/pkg-plist
+++ b/x11-wm/e17-module-eooorg/pkg-plist
@@ -1,6 +1,7 @@
 lib/enlightenment/modules/eooorg/module.desktop
 lib/enlightenment/modules/eooorg/e-module-eooorg.edj
 lib/enlightenment/modules/eooorg/%%E17_ARCH%%/module.so
+%%NLS%%lib/enlightenment/modules/eooorg/locale/ar/LC_MESSAGES/eooorg.mo
 %%NLS%%lib/enlightenment/modules/eooorg/locale/it/LC_MESSAGES/eooorg.mo
 %%NLS%%lib/enlightenment/modules/eooorg/locale/de/LC_MESSAGES/eooorg.mo
 %%NLS%%lib/enlightenment/modules/eooorg/locale/fr/LC_MESSAGES/eooorg.mo
@@ -22,6 +23,8 @@ lib/enlightenment/modules/eooorg/%%E17_ARCH%%/module.so
 %%NLS%%@dirrm lib/enlightenment/modules/eooorg/locale/de
 %%NLS%%@dirrm lib/enlightenment/modules/eooorg/locale/it/LC_MESSAGES
 %%NLS%%@dirrm lib/enlightenment/modules/eooorg/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/eooorg/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/eooorg/locale/ar
 %%NLS%%@dirrm lib/enlightenment/modules/eooorg/locale
 @dirrm lib/enlightenment/modules/eooorg/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/eooorg
diff --git a/x11-wm/e17-module-everything-aspell/Makefile b/x11-wm/e17-module-everything-aspell/Makefile
index cfd9165..5c3a698 100644
--- a/x11-wm/e17-module-everything-aspell/Makefile
+++ b/x11-wm/e17-module-everything-aspell/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	everything-aspell
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -15,18 +15,20 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment \
 		aspell:${PORTSDIR}/textproc/aspell
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-everything-aspell/distinfo b/x11-wm/e17-module-everything-aspell/distinfo
index a8cc038..2cfefb7 100644
--- a/x11-wm/e17-module-everything-aspell/distinfo
+++ b/x11-wm/e17-module-everything-aspell/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/everything-aspell-20111128.tar.bz2) = 49dd0fe31d25356498a91650ddf38aef858e8aa1c4389b45720c334334a15bda
-SIZE (e17/everything-aspell-20111128.tar.bz2) = 515350
+SHA256 (e17/everything-aspell-20120918.tar.bz2) = 238a2131e33d57e8d7eb773243d7733cf7c47646c22d1c671f972197f8da2d6a
+SIZE (e17/everything-aspell-20120918.tar.bz2) = 531746
diff --git a/x11-wm/e17-module-everything-mpris/Makefile b/x11-wm/e17-module-everything-mpris/Makefile
index 23c5829..f094b3b 100644
--- a/x11-wm/e17-module-everything-mpris/Makefile
+++ b/x11-wm/e17-module-everything-mpris/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	everything-mpris
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,18 +14,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-everything-mpris/distinfo b/x11-wm/e17-module-everything-mpris/distinfo
index 9ad4e72..2f6aa2a 100644
--- a/x11-wm/e17-module-everything-mpris/distinfo
+++ b/x11-wm/e17-module-everything-mpris/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/everything-mpris-20111128.tar.bz2) = fe206d5384a0ad3206ff78a4f10ed1064f5c0ea0f2ea7eeeee85149891430e95
-SIZE (e17/everything-mpris-20111128.tar.bz2) = 638170
+SHA256 (e17/everything-mpris-20120918.tar.bz2) = 25f13d095177cfe3c4cf6cdb8548857658edba75a740bd800e22035a1684c0d7
+SIZE (e17/everything-mpris-20120918.tar.bz2) = 621435
diff --git a/x11-wm/e17-module-everything-mpris/pkg-plist b/x11-wm/e17-module-everything-mpris/pkg-plist
index bf3b64b..5c93d92 100644
--- a/x11-wm/e17-module-everything-mpris/pkg-plist
+++ b/x11-wm/e17-module-everything-mpris/pkg-plist
@@ -1,6 +1,7 @@
 lib/enlightenment/modules/evry-mpris/e-module.edj
 lib/enlightenment/modules/evry-mpris/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/evry-mpris/module.desktop
+%%NLS%%lib/enlightenment/modules/evry-mpris/locale/ar/LC_MESSAGES/evry-mpris.mo
 %%NLS%%lib/enlightenment/modules/evry-mpris/locale/fr/LC_MESSAGES/evry-mpris.mo
 %%NLS%%lib/enlightenment/modules/evry-mpris/locale/it/LC_MESSAGES/evry-mpris.mo
 %%NLS%%lib/enlightenment/modules/evry-mpris/locale/el/LC_MESSAGES/evry-mpris.mo
@@ -25,6 +26,8 @@ lib/enlightenment/modules/evry-mpris/module.desktop
 %%NLS%%@dirrm lib/enlightenment/modules/evry-mpris/locale/it
 %%NLS%%@dirrm lib/enlightenment/modules/evry-mpris/locale/fr/LC_MESSAGES
 %%NLS%%@dirrm lib/enlightenment/modules/evry-mpris/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/evry-mpris/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/evry-mpris/locale/ar
 %%NLS%%@dirrm lib/enlightenment/modules/evry-mpris/locale
 @dirrm lib/enlightenment/modules/evry-mpris/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/evry-mpris
diff --git a/x11-wm/e17-module-everything-pidgin/Makefile b/x11-wm/e17-module-everything-pidgin/Makefile
index aab350d..1e0eab4 100644
--- a/x11-wm/e17-module-everything-pidgin/Makefile
+++ b/x11-wm/e17-module-everything-pidgin/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	everything-pidgin
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,18 +14,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-everything-pidgin/distinfo b/x11-wm/e17-module-everything-pidgin/distinfo
index 99517f5..523cca0 100644
--- a/x11-wm/e17-module-everything-pidgin/distinfo
+++ b/x11-wm/e17-module-everything-pidgin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/everything-pidgin-20111128.tar.bz2) = 869faa32bd2642d4fd16580746e7648edb9cd35b7bc53c7670847c68f3e5f3af
-SIZE (e17/everything-pidgin-20111128.tar.bz2) = 501320
+SHA256 (e17/everything-pidgin-20120918.tar.bz2) = dc49ab0a4f866dfbef4884110f8c7b3d53bcfc112e909f8757659de597dd82d6
+SIZE (e17/everything-pidgin-20120918.tar.bz2) = 527196
diff --git a/x11-wm/e17-module-everything-pidgin/pkg-plist b/x11-wm/e17-module-everything-pidgin/pkg-plist
index cdc55a3..1e5fab4 100644
--- a/x11-wm/e17-module-everything-pidgin/pkg-plist
+++ b/x11-wm/e17-module-everything-pidgin/pkg-plist
@@ -1,6 +1,7 @@
 lib/enlightenment/modules/evry-pidgin/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/evry-pidgin/e-module.edj
 lib/enlightenment/modules/evry-pidgin/module.desktop
+%%NLS%%lib/enlightenment/modules/evry-pidgin/locale/ar/LC_MESSAGES/evry-pidgin.mo
 %%NLS%%lib/enlightenment/modules/evry-pidgin/locale/it/LC_MESSAGES/evry-pidgin.mo
 %%NLS%%lib/enlightenment/modules/evry-pidgin/locale/el/LC_MESSAGES/evry-pidgin.mo
 %%NLS%%lib/enlightenment/modules/evry-pidgin/locale/fr/LC_MESSAGES/evry-pidgin.mo
@@ -28,6 +29,8 @@ lib/enlightenment/modules/evry-pidgin/module.desktop
 %%NLS%%@dirrm lib/enlightenment/modules/evry-pidgin/locale/el
 %%NLS%%@dirrm lib/enlightenment/modules/evry-pidgin/locale/it/LC_MESSAGES
 %%NLS%%@dirrm lib/enlightenment/modules/evry-pidgin/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/evry-pidgin/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/evry-pidgin/locale/ar
 %%NLS%%@dirrm lib/enlightenment/modules/evry-pidgin/locale
 @dirrm lib/enlightenment/modules/evry-pidgin/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/evry-pidgin
diff --git a/x11-wm/e17-module-everything-places/Makefile b/x11-wm/e17-module-everything-places/Makefile
index 68859a2..fb0488f 100644
--- a/x11-wm/e17-module-everything-places/Makefile
+++ b/x11-wm/e17-module-everything-places/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	everything-places
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,18 +14,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-everything-places/distinfo b/x11-wm/e17-module-everything-places/distinfo
index e72ae77..c5b98d1 100644
--- a/x11-wm/e17-module-everything-places/distinfo
+++ b/x11-wm/e17-module-everything-places/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/everything-places-20111128.tar.bz2) = a864afdcf21f536aa171e42085c8c8382bcf1c07cfd8c88ed2f5893827ac4b3f
-SIZE (e17/everything-places-20111128.tar.bz2) = 486203
+SHA256 (e17/everything-places-20120918.tar.bz2) = 620a6818e780b58474aa82b7b9b42cc8b2ea0136515f5bed33a0ca18d938a897
+SIZE (e17/everything-places-20120918.tar.bz2) = 531661
diff --git a/x11-wm/e17-module-everything-places/pkg-plist b/x11-wm/e17-module-everything-places/pkg-plist
index 9a1bbff..465899c 100644
--- a/x11-wm/e17-module-everything-places/pkg-plist
+++ b/x11-wm/e17-module-everything-places/pkg-plist
@@ -1,6 +1,7 @@
 lib/enlightenment/modules/everything-places/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/everything-places/module.desktop
 lib/enlightenment/modules/everything-places/e-module.edj
+%%NLS%%lib/enlightenment/modules/everything-places/locale/ar/LC_MESSAGES/everything-places.mo
 %%NLS%%lib/enlightenment/modules/everything-places/locale/it/LC_MESSAGES/everything-places.mo
 %%NLS%%lib/enlightenment/modules/everything-places/locale/fr/LC_MESSAGES/everything-places.mo
 %%NLS%%lib/enlightenment/modules/everything-places/locale/cs/LC_MESSAGES/everything-places.mo
@@ -22,6 +23,8 @@ lib/enlightenment/modules/everything-places/e-module.edj
 %%NLS%%@dirrm lib/enlightenment/modules/everything-places/locale/fr
 %%NLS%%@dirrm lib/enlightenment/modules/everything-places/locale/it/LC_MESSAGES
 %%NLS%%@dirrm lib/enlightenment/modules/everything-places/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/everything-places/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/everything-places/locale/ar
 %%NLS%%@dirrm lib/enlightenment/modules/everything-places/locale
 @dirrm lib/enlightenment/modules/everything-places/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/everything-places
diff --git a/x11-wm/e17-module-everything-shotgun/Makefile b/x11-wm/e17-module-everything-shotgun/Makefile
index acb7766..5333ab6 100644
--- a/x11-wm/e17-module-everything-shotgun/Makefile
+++ b/x11-wm/e17-module-everything-shotgun/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	everything-shotgun
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,19 +14,10 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+USE_GNOME=	pkgconfig
 
 .include <bsd.port.mk>
diff --git a/x11-wm/e17-module-everything-shotgun/distinfo b/x11-wm/e17-module-everything-shotgun/distinfo
index b332d98..1275233 100644
--- a/x11-wm/e17-module-everything-shotgun/distinfo
+++ b/x11-wm/e17-module-everything-shotgun/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/everything-shotgun-20111128.tar.bz2) = 6b8c69756e0dd4ac1826e678382a669a903ee9660f97c2bfe21f6f0fb736215b
-SIZE (e17/everything-shotgun-20111128.tar.bz2) = 515212
+SHA256 (e17/everything-shotgun-20120918.tar.bz2) = fc6ce9d86031bf50e4c23ee2ca3994ebb8353f028d91ad7b23c20561b9de46f1
+SIZE (e17/everything-shotgun-20120918.tar.bz2) = 546971
diff --git a/x11-wm/e17-module-everything-wallpaper/Makefile b/x11-wm/e17-module-everything-wallpaper/Makefile
index e71e1d9..70ade78 100644
--- a/x11-wm/e17-module-everything-wallpaper/Makefile
+++ b/x11-wm/e17-module-everything-wallpaper/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	everything-wallpaper
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,18 +14,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-everything-wallpaper/distinfo b/x11-wm/e17-module-everything-wallpaper/distinfo
index 4017769..ffe6c28 100644
--- a/x11-wm/e17-module-everything-wallpaper/distinfo
+++ b/x11-wm/e17-module-everything-wallpaper/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/everything-wallpaper-20111128.tar.bz2) = cdd3ebd049ecc47b53c6ba8936579b6c482bd4da19ab1563d50168745fb0c48e
-SIZE (e17/everything-wallpaper-20111128.tar.bz2) = 519131
+SHA256 (e17/everything-wallpaper-20120918.tar.bz2) = 23d79f4160b6f262f5c82dd333f70ca3831a9a76b7015a67b6a27e55ae9cdf4d
+SIZE (e17/everything-wallpaper-20120918.tar.bz2) = 532927
diff --git a/x11-wm/e17-module-everything-wallpaper/pkg-plist b/x11-wm/e17-module-everything-wallpaper/pkg-plist
index 0fdd864..ea1b54e 100644
--- a/x11-wm/e17-module-everything-wallpaper/pkg-plist
+++ b/x11-wm/e17-module-everything-wallpaper/pkg-plist
@@ -1,6 +1,7 @@
 lib/enlightenment/modules/everything-wallpaper/module.desktop
 lib/enlightenment/modules/everything-wallpaper/e-module.edj
 lib/enlightenment/modules/everything-wallpaper/%%E17_ARCH%%/module.so
+%%NLS%%lib/enlightenment/modules/everything-wallpaper/locale/ar/LC_MESSAGES/everything-wallpaper.mo
 %%NLS%%lib/enlightenment/modules/everything-wallpaper/locale/cs/LC_MESSAGES/everything-wallpaper.mo
 %%NLS%%lib/enlightenment/modules/everything-wallpaper/locale/de/LC_MESSAGES/everything-wallpaper.mo
 %%NLS%%lib/enlightenment/modules/everything-wallpaper/locale/fr/LC_MESSAGES/everything-wallpaper.mo
@@ -25,6 +26,8 @@ lib/enlightenment/modules/everything-wallpaper/%%E17_ARCH%%/module.so
 %%NLS%%@dirrm lib/enlightenment/modules/everything-wallpaper/locale/de
 %%NLS%%@dirrm lib/enlightenment/modules/everything-wallpaper/locale/cs/LC_MESSAGES
 %%NLS%%@dirrm lib/enlightenment/modules/everything-wallpaper/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/everything-wallpaper/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/everything-wallpaper/locale/ar
 %%NLS%%@dirrm lib/enlightenment/modules/everything-wallpaper/locale
 @dirrm lib/enlightenment/modules/everything-wallpaper/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/everything-wallpaper
diff --git a/x11-wm/e17-module-everything-websearch/Makefile b/x11-wm/e17-module-everything-websearch/Makefile
index a7925d5..fa45bd2 100644
--- a/x11-wm/e17-module-everything-websearch/Makefile
+++ b/x11-wm/e17-module-everything-websearch/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	everything-websearch
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,18 +14,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-everything-websearch/distinfo b/x11-wm/e17-module-everything-websearch/distinfo
index 3c7d9a1..dc534f1 100644
--- a/x11-wm/e17-module-everything-websearch/distinfo
+++ b/x11-wm/e17-module-everything-websearch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/everything-websearch-20111128.tar.bz2) = 1d87bccf49d92e8498ee81b19d96127d71c401c415913079831f6c5f0fcd1751
-SIZE (e17/everything-websearch-20111128.tar.bz2) = 597825
+SHA256 (e17/everything-websearch-20120918.tar.bz2) = 60ef7945c2024cb7ea44069d04a977a39765e371efbd4e94f4d7d98eb0ed27c2
+SIZE (e17/everything-websearch-20120918.tar.bz2) = 625163
diff --git a/x11-wm/e17-module-everything-websearch/pkg-plist b/x11-wm/e17-module-everything-websearch/pkg-plist
index 6719953..9e9c6272 100644
--- a/x11-wm/e17-module-everything-websearch/pkg-plist
+++ b/x11-wm/e17-module-everything-websearch/pkg-plist
@@ -1,6 +1,7 @@
 lib/enlightenment/modules/evry-websearch/module.desktop
 lib/enlightenment/modules/evry-websearch/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/evry-websearch/e-module.edj
+%%NLS%%lib/enlightenment/modules/evry-websearch/locale/ar/LC_MESSAGES/evry-websearch.mo
 %%NLS%%lib/enlightenment/modules/evry-websearch/locale/fr/LC_MESSAGES/evry-websearch.mo
 %%NLS%%lib/enlightenment/modules/evry-websearch/locale/it/LC_MESSAGES/evry-websearch.mo
 %%NLS%%lib/enlightenment/modules/evry-websearch/locale/el/LC_MESSAGES/evry-websearch.mo
@@ -28,6 +29,8 @@ lib/enlightenment/modules/evry-websearch/e-module.edj
 %%NLS%%@dirrm lib/enlightenment/modules/evry-websearch/locale/it
 %%NLS%%@dirrm lib/enlightenment/modules/evry-websearch/locale/fr/LC_MESSAGES
 %%NLS%%@dirrm lib/enlightenment/modules/evry-websearch/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/evry-websearch/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/evry-websearch/locale/ar
 %%NLS%%@dirrm lib/enlightenment/modules/evry-websearch/locale
 @dirrm lib/enlightenment/modules/evry-websearch/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/evry-websearch
diff --git a/x11-wm/e17-module-exebuf/Makefile b/x11-wm/e17-module-exebuf/Makefile
index bacbd74..b109925 100644
--- a/x11-wm/e17-module-exebuf/Makefile
+++ b/x11-wm/e17-module-exebuf/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	exebuf
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,21 +14,12 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
 
 CONFIGURE_ARGS=	--disable-nls    # without this exebuf don't build
 
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11-wm/e17-module-exebuf/distinfo b/x11-wm/e17-module-exebuf/distinfo
index a7c7956..95740e0 100644
--- a/x11-wm/e17-module-exebuf/distinfo
+++ b/x11-wm/e17-module-exebuf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/exebuf-20111128.tar.bz2) = d521a78d974ebe4929070dfd31d5ed995c7eef04e0b7ca5cd77f6e19f579764f
-SIZE (e17/exebuf-20111128.tar.bz2) = 535634
+SHA256 (e17/exebuf-20120918.tar.bz2) = c4ccc31772c3b4ca673b53ea4e8f2a6c64e293c8d24d73f4d0d36831e0bf96a9
+SIZE (e17/exebuf-20120918.tar.bz2) = 568902
diff --git a/x11-wm/e17-module-execwatch/Makefile b/x11-wm/e17-module-execwatch/Makefile
index d28080f..64d33f1 100644
--- a/x11-wm/e17-module-execwatch/Makefile
+++ b/x11-wm/e17-module-execwatch/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	execwatch
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,19 +14,10 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+USE_GNOME=	pkgconfig
 
 .include <bsd.port.mk>
diff --git a/x11-wm/e17-module-execwatch/distinfo b/x11-wm/e17-module-execwatch/distinfo
index 795dd53..47c296a 100644
--- a/x11-wm/e17-module-execwatch/distinfo
+++ b/x11-wm/e17-module-execwatch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/execwatch-20111128.tar.bz2) = efb9abaf925ae7881b4a2cc28117bb3e5e156fa9194ebd089169f203a6961c23
-SIZE (e17/execwatch-20111128.tar.bz2) = 449842
+SHA256 (e17/execwatch-20120918.tar.bz2) = 3c93576273293057e226de0081dbb240b82dde7ef0663517bf9d9016142fb3fe
+SIZE (e17/execwatch-20120918.tar.bz2) = 471045
diff --git a/x11-wm/e17-module-flame/Makefile b/x11-wm/e17-module-flame/Makefile
index 67461a9..5114ab8 100644
--- a/x11-wm/e17-module-flame/Makefile
+++ b/x11-wm/e17-module-flame/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	flame
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,17 +14,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-flame/distinfo b/x11-wm/e17-module-flame/distinfo
index 9dd70f1..37a8353 100644
--- a/x11-wm/e17-module-flame/distinfo
+++ b/x11-wm/e17-module-flame/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/flame-20111128.tar.bz2) = b7f007f6c9ccab0620474e0d28649b0f6f6ff2a76c140a6190d9776dc459765f
-SIZE (e17/flame-20111128.tar.bz2) = 532817
+SHA256 (e17/flame-20120918.tar.bz2) = 688230458ea86c122c91965b6da5f1dd0358df61174d6812c3e365e0ef52e292
+SIZE (e17/flame-20120918.tar.bz2) = 540439
diff --git a/x11-wm/e17-module-forecasts/Makefile b/x11-wm/e17-module-forecasts/Makefile
index b92c7b6..5f87f2f 100644
--- a/x11-wm/e17-module-forecasts/Makefile
+++ b/x11-wm/e17-module-forecasts/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	forecasts
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,18 +14,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-forecasts/distinfo b/x11-wm/e17-module-forecasts/distinfo
index 5f0a099..8c6311c 100644
--- a/x11-wm/e17-module-forecasts/distinfo
+++ b/x11-wm/e17-module-forecasts/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/forecasts-20111128.tar.bz2) = 59a75c442820bdc2d35fab4e2b0d23c42eaf2ed549571225c1f60bd45e05f18a
-SIZE (e17/forecasts-20111128.tar.bz2) = 1078578
+SHA256 (e17/forecasts-20120918.tar.bz2) = 4cbe5e625bc51c44292a797ad7f0997647055dc0646821cbc088aac7ea99d935
+SIZE (e17/forecasts-20120918.tar.bz2) = 1087721
diff --git a/x11-wm/e17-module-iiirk/Makefile b/x11-wm/e17-module-iiirk/Makefile
index 13cf43e..1b5fc9b 100644
--- a/x11-wm/e17-module-iiirk/Makefile
+++ b/x11-wm/e17-module-iiirk/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	iiirk
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,18 +14,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-iiirk/distinfo b/x11-wm/e17-module-iiirk/distinfo
index 042df3d..a95e719 100644
--- a/x11-wm/e17-module-iiirk/distinfo
+++ b/x11-wm/e17-module-iiirk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/iiirk-20111128.tar.bz2) = aa953764b72111f89960d88d182a0a2b7396bbf05e29ae83848015c157870b58
-SIZE (e17/iiirk-20111128.tar.bz2) = 544745
+SHA256 (e17/iiirk-20120918.tar.bz2) = 4574ed2f12631865885b472ef0cc165bf7dbd9fd07b2395744c23a581bba7ffd
+SIZE (e17/iiirk-20120918.tar.bz2) = 555246
diff --git a/x11-wm/e17-module-itask/Makefile b/x11-wm/e17-module-itask/Makefile
index 628ccabd..770d0bd 100644
--- a/x11-wm/e17-module-itask/Makefile
+++ b/x11-wm/e17-module-itask/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	itask
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,19 +14,10 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+USE_GNOME=	pkgconfig
 
 .include <bsd.port.mk>
diff --git a/x11-wm/e17-module-itask/distinfo b/x11-wm/e17-module-itask/distinfo
index e23f819..62fd1c3 100644
--- a/x11-wm/e17-module-itask/distinfo
+++ b/x11-wm/e17-module-itask/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/itask-20111128.tar.bz2) = cf5f2a42f17b2fecd7173d66dc11a0dfd181fa104df7e706d1e489f77afeee5f
-SIZE (e17/itask-20111128.tar.bz2) = 545667
+SHA256 (e17/itask-20120918.tar.bz2) = 4565dfa2315d74793573264b2e8bd404d0bad2b1aaf76542940ab8149a2a62d3
+SIZE (e17/itask-20120918.tar.bz2) = 552333
diff --git a/x11-wm/e17-module-language/Makefile b/x11-wm/e17-module-language/Makefile
index 5120eed..b29c222 100644
--- a/x11-wm/e17-module-language/Makefile
+++ b/x11-wm/e17-module-language/Makefile
@@ -13,20 +13,25 @@ COMMENT=	An e17 XKB language/layout control module
 BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
+DEPRECATED=	Deprecated upstream
+EXPIRATION_DATE=2013-01-31
+
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_EFL=	edje libtool_hack modarch_hack
 USE_GNOME=	pkgconfig
 USE_XORG=	xkbfile
-USE_EFL=	edje libtool_hack modarch_hack
 
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-mail/Makefile b/x11-wm/e17-module-mail/Makefile
index 77a63b2..b66919a 100644
--- a/x11-wm/e17-module-mail/Makefile
+++ b/x11-wm/e17-module-mail/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mail
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -10,22 +10,26 @@ PKGNAMEPREFIX=	e17-module-
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	An e17 module to check your mailboxes (like xbiff does)
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-mail/distinfo b/x11-wm/e17-module-mail/distinfo
index d0e999c..b02eac8 100644
--- a/x11-wm/e17-module-mail/distinfo
+++ b/x11-wm/e17-module-mail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/mail-20111128.tar.bz2) = 8b60d5be5903d4fd762939c5e81d2a8c1bfa63a38ad9f0dee84c1bea682701ce
-SIZE (e17/mail-20111128.tar.bz2) = 569458
+SHA256 (e17/mail-20120918.tar.bz2) = 36f16d5d444ec21ef1571d9ba398c43006ac0836851275851b497c9979971230
+SIZE (e17/mail-20120918.tar.bz2) = 568129
diff --git a/x11-wm/e17-module-mem/Makefile b/x11-wm/e17-module-mem/Makefile
index 5ea24d3..e4b0ba7 100644
--- a/x11-wm/e17-module-mem/Makefile
+++ b/x11-wm/e17-module-mem/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mem
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 PORTEPOCH=	1
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
@@ -15,17 +15,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-mem/distinfo b/x11-wm/e17-module-mem/distinfo
index f93b7b0..7045fc0 100644
--- a/x11-wm/e17-module-mem/distinfo
+++ b/x11-wm/e17-module-mem/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/mem-20111128.tar.bz2) = 840b7a203dfd9ad05e9fd5cde6fd41d95d6f2b91cc22e214b58ba8398a2b686d
-SIZE (e17/mem-20111128.tar.bz2) = 551004
+SHA256 (e17/mem-20120918.tar.bz2) = 829f80eed125d2acf6a099a61ffdec4143fe004be442cc8ac364aab571090823
+SIZE (e17/mem-20120918.tar.bz2) = 573164
diff --git a/x11-wm/e17-module-mem/files/patch-src-e_mod_main.c b/x11-wm/e17-module-mem/files/patch-src-e_mod_main.c
new file mode 100644
index 0000000..277054f
--- /dev/null
+++ b/x11-wm/e17-module-mem/files/patch-src-e_mod_main.c
@@ -0,0 +1,17 @@
+diff -ur src.old/e_mod_main.c src/e_mod_main.c
+--- src.old/e_mod_main.c	2010-11-13 17:56:21.000000000 +0200
++++ src/e_mod_main.c	2012-02-21 23:43:46.548797357 +0200
+@@ -424,11 +424,9 @@
+ 
+    if (!inst->ci->show_percent)
+      {
+-	snprintf (real_str, sizeof (real_str), "Real: %d/%d MB", (real / 1024),
+-		  (total_real / 1024));
++	snprintf (real_str, sizeof (real_str), "Real: %d/%d MB", real, total_real);
+ 	if ( total_swap )
+-	  snprintf (swap_str, sizeof (swap_str), "Swap: %d/%d MB", (swap / 1024),
+-		    (total_swap / 1024));
++	  snprintf (swap_str, sizeof (swap_str), "Swap: %d/%d MB", swap, total_swap);
+      }
+    else
+      {
diff --git a/x11-wm/e17-module-mem/files/patch-src-machdep_freebsd.c b/x11-wm/e17-module-mem/files/patch-src-machdep_freebsd.c
new file mode 100644
index 0000000..5b14b15
--- /dev/null
+++ b/x11-wm/e17-module-mem/files/patch-src-machdep_freebsd.c
@@ -0,0 +1,51 @@
+diff -ur src.old/machdep_freebsd.c src/machdep_freebsd.c
+--- src.old/machdep_freebsd.c	2010-11-13 17:56:21.000000000 +0200
++++ src/machdep_freebsd.c	2012-02-21 23:18:00.000000000 +0200
+@@ -12,6 +12,8 @@
+ 
+ #define GETSYSCTL(name, var)    getsysctl(name, &(var), sizeof (var))
+ 
++#define PAGES_PER_MEG ((1024 * 1024) / getpagesize())
++
+ static int
+ getsysctl (char *name, void *ptr, size_t len)
+ {
+@@ -32,7 +34,6 @@
+ static int
+ swapinfo (int *total, int *used)
+ {
+-  int pagesize = getpagesize ();
+   size_t mibsize, size;
+   struct xswdev xsw;
+   int mib[16], n;
+@@ -61,8 +62,8 @@
+ 	  return 1;
+ 	}
+ 
+-      tmp_total = (long long) xsw.xsw_nblks * pagesize;
+-      tmp_used = (long long) xsw.xsw_used * pagesize;
++      tmp_total = xsw.xsw_nblks / PAGES_PER_MEG;
++      tmp_used = xsw.xsw_used / PAGES_PER_MEG;
+       *total += tmp_total;
+       *used += tmp_used;
+     }
+@@ -82,8 +83,6 @@
+ {
+   int total_pages, inactive_pages, free_pages;
+ 
+-  int pagesize = getpagesize ();
+-
+   if (GETSYSCTL ("vm.stats.vm.v_page_count", total_pages))
+     {
+       warnx ("can't read sysctl \"vm.stats.vm.v_page_count\"");
+@@ -102,8 +101,8 @@
+       return;
+     }
+ 
+-  *phys_total = (total_pages * pagesize) >> 10;
+-  *phys_used = ((total_pages - free_pages - inactive_pages) * pagesize) >> 10;
++  *phys_total = total_pages / PAGES_PER_MEG;
++  *phys_used = (total_pages - free_pages - inactive_pages) / PAGES_PER_MEG;
+ 
+   if ((swapinfo (sw_total, sw_used)) != 0)
+     {
diff --git a/x11-wm/e17-module-moon/Makefile b/x11-wm/e17-module-moon/Makefile
index 256d2a8..e519c5b 100644
--- a/x11-wm/e17-module-moon/Makefile
+++ b/x11-wm/e17-module-moon/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	moon
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 PORTEPOCH=	1
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
@@ -15,17 +15,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-moon/distinfo b/x11-wm/e17-module-moon/distinfo
index 9fcbc3a..6d6d46f 100644
--- a/x11-wm/e17-module-moon/distinfo
+++ b/x11-wm/e17-module-moon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/moon-20111128.tar.bz2) = f9e58752fc8e8c2513a395515675e0d5451476cc0f25e5cc8c343b815989e202
-SIZE (e17/moon-20111128.tar.bz2) = 904637
+SHA256 (e17/moon-20120918.tar.bz2) = 0950716ea2077dcb96b9a635e9b8ad77db46026cdc4f470d0e03e4fb36875019
+SIZE (e17/moon-20120918.tar.bz2) = 947418
diff --git a/x11-wm/e17-module-mpdule/Makefile b/x11-wm/e17-module-mpdule/Makefile
index 61ca811..ec51c6c 100644
--- a/x11-wm/e17-module-mpdule/Makefile
+++ b/x11-wm/e17-module-mpdule/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mpdule
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -10,23 +10,25 @@ PKGNAMEPREFIX=	e17-module-
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	An MPD module for e17
 
-LIB_DEPENDS=	mpd.4:${PORTSDIR}/audio/libmpd
+LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd
 BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-mpdule/distinfo b/x11-wm/e17-module-mpdule/distinfo
index 2dc93b2..7092baf 100644
--- a/x11-wm/e17-module-mpdule/distinfo
+++ b/x11-wm/e17-module-mpdule/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/mpdule-20111128.tar.bz2) = 7964133f8f3ea76557a9651217738c2cf4563978fca407c7e887ed700c77fd39
-SIZE (e17/mpdule-20111128.tar.bz2) = 454386
+SHA256 (e17/mpdule-20120918.tar.bz2) = a1b3ac5eff23201b42f216d1bb212792884c29757dd8e97110535ac6dc5c511f
+SIZE (e17/mpdule-20120918.tar.bz2) = 463407
diff --git a/x11-wm/e17-module-net/Makefile b/x11-wm/e17-module-net/Makefile
index bbedd1d..9b51395 100644
--- a/x11-wm/e17-module-net/Makefile
+++ b/x11-wm/e17-module-net/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	net
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,18 +14,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-net/distinfo b/x11-wm/e17-module-net/distinfo
index 55aff34..70796eb 100644
--- a/x11-wm/e17-module-net/distinfo
+++ b/x11-wm/e17-module-net/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/net-20111128.tar.bz2) = 30c47ce49ae954113a1c99ccad4c7623af81bb361493b44b4a6f9c79cfe22d67
-SIZE (e17/net-20111128.tar.bz2) = 537534
+SHA256 (e17/net-20120918.tar.bz2) = 6efbaca82c26a6589590f23a630fc9accbd8dca03175524be74abc1423938623
+SIZE (e17/net-20120918.tar.bz2) = 551986
diff --git a/x11-wm/e17-module-news/Makefile b/x11-wm/e17-module-news/Makefile
index 4da5f18..a2f7f09f 100644
--- a/x11-wm/e17-module-news/Makefile
+++ b/x11-wm/e17-module-news/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	news
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -10,22 +10,26 @@ PKGNAMEPREFIX=	e17-module-
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A module to display information feeds like Rss
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-news/distinfo b/x11-wm/e17-module-news/distinfo
index 1098ffd..e22c5bb 100644
--- a/x11-wm/e17-module-news/distinfo
+++ b/x11-wm/e17-module-news/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/news-20111128.tar.bz2) = 730818b38d67fa91c94be3079d7cff966107dbe402c88b2ecce663d9886edeb5
-SIZE (e17/news-20111128.tar.bz2) = 1044776
+SHA256 (e17/news-20120918.tar.bz2) = cc43d682ce14cd0ecb4d5e34ed3544d5790292684f48a1e5d21d5abcb0915db3
+SIZE (e17/news-20120918.tar.bz2) = 1009846
diff --git a/x11-wm/e17-module-penguins/Makefile b/x11-wm/e17-module-penguins/Makefile
index 166dd65..2caa3ad 100644
--- a/x11-wm/e17-module-penguins/Makefile
+++ b/x11-wm/e17-module-penguins/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	penguins
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,18 +14,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-penguins/distinfo b/x11-wm/e17-module-penguins/distinfo
index 2ce2aa4..983d2bb 100644
--- a/x11-wm/e17-module-penguins/distinfo
+++ b/x11-wm/e17-module-penguins/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/penguins-20111128.tar.bz2) = dc4acf9954a1033077af37bdf93d5f26b23cb46c9f50e94d9184c507116f031b
-SIZE (e17/penguins-20111128.tar.bz2) = 746405
+SHA256 (e17/penguins-20120918.tar.bz2) = 13467c44c17db72848e44357daba1867331ee9e561ea07c2ebc0c9dcf49469f9
+SIZE (e17/penguins-20120918.tar.bz2) = 783212
diff --git a/x11-wm/e17-module-photo/Makefile b/x11-wm/e17-module-photo/Makefile
index 02207de..dc74b25 100644
--- a/x11-wm/e17-module-photo/Makefile
+++ b/x11-wm/e17-module-photo/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	photo
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -10,22 +10,26 @@ PKGNAMEPREFIX=	e17-module-
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	An e17 photo slideshow module
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-photo/distinfo b/x11-wm/e17-module-photo/distinfo
index 7084fb9..752e961 100644
--- a/x11-wm/e17-module-photo/distinfo
+++ b/x11-wm/e17-module-photo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/photo-20111128.tar.bz2) = e6df2594366a7abcbd8bad91debf8fde9aec863e9ead9f956ef042945a799361
-SIZE (e17/photo-20111128.tar.bz2) = 685048
+SHA256 (e17/photo-20120918.tar.bz2) = e7724095068f76e2101150c126396c7f4c5627f539b4493eae80815d41680f6b
+SIZE (e17/photo-20120918.tar.bz2) = 704309
diff --git a/x11-wm/e17-module-places/Makefile b/x11-wm/e17-module-places/Makefile
index aa49762..c85a80f 100644
--- a/x11-wm/e17-module-places/Makefile
+++ b/x11-wm/e17-module-places/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	places
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,18 +14,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-places/distinfo b/x11-wm/e17-module-places/distinfo
index 84d7eee..5f603d1 100644
--- a/x11-wm/e17-module-places/distinfo
+++ b/x11-wm/e17-module-places/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/places-20111128.tar.bz2) = dedc39cc9e769c087b25935a01b8cffdf845c478c81bade04b00f1978f89ab95
-SIZE (e17/places-20111128.tar.bz2) = 568787
+SHA256 (e17/places-20120918.tar.bz2) = aaab943c54c48f0f4b6dceff26dadb4c0332af6ee05e9b041e9426f890845c0f
+SIZE (e17/places-20120918.tar.bz2) = 579765
diff --git a/x11-wm/e17-module-quickaccess/Makefile b/x11-wm/e17-module-quickaccess/Makefile
index 61522ea3..923aefe 100644
--- a/x11-wm/e17-module-quickaccess/Makefile
+++ b/x11-wm/e17-module-quickaccess/Makefile
@@ -13,20 +13,14 @@ COMMENT=	An e17 module to provide quick access to applications
 BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
+DEPRECATED=	Merged into x11-wm/enlightenment
+EXPIRATION_DATE=2013-01-31
+
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+USE_GNOME=	pkgconfig
 
 .include <bsd.port.mk>
diff --git a/x11-wm/e17-module-rain/Makefile b/x11-wm/e17-module-rain/Makefile
index 74ee654..849c28b 100644
--- a/x11-wm/e17-module-rain/Makefile
+++ b/x11-wm/e17-module-rain/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rain
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,17 +14,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-rain/distinfo b/x11-wm/e17-module-rain/distinfo
index 98e13dd..8cb6afd 100644
--- a/x11-wm/e17-module-rain/distinfo
+++ b/x11-wm/e17-module-rain/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/rain-20111128.tar.bz2) = 290c556e9780795ddb70c74d81c3eee9c7cec6e58ae270ba3f3d37d28be2384b
-SIZE (e17/rain-20111128.tar.bz2) = 601389
+SHA256 (e17/rain-20120918.tar.bz2) = 1e502ad9cb57a41678ab981835673b6c1bb968878600acb91bb75d756b098a36
+SIZE (e17/rain-20120918.tar.bz2) = 600650
diff --git a/x11-wm/e17-module-rmb/Makefile b/x11-wm/e17-module-rmb/Makefile
new file mode 100644
index 0000000..7c418cb
--- /dev/null
+++ b/x11-wm/e17-module-rmb/Makefile
@@ -0,0 +1,22 @@
+# Created by: Grzegorz Blach <gblach@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	rmb
+PORTVERSION=	20120918
+CATEGORIES=	x11-wm enlightenment
+MASTER_SITES=	http://files.roorback.net/e17/modules/
+PKGNAMEPREFIX=	e17-module-
+
+MAINTAINER=	gblach@FreeBSD.org
+COMMENT=	An e17 module to emulate right mouse button
+
+BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR=	e17
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_EFL=	libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-rmb/distinfo b/x11-wm/e17-module-rmb/distinfo
new file mode 100644
index 0000000..44a7291
--- /dev/null
+++ b/x11-wm/e17-module-rmb/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/rmb-20120918.tar.bz2) = 7e4faa0a60e576c7bad2074eb1ec541a85a9a632da144a064369ade0ee7283da
+SIZE (e17/rmb-20120918.tar.bz2) = 578880
diff --git a/x11-wm/e17-module-rmb/pkg-descr b/x11-wm/e17-module-rmb/pkg-descr
new file mode 100644
index 0000000..76521a6
--- /dev/null
+++ b/x11-wm/e17-module-rmb/pkg-descr
@@ -0,0 +1,3 @@
+An e17 module to emulate right mouse button.
+
+WWW:	http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-rmb/pkg-plist b/x11-wm/e17-module-rmb/pkg-plist
new file mode 100644
index 0000000..0755603
--- /dev/null
+++ b/x11-wm/e17-module-rmb/pkg-plist
@@ -0,0 +1,7 @@
+lib/enlightenment/modules/rmb/module.desktop
+lib/enlightenment/modules/rmb/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/rmb/right.png
+@dirrm lib/enlightenment/modules/rmb/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/rmb
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-screenshot/Makefile b/x11-wm/e17-module-screenshot/Makefile
index bfc56ea..b19a0e8 100644
--- a/x11-wm/e17-module-screenshot/Makefile
+++ b/x11-wm/e17-module-screenshot/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	screenshot
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -16,17 +16,20 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment \
 		emprint:${PORTSDIR}/x11/emprint
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-screenshot/distinfo b/x11-wm/e17-module-screenshot/distinfo
index 7a4da1b..51e1b9e 100644
--- a/x11-wm/e17-module-screenshot/distinfo
+++ b/x11-wm/e17-module-screenshot/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/screenshot-20111128.tar.bz2) = a5570898aad3ce7163a33128a1093e5fc9c6f1430a752124ab1a9b2ae34d36ef
-SIZE (e17/screenshot-20111128.tar.bz2) = 559492
+SHA256 (e17/screenshot-20120918.tar.bz2) = 782aebaf425f06dc5716fe9973e7131e6f6194413e4f509353e890c35148e289
+SIZE (e17/screenshot-20120918.tar.bz2) = 565808
diff --git a/x11-wm/e17-module-screenshot/pkg-plist b/x11-wm/e17-module-screenshot/pkg-plist
index 29ef2a0..e54089f 100644
--- a/x11-wm/e17-module-screenshot/pkg-plist
+++ b/x11-wm/e17-module-screenshot/pkg-plist
@@ -1,6 +1,7 @@
 lib/enlightenment/modules/screenshot/module.desktop
 lib/enlightenment/modules/screenshot/e-module-screenshot.edj
 lib/enlightenment/modules/screenshot/%%E17_ARCH%%/module.so
+%%NLS%%lib/enlightenment/modules/screenshot/locale/ar/LC_MESSAGES/screenshot.mo
 %%NLS%%lib/enlightenment/modules/screenshot/locale/fr/LC_MESSAGES/screenshot.mo
 %%NLS%%lib/enlightenment/modules/screenshot/locale/cs/LC_MESSAGES/screenshot.mo
 %%NLS%%lib/enlightenment/modules/screenshot/locale/lt/LC_MESSAGES/screenshot.mo
@@ -46,6 +47,8 @@ lib/enlightenment/modules/screenshot/%%E17_ARCH%%/module.so
 %%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/cs
 %%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/fr/LC_MESSAGES
 %%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/ar
 %%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale
 @dirrm lib/enlightenment/modules/screenshot/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/screenshot
diff --git a/x11-wm/e17-module-slideshow/Makefile b/x11-wm/e17-module-slideshow/Makefile
index b7a9132..24c54cf 100644
--- a/x11-wm/e17-module-slideshow/Makefile
+++ b/x11-wm/e17-module-slideshow/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	slideshow
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,17 +14,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-slideshow/distinfo b/x11-wm/e17-module-slideshow/distinfo
index 3236785..a3986c4 100644
--- a/x11-wm/e17-module-slideshow/distinfo
+++ b/x11-wm/e17-module-slideshow/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/slideshow-20111128.tar.bz2) = 551861f6715ae11980b90f14bff3fdc12d68f6cfecf3e60ac257694503599163
-SIZE (e17/slideshow-20111128.tar.bz2) = 512457
+SHA256 (e17/slideshow-20120918.tar.bz2) = aeaff404204d89f25c0e39bc434080feb8ebc50b058131ab410996486d5ba7c5
+SIZE (e17/slideshow-20120918.tar.bz2) = 530751
diff --git a/x11-wm/e17-module-snow/Makefile b/x11-wm/e17-module-snow/Makefile
index e92d375..00186c0 100644
--- a/x11-wm/e17-module-snow/Makefile
+++ b/x11-wm/e17-module-snow/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	snow
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,17 +14,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-snow/distinfo b/x11-wm/e17-module-snow/distinfo
index a71360c..043c887 100644
--- a/x11-wm/e17-module-snow/distinfo
+++ b/x11-wm/e17-module-snow/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/snow-20111128.tar.bz2) = a3243093922a22b7f6850af8b635eec6363d9a4c9633b54f590b1619cbf838c7
-SIZE (e17/snow-20111128.tar.bz2) = 511727
+SHA256 (e17/snow-20120918.tar.bz2) = e6cba5d6059a812d58969b92e715f716183fbab97f159a29c90741a884a2b620
+SIZE (e17/snow-20120918.tar.bz2) = 530448
diff --git a/x11-wm/e17-module-taskbar/Makefile b/x11-wm/e17-module-taskbar/Makefile
index 1c198e2..56ebedb 100644
--- a/x11-wm/e17-module-taskbar/Makefile
+++ b/x11-wm/e17-module-taskbar/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	taskbar
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -10,22 +10,26 @@ PKGNAMEPREFIX=	e17-module-
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	A classic taskbar module for e17
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-taskbar/distinfo b/x11-wm/e17-module-taskbar/distinfo
index 4202c93..7217a7d 100644
--- a/x11-wm/e17-module-taskbar/distinfo
+++ b/x11-wm/e17-module-taskbar/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/taskbar-20111128.tar.bz2) = e1b2aa1ce2c91164dca54575e3f3b051c91f77a04721aeb1d61c7de0f7265d3f
-SIZE (e17/taskbar-20111128.tar.bz2) = 544891
+SHA256 (e17/taskbar-20120918.tar.bz2) = 580f3ccc3ea9352826d3c8c3d78bc31e9f6e5864d1c99aea1e47a9c77bd4fd8e
+SIZE (e17/taskbar-20120918.tar.bz2) = 548975
diff --git a/x11-wm/e17-module-tclock/Makefile b/x11-wm/e17-module-tclock/Makefile
index 2e797d3..de8d6d4 100644
--- a/x11-wm/e17-module-tclock/Makefile
+++ b/x11-wm/e17-module-tclock/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tclock
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,18 +14,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-tclock/distinfo b/x11-wm/e17-module-tclock/distinfo
index 30f6609..5f8c4f3 100644
--- a/x11-wm/e17-module-tclock/distinfo
+++ b/x11-wm/e17-module-tclock/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/tclock-20111128.tar.bz2) = 15bff18aeac6034a3ddf963255c5f3f5f02bca747a1f64b9b480e466dd3d95a2
-SIZE (e17/tclock-20111128.tar.bz2) = 531351
+SHA256 (e17/tclock-20120918.tar.bz2) = 92de0c6a28e0c386eab79c01799e1679a5d6d917975a87bb276558e4da46dc97
+SIZE (e17/tclock-20120918.tar.bz2) = 541960
diff --git a/x11-wm/e17-module-tiling/Makefile b/x11-wm/e17-module-tiling/Makefile
index 8f14ac2..277c744 100644
--- a/x11-wm/e17-module-tiling/Makefile
+++ b/x11-wm/e17-module-tiling/Makefile
@@ -13,19 +13,24 @@ COMMENT=	A tiling-like windows control module for e17
 BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
+DEPRECATED=	Merged into x11-wm/enlightenment
+EXPIRATION_DATE=2013-01-31
+
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-uptime/Makefile b/x11-wm/e17-module-uptime/Makefile
index 7317487..d9f6e7a 100644
--- a/x11-wm/e17-module-uptime/Makefile
+++ b/x11-wm/e17-module-uptime/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	uptime
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,20 +14,21 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-uptime/distinfo b/x11-wm/e17-module-uptime/distinfo
index 9fa0026..b4893e6 100644
--- a/x11-wm/e17-module-uptime/distinfo
+++ b/x11-wm/e17-module-uptime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/uptime-20111128.tar.bz2) = 57c6df4756483ebc98a6fe92d7835489a5d44bb26999ba09d5978f5c8d1e2845
-SIZE (e17/uptime-20111128.tar.bz2) = 522099
+SHA256 (e17/uptime-20120918.tar.bz2) = 5df9fe7e2614a7b906e134505bf2100e38341cda8f85d01fbf02b48a17148fd1
+SIZE (e17/uptime-20120918.tar.bz2) = 528995
diff --git a/x11-wm/e17-module-weather/Makefile b/x11-wm/e17-module-weather/Makefile
index 7cf993f..f46708c 100644
--- a/x11-wm/e17-module-weather/Makefile
+++ b/x11-wm/e17-module-weather/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	weather
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 PORTEPOCH=	1
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
@@ -15,17 +15,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-weather/distinfo b/x11-wm/e17-module-weather/distinfo
index a27fd70..61512c5 100644
--- a/x11-wm/e17-module-weather/distinfo
+++ b/x11-wm/e17-module-weather/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/weather-20111128.tar.bz2) = 651212c13ca584b0da750a45f337ac0018535bfac6697fbdfac8cc8d5204c0fe
-SIZE (e17/weather-20111128.tar.bz2) = 1182627
+SHA256 (e17/weather-20120918.tar.bz2) = 5c7911953aae64b8b5fff2b31e22dadb761be4954df4231e1187c6af3bdb75e4
+SIZE (e17/weather-20120918.tar.bz2) = 1154074
diff --git a/x11-wm/e17-module-winlist-ng/Makefile b/x11-wm/e17-module-winlist-ng/Makefile
index 5d90b47..84e9ad8 100644
--- a/x11-wm/e17-module-winlist-ng/Makefile
+++ b/x11-wm/e17-module-winlist-ng/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	winlist-ng
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,18 +14,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-winlist-ng/distinfo b/x11-wm/e17-module-winlist-ng/distinfo
index d987942..7ddaa8a 100644
--- a/x11-wm/e17-module-winlist-ng/distinfo
+++ b/x11-wm/e17-module-winlist-ng/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/winlist-ng-20111128.tar.bz2) = e0117f1c9a522e43e0fcb99447f1769282ef314088d276e239c28fb3ee97dc09
-SIZE (e17/winlist-ng-20111128.tar.bz2) = 586299
+SHA256 (e17/winlist-ng-20120918.tar.bz2) = 2e475bdffada0a0c03a886a78f9ebd980eaa169aafea9ab48bd47441829784ff
+SIZE (e17/winlist-ng-20120918.tar.bz2) = 574833
diff --git a/x11-wm/e17-module-winlist-ng/pkg-plist b/x11-wm/e17-module-winlist-ng/pkg-plist
index 39b3bbb..6e95edd 100644
--- a/x11-wm/e17-module-winlist-ng/pkg-plist
+++ b/x11-wm/e17-module-winlist-ng/pkg-plist
@@ -4,6 +4,19 @@ lib/enlightenment/modules/winlist-ng/module.desktop
 lib/enlightenment/modules/winlist-ng/ng.edj
 lib/enlightenment/modules/winlist-ng/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/winlist-ng/e-module-ng.edj
+%%NLS%%lib/enlightenment/modules/winlist-ng/locale/ar/LC_MESSAGES/winlist-ng.mo
+%%NLS%%lib/enlightenment/modules/winlist-ng/locale/de/LC_MESSAGES/winlist-ng.mo
+%%NLS%%lib/enlightenment/modules/winlist-ng/locale/it/LC_MESSAGES/winlist-ng.mo
+%%NLS%%lib/enlightenment/modules/winlist-ng/locale/pt/LC_MESSAGES/winlist-ng.mo
+%%NLS%%@dirrm lib/enlightenment/modules/winlist-ng/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/winlist-ng/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/winlist-ng/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/winlist-ng/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/winlist-ng/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/winlist-ng/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/winlist-ng/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/winlist-ng/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/winlist-ng/locale
 @dirrm lib/enlightenment/modules/winlist-ng/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/winlist-ng/
 @dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-winselector/Makefile b/x11-wm/e17-module-winselector/Makefile
index a05fd15..33078d1 100644
--- a/x11-wm/e17-module-winselector/Makefile
+++ b/x11-wm/e17-module-winselector/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	winselector
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,18 +14,10 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+USE_GNOME=	pkgconfig
 
 .include <bsd.port.mk>
diff --git a/x11-wm/e17-module-winselector/distinfo b/x11-wm/e17-module-winselector/distinfo
index 9ca3ffe..0cb11d0 100644
--- a/x11-wm/e17-module-winselector/distinfo
+++ b/x11-wm/e17-module-winselector/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/winselector-20111128.tar.bz2) = e325c3c77440f348d37bc4944125e339f954d99582dd304ec146f876bbf8bb77
-SIZE (e17/winselector-20111128.tar.bz2) = 404540
+SHA256 (e17/winselector-20120918.tar.bz2) = 4597158d7e31d25cadca5a2cc2dc231bc8539148bb4090abb345e9b4d3939844
+SIZE (e17/winselector-20120918.tar.bz2) = 414243
diff --git a/x11-wm/e17-module-wlan/Makefile b/x11-wm/e17-module-wlan/Makefile
index 94efb9a..e42bf96 100644
--- a/x11-wm/e17-module-wlan/Makefile
+++ b/x11-wm/e17-module-wlan/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wlan
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
 PKGNAMEPREFIX=	e17-module-
@@ -14,18 +14,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-wlan/distinfo b/x11-wm/e17-module-wlan/distinfo
index 0e7e22d..1671971 100644
--- a/x11-wm/e17-module-wlan/distinfo
+++ b/x11-wm/e17-module-wlan/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/wlan-20111128.tar.bz2) = 84dff4a371abbc55512f1c6699e3328d586961f3bd9d28e845df5a9fb29d8f63
-SIZE (e17/wlan-20111128.tar.bz2) = 566954
+SHA256 (e17/wlan-20120918.tar.bz2) = 9c15964256d7c3cba7e5a74fb74b9faa37065b4a3745d124e62b8688bcdbad7d
+SIZE (e17/wlan-20120918.tar.bz2) = 575959
diff --git a/x11-wm/e17-module-xkbswitch/Makefile b/x11-wm/e17-module-xkbswitch/Makefile
index fa7dcd0..b20416c 100644
--- a/x11-wm/e17-module-xkbswitch/Makefile
+++ b/x11-wm/e17-module-xkbswitch/Makefile
@@ -10,23 +10,28 @@ PKGNAMEPREFIX=	e17-module-
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	X keyboard switcher module for Enlightenment 0.17
 
-LIB_DEPENDS=	xkbfile.1:${PORTSDIR}/x11/libxkbfile
+LIB_DEPENDS=	xkbfile:${PORTSDIR}/x11/libxkbfile
 BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
+DEPRECATED=	Merged into x11-wm/enlightenment
+EXPIRATION_DATE=2013-01-31
+
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-modules/Makefile b/x11-wm/e17-modules/Makefile
index c591539..f0b3d35 100644
--- a/x11-wm/e17-modules/Makefile
+++ b/x11-wm/e17-modules/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	e17-modules
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	# Empty
 DISTFILES=	# Empty
@@ -14,12 +14,12 @@ NO_BUILD=	yes
 WANT_EFL=	yes
 E17_ARCH=	freebsd${OSREL}-${ARCH}
 
-MODULES=	alarm calendar comp-scale cpu deskshow diskio drawer e-tiling elfe empris engage eooorg \
+MODULES=	alarm comp-scale cpu deskshow diskio eektool elfe empris engage eooorg \
 		everything-aspell everything-mpris everything-pidgin everything-places \
 		everything-shotgun everything-wallpaper everything-websearch exebuf execwatch \
-		flame forecasts iiirk itask language mail mem moon mpdule net news \
-		penguins photo places quickaccess rain screenshot slideshow snow \
-		taskbar tclock tiling uptime weather winlist-ng winselector wlan xkbswitch
+		flame forecasts iiirk itask mail mem moon mpdule net news \
+		penguins photo places rain rmb screenshot slideshow snow \
+		taskbar tclock uptime weather winlist-ng winselector wlan
 
 COMP_SCALE_PATH=	scale
 EVERYTHING_MPRIS_PATH=	evry-mpris
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 88d37b5..c9f4fa5 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -2,47 +2,64 @@
 # $FreeBSD$
 
 PORTNAME=	enlightenment
-PORTVERSION=	0.16.999.65643
+PORTVERSION=	0.17.0
 PORTEPOCH=	2
 CATEGORIES=	x11-wm 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=	A very artistic X window manager
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
+		xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms
 
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_EFL=	eina eet evas ecore edbus efreet edje libtool_hack librt_hack
+USE_GMAKE=	yes
+USE_EFL=	eina eet evas ecore eio edbus efreet edje \
+		libtool_hack librt_hack modarch_hack
 USE_EFL_EVAS_LOADERS=	eet jpeg png
 USE_EFL_EVAS_ENGINES=	buffer
 USE_EFL_ECORE=	ipc
 USE_GNOME=	gnomehack pkgconfig
 USE_ICONV=	yes
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--with-profile=MEDIUM_PC \
-		--disable-bluez
+		--disable-connman
+
+OPTIONS_DEFINE=	ILLUME
+ILLUME_DESC=	Enable illume module
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MILLUME}
+CONFIGURE_ARGS+=--enable-illume2
+PLIST_SUB+=	ILLUME=""
+.else
+CONFIGURE_ARGS+=--disable-illume2
+PLIST_SUB+=	ILLUME="@comment "
+.endif
+
+.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
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|linkexec_info|link_execinfo|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|\(setuid_root_mode = a=rx,u+x\)s|\1|g' ${WRKSRC}/src/bin/Makefile.in ${WRKSRC}/src/modules/cpufreq/Makefile.in
+	@${REINPLACE_CMD} -e 's|\-relname||' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|\(setuid_root_mode = a=rx,u+x\)s|\1|g' \
+		${WRKSRC}/src/bin/Makefile.in
+	@${REINPLACE_CMD} -e 's|@E_FM_LIBS@|@E_FM_LIBS@ -lehal -leukit|' \
+		${WRKSRC}/src/bin/e_fm/Makefile.in
 
 post-install:
 	@${ECHO_MSG} '********************************************************'
@@ -55,10 +72,8 @@ post-install:
 	@${ECHO_MSG} 'set suid bit if do not trust all users of this machine.'
 	@${ECHO_MSG} '********************************************************'
 
-.include <bsd.port.pre.mk>
-
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not install on sparc64: signal 10
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/enlightenment/distinfo b/x11-wm/enlightenment/distinfo
index a950a3a..0c86c9b 100644
--- a/x11-wm/enlightenment/distinfo
+++ b/x11-wm/enlightenment/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/enlightenment-0.16.999.65643.tar.bz2) = e1ec69ef24cd7e97f83ef7907e8eaddd801753b8d724bd006996b6d85f8cb2ed
-SIZE (e17/enlightenment-0.16.999.65643.tar.bz2) = 6262847
+SHA256 (e17/enlightenment-0.17.0.tar.bz2) = 0b1dbeb28b5c114816a7d2a3567b90ffe6eb9f49ab4939cad797ba59f35e525a
+SIZE (e17/enlightenment-0.17.0.tar.bz2) = 29213523
diff --git a/x11-wm/enlightenment/files/patch-data-etc-sysactions.conf.in b/x11-wm/enlightenment/files/patch-data-etc-sysactions.conf.in
new file mode 100644
index 0000000..01129d6
--- /dev/null
+++ b/x11-wm/enlightenment/files/patch-data-etc-sysactions.conf.in
@@ -0,0 +1,21 @@
+--- data/etc/sysactions.conf.in.orig	2012-11-08 12:37:45.000000000 +0100
++++ data/etc/sysactions.conf.in	2012-11-08 12:38:48.000000000 +0100
+@@ -43,13 +43,13 @@
+ # user and group name can use glob matches (* == all for example) like the
+ # shell. as can action names allowed or denied. 
+ 
+-action:   halt      /sbin/shutdown -h now
++action:   halt      /sbin/shutdown -p now
+ action:   reboot    /sbin/shutdown -r now
+-action:   suspend   @SUSPEND@
++action:   suspend   /usr/sbin/zzz
+ action:   hibernate @HIBERNATE@
+-action:   /bin/mount /bin/mount
+-action:   /bin/umount /bin/umount
+-action:   /usr/bin/eject /usr/bin/eject
++action:   /bin/mount /sbin/mount
++action:   /bin/umount /sbin/umount
++action:   /usr/bin/eject /usr/sbin/cdcontrol eject
+ action:   gdb       gdb
+ 
+ # on FreeBSD use this instead of the above.
diff --git a/x11-wm/enlightenment/pkg-plist b/x11-wm/enlightenment/pkg-plist
index 669fdeb..4267ea7 100644
--- a/x11-wm/enlightenment/pkg-plist
+++ b/x11-wm/enlightenment/pkg-plist
@@ -1,5 +1,7 @@
 bin/enlightenment
+bin/enlightenment_filemanager
 bin/enlightenment_imc
+bin/enlightenment_open
 bin/enlightenment_remote
 bin/enlightenment_start
 %%ETCDIR%%/sysactions.conf
@@ -33,7 +35,6 @@ include/enlightenment/e_dialog.h
 include/enlightenment/e_dnd.h
 include/enlightenment/e_dpms.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_env.h
@@ -57,6 +58,7 @@ include/enlightenment/e_font.h
 include/enlightenment/e_gadcon.h
 include/enlightenment/e_gadcon_popup.h
 include/enlightenment/e_grabinput.h
+include/enlightenment/e_grab_dialog.h
 include/enlightenment/e_hints.h
 include/enlightenment/e_icon.h
 include/enlightenment/e_ilist.h
@@ -73,10 +75,13 @@ include/enlightenment/e_int_shelf_config.h
 include/enlightenment/e_int_toolbar_config.h
 include/enlightenment/e_intl.h
 include/enlightenment/e_intl_data.h
+include/enlightenment/e_import_config_dialog.h
+include/enlightenment/e_import_dialog.h
 include/enlightenment/e_ipc.h
 include/enlightenment/e_ipc_codec.h
 include/enlightenment/e_layout.h
 include/enlightenment/e_livethumb.h
+include/enlightenment/e_log.h
 include/enlightenment/e_manager.h
 include/enlightenment/e_maximize.h
 include/enlightenment/e_menu.h
@@ -118,6 +123,7 @@ include/enlightenment/e_theme.h
 include/enlightenment/e_theme_about.h
 include/enlightenment/e_thumb.h
 include/enlightenment/e_toolbar.h
+include/enlightenment/e_update.h
 include/enlightenment/e_user.h
 include/enlightenment/e_utils.h
 include/enlightenment/e_widget.h
@@ -130,6 +136,7 @@ include/enlightenment/e_widget_csel.h
 include/enlightenment/e_widget_cslider.h
 include/enlightenment/e_widget_deskpreview.h
 include/enlightenment/e_widget_entry.h
+include/enlightenment/e_widget_filepreview.h
 include/enlightenment/e_widget_flist.h
 include/enlightenment/e_widget_font_preview.h
 include/enlightenment/e_widget_framelist.h
@@ -150,6 +157,7 @@ include/enlightenment/e_widget_toolbar.h
 include/enlightenment/e_widget_toolbook.h
 include/enlightenment/e_win.h
 include/enlightenment/e_xinerama.h
+include/enlightenment/e_xkb.h
 include/enlightenment/e_xsettings.h
 include/enlightenment/e_zone.h
 include/enlightenment/evry_api.h
@@ -167,13 +175,9 @@ lib/enlightenment/modules/clock/module.desktop
 lib/enlightenment/modules/comp/e-module-comp.edj
 lib/enlightenment/modules/comp/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/comp/module.desktop
-lib/enlightenment/modules/comp/shadow.edj
 lib/enlightenment/modules/conf/e-module-conf.edj
 lib/enlightenment/modules/conf/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/conf/module.desktop
-lib/enlightenment/modules/connman/e-module-connman.edj
-lib/enlightenment/modules/connman/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/connman/module.desktop
 lib/enlightenment/modules/conf_applications/e-module-conf_applications.edj
 lib/enlightenment/modules/conf_applications/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/conf_applications/module.desktop
@@ -188,7 +192,6 @@ lib/enlightenment/modules/conf_edgebindings/module.desktop
 lib/enlightenment/modules/conf_interaction/e-module-conf_interaction.edj
 lib/enlightenment/modules/conf_interaction/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/conf_interaction/module.desktop
-lib/enlightenment/modules/conf_intl/e-module-conf_intl.edj
 lib/enlightenment/modules/conf_intl/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/conf_intl/module.desktop
 lib/enlightenment/modules/conf_keybindings/%%E17_ARCH%%/module.so
@@ -210,9 +213,6 @@ lib/enlightenment/modules/conf_shelves/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/conf_shelves/module.desktop
 lib/enlightenment/modules/conf_theme/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/conf_theme/module.desktop
-lib/enlightenment/modules/conf_wallpaper2/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/conf_wallpaper2/module.desktop
-lib/enlightenment/modules/conf_window_manipulation/e-module-conf_winmanip.edj
 lib/enlightenment/modules/conf_window_manipulation/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/conf_window_manipulation/module.desktop
 lib/enlightenment/modules/conf_window_remembers/e-module-conf_window_remembers.edj
@@ -244,53 +244,51 @@ lib/enlightenment/modules/ibar/module.desktop
 lib/enlightenment/modules/ibox/e-module-ibox.edj
 lib/enlightenment/modules/ibox/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/ibox/module.desktop
-lib/enlightenment/modules/illume-bluetooth/e-module-illume-bluetooth.edj
-lib/enlightenment/modules/illume-bluetooth/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/illume-bluetooth/module.desktop
-lib/enlightenment/modules/illume-home-toggle/e-module-illume-home-toggle.edj
-lib/enlightenment/modules/illume-home-toggle/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/illume-home-toggle/module.desktop
-lib/enlightenment/modules/illume-home/e-module-illume-home.edj
-lib/enlightenment/modules/illume-home/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/illume-home/module.desktop
-lib/enlightenment/modules/illume-indicator/e-module-illume-indicator.edj
-lib/enlightenment/modules/illume-indicator/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/illume-indicator/module.desktop
-lib/enlightenment/modules/illume-kbd-toggle/e-module-illume-kbd-toggle.edj
-lib/enlightenment/modules/illume-kbd-toggle/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/illume-kbd-toggle/module.desktop
-lib/enlightenment/modules/illume-keyboard/dicts/English_(US).dic
-lib/enlightenment/modules/illume-keyboard/dicts/English_(US)_Small.dic
-lib/enlightenment/modules/illume-keyboard/e-module-illume-keyboard.edj
-lib/enlightenment/modules/illume-keyboard/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/illume-keyboard/keyboards/Default.kbd
-lib/enlightenment/modules/illume-keyboard/keyboards/Numbers.kbd
-lib/enlightenment/modules/illume-keyboard/keyboards/Terminal.kbd
-lib/enlightenment/modules/illume-keyboard/keyboards/alpha.png
-lib/enlightenment/modules/illume-keyboard/keyboards/backspace.png
-lib/enlightenment/modules/illume-keyboard/keyboards/down.png
-lib/enlightenment/modules/illume-keyboard/keyboards/enter.png
-lib/enlightenment/modules/illume-keyboard/keyboards/ignore_built_in_keyboards
-lib/enlightenment/modules/illume-keyboard/keyboards/left.png
-lib/enlightenment/modules/illume-keyboard/keyboards/numeric.png
-lib/enlightenment/modules/illume-keyboard/keyboards/qwerty.png
-lib/enlightenment/modules/illume-keyboard/keyboards/right.png
-lib/enlightenment/modules/illume-keyboard/keyboards/shift.png
-lib/enlightenment/modules/illume-keyboard/keyboards/tab.png
-lib/enlightenment/modules/illume-keyboard/keyboards/up.png
-lib/enlightenment/modules/illume-keyboard/module.desktop
-lib/enlightenment/modules/illume-mode-toggle/e-module-illume-mode-toggle.edj
-lib/enlightenment/modules/illume-mode-toggle/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/illume-mode-toggle/module.desktop
-lib/enlightenment/modules/illume-softkey/e-module-illume-softkey.edj
-lib/enlightenment/modules/illume-softkey/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/illume-softkey/module.desktop
-lib/enlightenment/modules/illume2/e-module-illume2.edj
-lib/enlightenment/modules/illume2/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/illume2/keyboards/ignore_built_in_keyboards
-lib/enlightenment/modules/illume2/module.desktop
-lib/enlightenment/modules/illume2/policies/illume.so
-lib/enlightenment/modules/illume2/policies/tablet.so
+%%ILLUME%%lib/enlightenment/modules/illume-bluetooth/e-module-illume-bluetooth.edj
+%%ILLUME%%lib/enlightenment/modules/illume-bluetooth/%%E17_ARCH%%/module.so
+%%ILLUME%%lib/enlightenment/modules/illume-bluetooth/module.desktop
+%%ILLUME%%lib/enlightenment/modules/illume-home-toggle/e-module-illume-home-toggle.edj
+%%ILLUME%%lib/enlightenment/modules/illume-home-toggle/%%E17_ARCH%%/module.so
+%%ILLUME%%lib/enlightenment/modules/illume-home-toggle/module.desktop
+%%ILLUME%%lib/enlightenment/modules/illume-home/e-module-illume-home.edj
+%%ILLUME%%lib/enlightenment/modules/illume-home/%%E17_ARCH%%/module.so
+%%ILLUME%%lib/enlightenment/modules/illume-home/module.desktop
+%%ILLUME%%lib/enlightenment/modules/illume-indicator/e-module-illume-indicator.edj
+%%ILLUME%%lib/enlightenment/modules/illume-indicator/%%E17_ARCH%%/module.so
+%%ILLUME%%lib/enlightenment/modules/illume-indicator/module.desktop
+%%ILLUME%%lib/enlightenment/modules/illume-kbd-toggle/e-module-illume-kbd-toggle.edj
+%%ILLUME%%lib/enlightenment/modules/illume-kbd-toggle/%%E17_ARCH%%/module.so
+%%ILLUME%%lib/enlightenment/modules/illume-kbd-toggle/module.desktop
+%%ILLUME%%lib/enlightenment/modules/illume-keyboard/dicts/English_US.dic
+%%ILLUME%%lib/enlightenment/modules/illume-keyboard/dicts/English_US_Small.dic
+%%ILLUME%%lib/enlightenment/modules/illume-keyboard/e-module-illume-keyboard.edj
+%%ILLUME%%lib/enlightenment/modules/illume-keyboard/%%E17_ARCH%%/module.so
+%%ILLUME%%lib/enlightenment/modules/illume-keyboard/keyboards/Default.kbd
+%%ILLUME%%lib/enlightenment/modules/illume-keyboard/keyboards/Numbers.kbd
+%%ILLUME%%lib/enlightenment/modules/illume-keyboard/keyboards/Terminal.kbd
+%%ILLUME%%lib/enlightenment/modules/illume-keyboard/keyboards/alpha.png
+%%ILLUME%%lib/enlightenment/modules/illume-keyboard/keyboards/backspace.png
+%%ILLUME%%lib/enlightenment/modules/illume-keyboard/keyboards/down.png
+%%ILLUME%%lib/enlightenment/modules/illume-keyboard/keyboards/enter.png
+%%ILLUME%%lib/enlightenment/modules/illume-keyboard/keyboards/ignore_built_in_keyboards
+%%ILLUME%%lib/enlightenment/modules/illume-keyboard/keyboards/left.png
+%%ILLUME%%lib/enlightenment/modules/illume-keyboard/keyboards/numeric.png
+%%ILLUME%%lib/enlightenment/modules/illume-keyboard/keyboards/qwerty.png
+%%ILLUME%%lib/enlightenment/modules/illume-keyboard/keyboards/right.png
+%%ILLUME%%lib/enlightenment/modules/illume-keyboard/keyboards/shift.png
+%%ILLUME%%lib/enlightenment/modules/illume-keyboard/keyboards/tab.png
+%%ILLUME%%lib/enlightenment/modules/illume-keyboard/keyboards/up.png
+%%ILLUME%%lib/enlightenment/modules/illume-keyboard/module.desktop
+%%ILLUME%%lib/enlightenment/modules/illume-mode-toggle/e-module-illume-mode-toggle.edj
+%%ILLUME%%lib/enlightenment/modules/illume-mode-toggle/%%E17_ARCH%%/module.so
+%%ILLUME%%lib/enlightenment/modules/illume-mode-toggle/module.desktop
+%%ILLUME%%lib/enlightenment/modules/illume-softkey/e-module-illume-softkey.edj
+%%ILLUME%%lib/enlightenment/modules/illume-softkey/%%E17_ARCH%%/module.so
+%%ILLUME%%lib/enlightenment/modules/illume-softkey/module.desktop
+%%ILLUME%%lib/enlightenment/modules/illume2/e-module-illume2.edj
+%%ILLUME%%lib/enlightenment/modules/illume2/%%E17_ARCH%%/module.so
+%%ILLUME%%lib/enlightenment/modules/illume2/module.desktop
+%%ILLUME%%lib/enlightenment/modules/keyboards/ignore_built_in_keyboards
 lib/enlightenment/modules/mixer/e-module-mixer.edj
 lib/enlightenment/modules/mixer/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/mixer/module.desktop
@@ -300,12 +298,14 @@ lib/enlightenment/modules/msgbus/module.desktop
 lib/enlightenment/modules/notification/e-module-notification.edj
 lib/enlightenment/modules/notification/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/notification/module.desktop
-lib/enlightenment/modules/ofono/e-module-ofono.edj
-lib/enlightenment/modules/ofono/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/ofono/module.desktop
 lib/enlightenment/modules/pager/e-module-pager.edj
 lib/enlightenment/modules/pager/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/pager/module.desktop
+%%ILLUME%%lib/enlightenment/modules/policies/illume.so
+%%ILLUME%%lib/enlightenment/modules/policies/tablet.so
+lib/enlightenment/modules/quickaccess/e-module-quickaccess.edj
+lib/enlightenment/modules/quickaccess/module.desktop
+lib/enlightenment/modules/quickaccess/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/shot/e-module-shot.edj
 lib/enlightenment/modules/shot/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/shot/module.desktop
@@ -325,6 +325,9 @@ lib/enlightenment/modules/temperature/e-module-temperature.edj
 lib/enlightenment/modules/temperature/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/temperature/%%E17_ARCH%%/tempget
 lib/enlightenment/modules/temperature/module.desktop
+lib/enlightenment/modules/tiling/e-module-tiling.edj
+lib/enlightenment/modules/tiling/module.desktop
+lib/enlightenment/modules/tiling/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/winlist/e-module-winlist.edj
 lib/enlightenment/modules/winlist/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/winlist/module.desktop
@@ -332,6 +335,7 @@ lib/enlightenment/modules/wizard/def-ibar.txt
 lib/enlightenment/modules/wizard/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_000.so
 lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_010.so
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_011.so
 lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_020.so
 lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_030.so
 lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_040.so
@@ -347,46 +351,80 @@ lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_130.so
 lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_140.so
 lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_150.so
 lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_160.so
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_170.so
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_180.so
 lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_200.so
 lib/enlightenment/modules/wizard/extra_desktops/mplayer.desktop
 lib/enlightenment/modules/wizard/extra_desktops/xterm.desktop
 lib/enlightenment/modules/wizard/desktop/home.desktop
 lib/enlightenment/modules/wizard/desktop/root.desktop
 lib/enlightenment/modules/wizard/desktop/tmp.desktop
-lib/enlightenment/modules/wizard/favorites/.order
-lib/enlightenment/modules/wizard/favorites/desktop.desktop
-lib/enlightenment/modules/wizard/favorites/home.desktop
-lib/enlightenment/modules/wizard/favorites/root.desktop
-lib/enlightenment/modules/wizard/favorites/tmp.desktop
-lib/enlightenment/preload/e_precache.so
+lib/enlightenment/modules/xkbswitch/e-module-xkbswitch.edj
+lib/enlightenment/modules/xkbswitch/module.desktop
+lib/enlightenment/modules/xkbswitch/%%E17_ARCH%%/module.so
 lib/enlightenment/utils/enlightenment_alert
 lib/enlightenment/utils/enlightenment_fm
 lib/enlightenment/utils/enlightenment_fm_op
 lib/enlightenment/utils/enlightenment_init
+lib/enlightenment/utils/enlightenment_static_grabber
 lib/enlightenment/utils/enlightenment_sys
 lib/enlightenment/utils/enlightenment_thumb
 libdata/pkgconfig/enlightenment.pc
 libdata/pkgconfig/everything.pc
 %%DATADIR%%/AUTHORS
 %%DATADIR%%/COPYING
+%%DATADIR%%/data/backgrounds/Brown_Rock_Hi.edj
+%%DATADIR%%/data/backgrounds/Colorful_Roses.edj
+%%DATADIR%%/data/backgrounds/Curly_Leaves.edj
+%%DATADIR%%/data/backgrounds/Darkconcrete.edj
 %%DATADIR%%/data/backgrounds/Dark_Gradient.edj
+%%DATADIR%%/data/backgrounds/Flower_Petals.edj
+%%DATADIR%%/data/backgrounds/Go_Away.edj
+%%DATADIR%%/data/backgrounds/Grassy.edj
+%%DATADIR%%/data/backgrounds/Green_Stem.edj
+%%DATADIR%%/data/backgrounds/Hills.edj
+%%DATADIR%%/data/backgrounds/Japanesemaple.edj
+%%DATADIR%%/data/backgrounds/Lakegrass.edj
+%%DATADIR%%/data/backgrounds/Lantern_Cluster.edj
+%%DATADIR%%/data/backgrounds/Leafy_Red.edj
+%%DATADIR%%/data/backgrounds/Light.edj
 %%DATADIR%%/data/backgrounds/Light_Gradient.edj
+%%DATADIR%%/data/backgrounds/Mossstring.edj
+%%DATADIR%%/data/backgrounds/Motleyrock.edj
+%%DATADIR%%/data/backgrounds/Newgrowth.edj
+%%DATADIR%%/data/backgrounds/Orange_Roses.edj
+%%DATADIR%%/data/backgrounds/Pattern_Radial.edj
+%%DATADIR%%/data/backgrounds/Pattern_Vertical.edj
+%%DATADIR%%/data/backgrounds/Pattern_Vertical_Hi.edj
+%%DATADIR%%/data/backgrounds/Pine_Silhouettes.edj
+%%DATADIR%%/data/backgrounds/Purple_Flower_Bunch.edj
+%%DATADIR%%/data/backgrounds/Ramen.edj
+%%DATADIR%%/data/backgrounds/Shady_Leaves.edj
+%%DATADIR%%/data/backgrounds/Skywall.edj
+%%DATADIR%%/data/backgrounds/Stringflower.edj
+%%DATADIR%%/data/backgrounds/Temple.edj
+%%DATADIR%%/data/backgrounds/Train.edj
+%%DATADIR%%/data/backgrounds/Wall_Lanterns.edj
+%%DATADIR%%/data/backgrounds/Wetgrass.edj
+%%DATADIR%%/data/backgrounds/Wetleaf.edj
+%%DATADIR%%/data/backgrounds/Whiterock.edj
+%%DATADIR%%/data/backgrounds/Windy_Palm.edj
 %%DATADIR%%/data/config/default/e.cfg
-%%DATADIR%%/data/config/default/icon.png
+%%DATADIR%%/data/config/default/enlightenment-default.png
 %%DATADIR%%/data/config/default/profile.desktop
-%%DATADIR%%/data/config/illume/e.cfg
-%%DATADIR%%/data/config/illume/icon.png
-%%DATADIR%%/data/config/illume/module.battery.cfg
-%%DATADIR%%/data/config/illume/module.conf.cfg
-%%DATADIR%%/data/config/illume/module.illume-home.cfg
-%%DATADIR%%/data/config/illume/module.illume-keyboard.cfg
-%%DATADIR%%/data/config/illume/module.illume-indicator.cfg
-%%DATADIR%%/data/config/illume/module.illume-softkey.cfg
-%%DATADIR%%/data/config/illume/module.illume2.cfg
-%%DATADIR%%/data/config/illume/profile.desktop
+%%DATADIR%%/data/config/mobile/e.cfg
+%%DATADIR%%/data/config/mobile/enlightenment-mobile.png
+%%DATADIR%%/data/config/mobile/module.battery.cfg
+%%DATADIR%%/data/config/mobile/module.conf.cfg
+%%DATADIR%%/data/config/mobile/module.illume-home.cfg
+%%DATADIR%%/data/config/mobile/module.illume-keyboard.cfg
+%%DATADIR%%/data/config/mobile/module.illume-indicator.cfg
+%%DATADIR%%/data/config/mobile/module.illume-softkey.cfg
+%%DATADIR%%/data/config/mobile/module.illume2.cfg
+%%DATADIR%%/data/config/mobile/profile.desktop
 %%DATADIR%%/data/config/profile.cfg
 %%DATADIR%%/data/config/standard/e.cfg
-%%DATADIR%%/data/config/standard/icon.png
+%%DATADIR%%/data/config/standard/enlightenment-standard.png
 %%DATADIR%%/data/config/standard/module.battery.cfg
 %%DATADIR%%/data/config/standard/module.conf.cfg
 %%DATADIR%%/data/config/standard/module.cpufreq.cfg
@@ -397,6 +435,109 @@ libdata/pkgconfig/everything.pc
 %%DATADIR%%/data/config/standard/module.pager.cfg
 %%DATADIR%%/data/config/standard/module.temperature.cfg
 %%DATADIR%%/data/config/standard/profile.desktop
+%%DATADIR%%/data/favorites/.order
+%%DATADIR%%/data/favorites/desktop.desktop
+%%DATADIR%%/data/favorites/home.desktop
+%%DATADIR%%/data/favorites/root.desktop
+%%DATADIR%%/data/favorites/tmp.desktop
+%%DATADIR%%/data/flags/ad_flag.png
+%%DATADIR%%/data/flags/af_flag.png
+%%DATADIR%%/data/flags/al_flag.png
+%%DATADIR%%/data/flags/am_flag.png
+%%DATADIR%%/data/flags/ara_flag.png
+%%DATADIR%%/data/flags/ar_flag.png
+%%DATADIR%%/data/flags/at_flag.png
+%%DATADIR%%/data/flags/az_flag.png
+%%DATADIR%%/data/flags/ba_flag.png
+%%DATADIR%%/data/flags/bd_flag.png
+%%DATADIR%%/data/flags/be_flag.png
+%%DATADIR%%/data/flags/bg_flag.png
+%%DATADIR%%/data/flags/brai_flag.png
+%%DATADIR%%/data/flags/br_flag.png
+%%DATADIR%%/data/flags/bt_flag.png
+%%DATADIR%%/data/flags/bw_flag.png
+%%DATADIR%%/data/flags/by_flag.png
+%%DATADIR%%/data/flags/ca_flag.png
+%%DATADIR%%/data/flags/cat_flag.png
+%%DATADIR%%/data/flags/cd_flag.png
+%%DATADIR%%/data/flags/ch_flag.png
+%%DATADIR%%/data/flags/cm_flag.png
+%%DATADIR%%/data/flags/cn_flag.png
+%%DATADIR%%/data/flags/cz_flag.png
+%%DATADIR%%/data/flags/de_flag.png
+%%DATADIR%%/data/flags/dk_flag.png
+%%DATADIR%%/data/flags/ee_flag.png
+%%DATADIR%%/data/flags/epo_flag.png
+%%DATADIR%%/data/flags/es_flag.png
+%%DATADIR%%/data/flags/et_flag.png
+%%DATADIR%%/data/flags/fi_flag.png
+%%DATADIR%%/data/flags/fo_flag.png
+%%DATADIR%%/data/flags/fr_flag.png
+%%DATADIR%%/data/flags/gb_flag.png
+%%DATADIR%%/data/flags/ge_flag.png
+%%DATADIR%%/data/flags/gh_flag.png
+%%DATADIR%%/data/flags/gn_flag.png
+%%DATADIR%%/data/flags/gr_flag.png
+%%DATADIR%%/data/flags/hr_flag.png
+%%DATADIR%%/data/flags/hu_flag.png
+%%DATADIR%%/data/flags/ie_flag.png
+%%DATADIR%%/data/flags/il_flag.png
+%%DATADIR%%/data/flags/in_flag.png
+%%DATADIR%%/data/flags/iq_flag.png
+%%DATADIR%%/data/flags/ir_flag.png
+%%DATADIR%%/data/flags/is_flag.png
+%%DATADIR%%/data/flags/it_flag.png
+%%DATADIR%%/data/flags/jp_flag.png
+%%DATADIR%%/data/flags/ke_flag.png
+%%DATADIR%%/data/flags/kg_flag.png
+%%DATADIR%%/data/flags/kh_flag.png
+%%DATADIR%%/data/flags/kr_flag.png
+%%DATADIR%%/data/flags/ku_flag.png
+%%DATADIR%%/data/flags/kz_flag.png
+%%DATADIR%%/data/flags/la_flag.png
+%%DATADIR%%/data/flags/lang-system.png
+%%DATADIR%%/data/flags/latam_flag.png
+%%DATADIR%%/data/flags/lk_flag.png
+%%DATADIR%%/data/flags/lt_flag.png
+%%DATADIR%%/data/flags/lv_flag.png
+%%DATADIR%%/data/flags/ma_flag.png
+%%DATADIR%%/data/flags/mao_flag.png
+%%DATADIR%%/data/flags/me_flag.png
+%%DATADIR%%/data/flags/mk_flag.png
+%%DATADIR%%/data/flags/ml_flag.png
+%%DATADIR%%/data/flags/mm_flag.png
+%%DATADIR%%/data/flags/mn_flag.png
+%%DATADIR%%/data/flags/mt_flag.png
+%%DATADIR%%/data/flags/mv_flag.png
+%%DATADIR%%/data/flags/my_flag.png
+%%DATADIR%%/data/flags/ng_flag.png
+%%DATADIR%%/data/flags/nl_flag.png
+%%DATADIR%%/data/flags/no_flag.png
+%%DATADIR%%/data/flags/np_flag.png
+%%DATADIR%%/data/flags/ph_flag.png
+%%DATADIR%%/data/flags/pk_flag.png
+%%DATADIR%%/data/flags/pl_flag.png
+%%DATADIR%%/data/flags/pt_flag.png
+%%DATADIR%%/data/flags/ro_flag.png
+%%DATADIR%%/data/flags/rs_flag.png
+%%DATADIR%%/data/flags/ru_flag.png
+%%DATADIR%%/data/flags/se_flag.png
+%%DATADIR%%/data/flags/si_flag.png
+%%DATADIR%%/data/flags/sk_flag.png
+%%DATADIR%%/data/flags/sn_flag.png
+%%DATADIR%%/data/flags/sy_flag.png
+%%DATADIR%%/data/flags/th_flag.png
+%%DATADIR%%/data/flags/tj_flag.png
+%%DATADIR%%/data/flags/tm_flag.png
+%%DATADIR%%/data/flags/tr_flag.png
+%%DATADIR%%/data/flags/tw_flag.png
+%%DATADIR%%/data/flags/tz_flag.png
+%%DATADIR%%/data/flags/ua_flag.png
+%%DATADIR%%/data/flags/unknown_flag.png
+%%DATADIR%%/data/flags/us_flag.png
+%%DATADIR%%/data/flags/uz_flag.png
+%%DATADIR%%/data/flags/vn_flag.png
+%%DATADIR%%/data/flags/za_flag.png
 %%DATADIR%%/data/icons/audio_player.png
 %%DATADIR%%/data/icons/audio_player2.png
 %%DATADIR%%/data/icons/image_viewer.png
@@ -406,33 +547,6 @@ libdata/pkgconfig/everything.pc
 %%DATADIR%%/data/icons/web_browser.png
 %%DATADIR%%/data/icons/xterm.png
 %%DATADIR%%/data/images/enlightenment.png
-%%DATADIR%%/data/images/lang-bg_BG.png
-%%DATADIR%%/data/images/lang-ca_ES.png
-%%DATADIR%%/data/images/lang-cs_CZ.png
-%%DATADIR%%/data/images/lang-da_DK.png
-%%DATADIR%%/data/images/lang-de_DE.png
-%%DATADIR%%/data/images/lang-el_GR.png
-%%DATADIR%%/data/images/lang-en_US.png
-%%DATADIR%%/data/images/lang-es_AR.png
-%%DATADIR%%/data/images/lang-es_ES.png
-%%DATADIR%%/data/images/lang-fi_FI.png
-%%DATADIR%%/data/images/lang-fr_FR.png
-%%DATADIR%%/data/images/lang-hu_HU.png
-%%DATADIR%%/data/images/lang-it_IT.png
-%%DATADIR%%/data/images/lang-ja_JP.png
-%%DATADIR%%/data/images/lang-ko_KR.png
-%%DATADIR%%/data/images/lang-nb_NO.png
-%%DATADIR%%/data/images/lang-nl_NL.png
-%%DATADIR%%/data/images/lang-pl_PL.png
-%%DATADIR%%/data/images/lang-pt_BR.png
-%%DATADIR%%/data/images/lang-ru_RU.png
-%%DATADIR%%/data/images/lang-sk_SK.png
-%%DATADIR%%/data/images/lang-sl_SI.png
-%%DATADIR%%/data/images/lang-sv_SE.png
-%%DATADIR%%/data/images/lang-zh_CN.png
-%%DATADIR%%/data/images/lang-zh_HK.png
-%%DATADIR%%/data/images/lang-zh_TW.png
-%%DATADIR%%/data/images/lang-system.png
 %%DATADIR%%/data/images/test.edj
 %%DATADIR%%/data/images/test.jpg
 %%DATADIR%%/data/images/test.png
@@ -448,6 +562,7 @@ libdata/pkgconfig/everything.pc
 %%DATADIR%%/doc/enlightenment.png
 %%DATADIR%%/doc/illume2.html
 %%DATADIR%%/doc/illume2.png
+share/applications/enlightenment_filemanager.desktop
 share/xsessions/enlightenment.desktop
 %%NLS%%share/locale/ar/LC_MESSAGES/enlightenment.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/enlightenment.mo
@@ -463,6 +578,7 @@ share/xsessions/enlightenment.desktop
 %%NLS%%share/locale/fo/LC_MESSAGES/enlightenment.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/enlightenment.mo
 %%NLS%%share/locale/fr_CH/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/enlightenment.mo
 %%NLS%%share/locale/he/LC_MESSAGES/enlightenment.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/enlightenment.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/enlightenment.mo
@@ -515,6 +631,8 @@ share/xsessions/enlightenment.desktop
 %%NLS%%@dirrmtry share/locale/fr
 %%NLS%%@dirrmtry share/locale/fr_CH/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/fr_CH
+%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/gl
 %%NLS%%@dirrmtry share/locale/he/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/he
 %%NLS%%@dirrmtry share/locale/hr/LC_MESSAGES
@@ -564,27 +682,32 @@ share/xsessions/enlightenment.desktop
 %%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/zh_TW
 @dirrmtry share/xsessions
+@dirrmtry share/applications
 @dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/data/themes
 @dirrm %%DATADIR%%/data/input_methods
 @dirrm %%DATADIR%%/data/images
 @dirrm %%DATADIR%%/data/icons
+@dirrm %%DATADIR%%/data/flags
+@dirrm %%DATADIR%%/data/favorites
 @dirrm %%DATADIR%%/data/config/standard
-@dirrm %%DATADIR%%/data/config/illume
+@dirrm %%DATADIR%%/data/config/mobile
 @dirrm %%DATADIR%%/data/config/default
 @dirrm %%DATADIR%%/data/config
 @dirrm %%DATADIR%%/data/backgrounds
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
 @dirrm lib/enlightenment/utils
-@dirrm lib/enlightenment/preload
-@dirrm lib/enlightenment/modules/wizard/favorites
+@dirrm lib/enlightenment/modules/xkbswitch/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/xkbswitch
 @dirrm lib/enlightenment/modules/wizard/desktop
 @dirrm lib/enlightenment/modules/wizard/extra_desktops
 @dirrm lib/enlightenment/modules/wizard/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/wizard
 @dirrm lib/enlightenment/modules/winlist/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/winlist
+@dirrm lib/enlightenment/modules/tiling/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/tiling
 @dirrm lib/enlightenment/modules/temperature/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/temperature
 @dirrm lib/enlightenment/modules/tasks/%%E17_ARCH%%
@@ -597,38 +720,38 @@ share/xsessions/enlightenment.desktop
 @dirrm lib/enlightenment/modules/start
 @dirrm lib/enlightenment/modules/shot/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/shot
+@dirrm lib/enlightenment/modules/quickaccess/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/quickaccess
+%%ILLUME%%@dirrm lib/enlightenment/modules/policies
 @dirrm lib/enlightenment/modules/pager/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/pager
-@dirrm lib/enlightenment/modules/ofono/%%E17_ARCH%%
-@dirrm lib/enlightenment/modules/ofono
 @dirrm lib/enlightenment/modules/notification/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/notification
 @dirrm lib/enlightenment/modules/msgbus/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/msgbus
 @dirrm lib/enlightenment/modules/mixer/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/mixer
-@dirrm lib/enlightenment/modules/illume2/policies
-@dirrm lib/enlightenment/modules/illume2/keyboards
-@dirrm lib/enlightenment/modules/illume2/%%E17_ARCH%%
-@dirrm lib/enlightenment/modules/illume2
-@dirrm lib/enlightenment/modules/illume-softkey/%%E17_ARCH%%
-@dirrm lib/enlightenment/modules/illume-softkey
-@dirrm lib/enlightenment/modules/illume-mode-toggle/%%E17_ARCH%%
-@dirrm lib/enlightenment/modules/illume-mode-toggle
-@dirrm lib/enlightenment/modules/illume-keyboard/keyboards
-@dirrm lib/enlightenment/modules/illume-keyboard/%%E17_ARCH%%
-@dirrm lib/enlightenment/modules/illume-keyboard/dicts
-@dirrm lib/enlightenment/modules/illume-keyboard
-@dirrm lib/enlightenment/modules/illume-kbd-toggle/%%E17_ARCH%%
-@dirrm lib/enlightenment/modules/illume-kbd-toggle
-@dirrm lib/enlightenment/modules/illume-indicator/%%E17_ARCH%%
-@dirrm lib/enlightenment/modules/illume-indicator
-@dirrm lib/enlightenment/modules/illume-home/%%E17_ARCH%%
-@dirrm lib/enlightenment/modules/illume-home
-@dirrm lib/enlightenment/modules/illume-home-toggle/%%E17_ARCH%%
-@dirrm lib/enlightenment/modules/illume-home-toggle
-@dirrm lib/enlightenment/modules/illume-bluetooth/%%E17_ARCH%%
-@dirrm lib/enlightenment/modules/illume-bluetooth
+%%ILLUME%%@dirrm lib/enlightenment/modules/keyboards
+%%ILLUME%%@dirrm lib/enlightenment/modules/illume2/%%E17_ARCH%%
+%%ILLUME%%@dirrm lib/enlightenment/modules/illume2
+%%ILLUME%%@dirrm lib/enlightenment/modules/illume-softkey/%%E17_ARCH%%
+%%ILLUME%%@dirrm lib/enlightenment/modules/illume-softkey
+%%ILLUME%%@dirrm lib/enlightenment/modules/illume-mode-toggle/%%E17_ARCH%%
+%%ILLUME%%@dirrm lib/enlightenment/modules/illume-mode-toggle
+%%ILLUME%%@dirrm lib/enlightenment/modules/illume-keyboard/keyboards
+%%ILLUME%%@dirrm lib/enlightenment/modules/illume-keyboard/%%E17_ARCH%%
+%%ILLUME%%@dirrm lib/enlightenment/modules/illume-keyboard/dicts
+%%ILLUME%%@dirrm lib/enlightenment/modules/illume-keyboard
+%%ILLUME%%@dirrm lib/enlightenment/modules/illume-kbd-toggle/%%E17_ARCH%%
+%%ILLUME%%@dirrm lib/enlightenment/modules/illume-kbd-toggle
+%%ILLUME%%@dirrm lib/enlightenment/modules/illume-indicator/%%E17_ARCH%%
+%%ILLUME%%@dirrm lib/enlightenment/modules/illume-indicator
+%%ILLUME%%@dirrm lib/enlightenment/modules/illume-home/%%E17_ARCH%%
+%%ILLUME%%@dirrm lib/enlightenment/modules/illume-home
+%%ILLUME%%@dirrm lib/enlightenment/modules/illume-home-toggle/%%E17_ARCH%%
+%%ILLUME%%@dirrm lib/enlightenment/modules/illume-home-toggle
+%%ILLUME%%@dirrm lib/enlightenment/modules/illume-bluetooth/%%E17_ARCH%%
+%%ILLUME%%@dirrm lib/enlightenment/modules/illume-bluetooth
 @dirrm lib/enlightenment/modules/ibox/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/ibox
 @dirrm lib/enlightenment/modules/ibar/%%E17_ARCH%%
@@ -649,8 +772,6 @@ share/xsessions/enlightenment.desktop
 @dirrm lib/enlightenment/modules/conf_window_remembers
 @dirrm lib/enlightenment/modules/conf_window_manipulation/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/conf_window_manipulation
-@dirrm lib/enlightenment/modules/conf_wallpaper2/%%E17_ARCH%%
-@dirrm lib/enlightenment/modules/conf_wallpaper2
 @dirrm lib/enlightenment/modules/conf_theme/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/conf_theme
 @dirrm lib/enlightenment/modules/conf_shelves/%%E17_ARCH%%
@@ -679,8 +800,6 @@ share/xsessions/enlightenment.desktop
 @dirrm lib/enlightenment/modules/conf_applications
 @dirrm lib/enlightenment/modules/conf/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/conf
-@dirrm lib/enlightenment/modules/connman/%%E17_ARCH%%
-@dirrm lib/enlightenment/modules/connman
 @dirrm lib/enlightenment/modules/comp/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/comp
 @dirrm lib/enlightenment/modules/clock/%%E17_ARCH%%
diff --git a/x11/Makefile b/x11/Makefile
index a3ebeab..95e1b04 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -277,6 +277,7 @@
     SUBDIR += temperature.app
     SUBDIR += terminal.app
     SUBDIR += terminator
+    SUBDIR += terminology
     SUBDIR += thinglaunch
     SUBDIR += thingylaunch
     SUBDIR += tilda
diff --git a/x11/ecore-imf/Makefile b/x11/ecore-imf/Makefile
index 4afd48c..810f78d8 100644
--- a/x11/ecore-imf/Makefile
+++ b/x11/ecore-imf/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	imf
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	x11 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 (IMF module)
@@ -26,11 +26,8 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 .include "../../devel/ecore-main/Makefile.inc"
 
 CONFIGURE_ARGS+=	--enable-ecore-con \
-			--enable-ecore-config \
 			--enable-ecore-imf
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -E \
 		-e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
@@ -43,4 +40,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ecore-imf.pc \
 		${PREFIX}/libdata/pkgconfig/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/ecore-imf/distinfo b/x11/ecore-imf/distinfo
index 30f1fae..e479425 100644
--- a/x11/ecore-imf/distinfo
+++ b/x11/ecore-imf/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/x11/ecore-imf/pkg-plist b/x11/ecore-imf/pkg-plist
index 3bfc486..69e6dd3 100644
--- a/x11/ecore-imf/pkg-plist
+++ b/x11/ecore-imf/pkg-plist
@@ -1,5 +1,5 @@
 include/ecore-1/Ecore_IMF.h
 lib/libecore_imf.so
-lib/libecore_imf.so.2
+lib/libecore_imf.so.8
 libdata/pkgconfig/ecore-imf.pc
 @dirrmtry include/ecore-1
diff --git a/x11/ecore-imf_evas/Makefile b/x11/ecore-imf_evas/Makefile
index 1d70cca..3e112f2 100644
--- a/x11/ecore-imf_evas/Makefile
+++ b/x11/ecore-imf_evas/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	imf_evas
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	x11 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 (IMF-Evas module)
@@ -27,13 +27,10 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 .include "../../devel/ecore-main/Makefile.inc"
 
 CONFIGURE_ARGS+=	--enable-ecore-con \
-			--enable-ecore-config \
 			--enable-ecore-ipc \
 			--enable-ecore-imf \
 			--enable-ecore-imf_evas
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -E \
 		-e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
@@ -46,4 +43,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ecore-imf-evas.pc \
 		${PREFIX}/libdata/pkgconfig/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/ecore-imf_evas/distinfo b/x11/ecore-imf_evas/distinfo
index 30f1fae..e479425 100644
--- a/x11/ecore-imf_evas/distinfo
+++ b/x11/ecore-imf_evas/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/x11/ecore-imf_evas/pkg-plist b/x11/ecore-imf_evas/pkg-plist
index 1495c15..ed383b8 100644
--- a/x11/ecore-imf_evas/pkg-plist
+++ b/x11/ecore-imf_evas/pkg-plist
@@ -1,5 +1,5 @@
 include/ecore-1/Ecore_IMF_Evas.h
 lib/libecore_imf_evas.so
-lib/libecore_imf_evas.so.2
+lib/libecore_imf_evas.so.8
 libdata/pkgconfig/ecore-imf-evas.pc
 @dirrmtry include/ecore-1
diff --git a/x11/ecore-input/Makefile b/x11/ecore-input/Makefile
index 7020d3e..0bcf2f6 100644
--- a/x11/ecore-input/Makefile
+++ b/x11/ecore-input/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	input
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	x11 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 (input module)
@@ -27,8 +27,6 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 CONFIGURE_ARGS+=	--enable-ecore-input
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -E \
 		-e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
@@ -39,4 +37,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ecore-input.pc \
 		${PREFIX}/libdata/pkgconfig/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/ecore-input/distinfo b/x11/ecore-input/distinfo
index 30f1fae..e479425 100644
--- a/x11/ecore-input/distinfo
+++ b/x11/ecore-input/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/x11/ecore-input/pkg-plist b/x11/ecore-input/pkg-plist
index 4cefe08..807f9de 100644
--- a/x11/ecore-input/pkg-plist
+++ b/x11/ecore-input/pkg-plist
@@ -1,5 +1,5 @@
 include/ecore-1/Ecore_Input.h
 lib/libecore_input.so
-lib/libecore_input.so.2
+lib/libecore_input.so.8
 libdata/pkgconfig/ecore-input.pc
 @dirrmtry include/ecore-1
diff --git a/x11/ecore-input_evas/Makefile b/x11/ecore-input_evas/Makefile
index 4fcdda2..811692d 100644
--- a/x11/ecore-input_evas/Makefile
+++ b/x11/ecore-input_evas/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	input_evas
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	x11 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 (evas input module)
@@ -29,8 +29,6 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 CONFIGURE_ARGS+=	--enable-ecore-input \
 			--enable-ecore-input_evas
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -E \
 		-e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
@@ -43,4 +41,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ecore-input-evas.pc \
 		${PREFIX}/libdata/pkgconfig/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/ecore-input_evas/distinfo b/x11/ecore-input_evas/distinfo
index 30f1fae..e479425 100644
--- a/x11/ecore-input_evas/distinfo
+++ b/x11/ecore-input_evas/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/x11/ecore-input_evas/pkg-plist b/x11/ecore-input_evas/pkg-plist
index 41d0542..0fe9f29 100644
--- a/x11/ecore-input_evas/pkg-plist
+++ b/x11/ecore-input_evas/pkg-plist
@@ -1,5 +1,5 @@
 include/ecore-1/Ecore_Input_Evas.h
 lib/libecore_input_evas.so
-lib/libecore_input_evas.so.2
+lib/libecore_input_evas.so.8
 libdata/pkgconfig/ecore-input-evas.pc
 @dirrmtry include/ecore-1
diff --git a/x11/ecore-x11/Makefile b/x11/ecore-x11/Makefile
index a0f4735..d99c940 100644
--- a/x11/ecore-x11/Makefile
+++ b/x11/ecore-x11/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	x11
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	x11 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 (x11 module)
@@ -30,64 +30,63 @@ XEXTDIR=	${LOCALBASE}/include/X11/extensions
 CONFIGURE_ARGS+=	--enable-ecore-x \
 			--enable-ecore-input
 
-OPTIONS=	XDAMAGE		"Enable Xdamage support (requires X11)" on \
-		XDPMS		"Enable Xdpms support (requires X11)" on \
-		XFIXES		"Enable Xfixes support (requires X11)" on \
-		XINERAMA	"Enable Xinerama support (requires X11)" on \
-		XPRINT		"Enable Xprint support (requires X11)" on \
-		XRANDR		"Enable Xrandr support (requires X11)" on \
-		XRENDER		"Enable Xrender support (requires X11)" on \
-		XSS		"Enable Xscrnsaver support (requires X11)" on \
-		XCURSOR		"Enable Xcursor support (requires X11)" on
+OPTIONS_DEFINE=	XCURSOR XDAMAGE XDPMS XFIXES XINERAMA XPRINT XRANDR XRENDER XSS
+OPTIONS_DEFAULT=XCURSOR XDAMAGE XDPMS XFIXES XINERAMA XPRINT XRANDR XRENDER XSS
+XDAMAGE_DESC=	X11 Xdamage extension support
+XDPMS_DESC=	X11 Xdpms extension support
+XFIXES_DESC=	X11 Xfixes extension support
+XPRINT_DESC=	X11 Xprint extension support
+XRENDER_DESC=	X11 Xrender extension support
+XSS_DESC=	X11 Xscrnsaver extension support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_XDAMAGE) || exists(${XEXTDIR}/Xdamage.h)
+.if ${PORT_OPTIONS:MXCURSOR} \
+	|| exists(${LOCALBASE}/include/X11/Xcursor/Xcursor.h)
+USE_XORG+=	xcursor
+WITH_X11=	yes
+.endif
+
+.if ${PORT_OPTIONS:MXDAMAGE} || exists(${XEXTDIR}/Xdamage.h)
 USE_XORG+=	xdamage
 WITH_X11=	yes
 .endif
 
-.if !defined(WITHOUT_XDPMS) || exists(${XEXTDIR}/dpms.h)
+.if ${PORT_OPTIONS:MXDPMS} || exists(${XEXTDIR}/dpms.h)
 USE_XORG+=	xextproto
 WITH_X11=	yes
 .endif
 
-.if !defined(WITHOUT_XFIXES) || exists(${XEXTDIR}/Xfixes.h)
+.if ${PORT_OPTIONS:MXFIXES} || exists(${XEXTDIR}/Xfixes.h)
 USE_XORG+=	xfixes
 WITH_X11=	yes
 .endif
 
-.if !defined(WITHOUT_XINERAMA) || exists(${XEXTDIR}/Xinerama.h)
+.if ${PORT_OPTIONS:MXINERAMA} || exists(${XEXTDIR}/Xinerama.h)
 USE_XORG+=	xineramaproto
 WITH_X11=	yes
 .endif
 
-.if !defined(WITHOUT_XPRINT) || exists(${XEXTDIR}/Print.h)
+.if ${PORT_OPTIONS:MXPRINT} || exists(${XEXTDIR}/Print.h)
 USE_XORG+=	printproto
 WITH_X11=	yes
 .endif
 
-.if !defined(WITHOUT_XRANDR) || exists(${XEXTDIR}/Xrandr.h)
+.if ${PORT_OPTIONS:MXRANDR} || exists(${XEXTDIR}/Xrandr.h)
 USE_XORG+=	xrandr
 WITH_X11=	yes
 .endif
 
-.if !defined(WITHOUT_XRENDER) || exists(${XEXTDIR}/Xrender.h)
+.if ${PORT_OPTIONS:MXRENDER} || exists(${XEXTDIR}/Xrender.h)
 USE_XORG+=	xrender
 WITH_X11=	yes
 .endif
 
-.if !defined(WITHOUT_XSS) || exists(${XEXTDIR}/scrnsaver.h)
+.if ${PORT_OPTIONS:MXSS} || exists(${XEXTDIR}/scrnsaver.h)
 USE_XORG+=	xscrnsaver
 WITH_X11=	yes
 .endif
 
-.if !defined(WITHOUT_XCURSOR) \
-	|| exists(${LOCALBASE}/include/X11/Xcursor/Xcursor.h)
-USE_XORG+=	xcursor
-WITH_X11=	yes
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -E \
 		-e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
@@ -102,4 +101,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ecore-x.pc \
 		${PREFIX}/libdata/pkgconfig/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/ecore-x11/distinfo b/x11/ecore-x11/distinfo
index 30f1fae..e479425 100644
--- a/x11/ecore-x11/distinfo
+++ b/x11/ecore-x11/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/x11/ecore-x11/pkg-plist b/x11/ecore-x11/pkg-plist
index 2f05dc1..d1aaa3d 100644
--- a/x11/ecore-x11/pkg-plist
+++ b/x11/ecore-x11/pkg-plist
@@ -2,6 +2,6 @@ include/ecore-1/Ecore_X.h
 include/ecore-1/Ecore_X_Atoms.h
 include/ecore-1/Ecore_X_Cursor.h
 lib/libecore_x.so
-lib/libecore_x.so.2
+lib/libecore_x.so.8
 libdata/pkgconfig/ecore-x.pc
 @dirrmtry include/ecore-1
diff --git a/x11/efreet/Makefile b/x11/efreet/Makefile
index 43b3f6c..bb6e117 100644
--- a/x11/efreet/Makefile
+++ b/x11/efreet/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	efreet
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	x11 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=	Freedesktop.org EFL compatibility layer
@@ -20,4 +20,6 @@ USE_EFL_ECORE=	file
 USE_GNOME=	gnomehack pkgconfig
 USE_LDCONFIG=	yes
 
+CONFIGURE_ARGS=	--disable-nls
+
 .include <bsd.port.mk>
diff --git a/x11/efreet/distinfo b/x11/efreet/distinfo
index 0200244..7012c18 100644
--- a/x11/efreet/distinfo
+++ b/x11/efreet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/efreet-1.1.0.tar.bz2) = 8ea03762b746253a7f43fe77d1b2e80ec021316cc7c38c1e12d93b985593d4cd
-SIZE (e17/efreet-1.1.0.tar.bz2) = 388933
+SHA256 (e17/efreet-1.7.4.tar.bz2) = 2253863223aa5b628cb47f0a7674df97d7893bc490e4b1ba88f2d1ea421dbb2e
+SIZE (e17/efreet-1.7.4.tar.bz2) = 448678
diff --git a/x11/efreet/pkg-plist b/x11/efreet/pkg-plist
index cda64ed..99be34f 100644
--- a/x11/efreet/pkg-plist
+++ b/x11/efreet/pkg-plist
@@ -15,11 +15,11 @@ include/efreet-1/efreet_menu.h
 include/efreet-1/efreet_uri.h
 include/efreet-1/efreet_utils.h
 lib/libefreet.so
-lib/libefreet.so.2
+lib/libefreet.so.8
 lib/libefreet_mime.so
-lib/libefreet_mime.so.2
+lib/libefreet_mime.so.8
 lib/libefreet_trash.so
-lib/libefreet_trash.so.2
+lib/libefreet_trash.so.8
 lib/efreet/efreet_desktop_cache_create
 lib/efreet/efreet_icon_cache_create
 libdata/pkgconfig/efreet-mime.pc
diff --git a/x11/emprint/Makefile b/x11/emprint/Makefile
index 43d077e..c2c45af 100644
--- a/x11/emprint/Makefile
+++ b/x11/emprint/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	emprint
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 CATEGORIES=	x11 enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/extra/
 
@@ -10,12 +10,10 @@ MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	Utility for taking screenshots for E17
 
 DIST_SUBDIR=	e17
-
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_EFL=	ecore evas edje imlib2
-USE_EFL_ECORE=	file x11 evas
+USE_EFL=	eina evas ecore
+USE_EFL_ECORE=	evas file input x11
 USE_GNOME=	gnomehack pkgconfig
-USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/x11/emprint/distinfo b/x11/emprint/distinfo
index f471bbb..c01d55c 100644
--- a/x11/emprint/distinfo
+++ b/x11/emprint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/emprint-20111128.tar.bz2) = f2b90fbdb4fad39c4e9a02513f69a829aae2d64c81f921978708b58c1cf93ce2
-SIZE (e17/emprint-20111128.tar.bz2) = 373261
+SHA256 (e17/emprint-20120918.tar.bz2) = e6b451eb759269c199af9405668ce06461883abde0fb62fd7eb213776f0a1ed0
+SIZE (e17/emprint-20120918.tar.bz2) = 455288
diff --git a/x11/terminology/Makefile b/x11/terminology/Makefile
new file mode 100644
index 0000000..4e15bae
--- /dev/null
+++ b/x11/terminology/Makefile
@@ -0,0 +1,22 @@
+# Created by: Grzegorz Blach <gblach@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	terminology
+PORTVERSION=	0.2.0
+CATEGORIES=	x11 enlightenment
+MASTER_SITES=	http://download.enlightenment.org/releases/ \
+		LOCAL/gblach/e17/
+
+MAINTAINER=	gblach@FreeBSD.org
+COMMENT=	EFL Terminal Emulator
+
+LICENSE=	BSD
+
+DIST_SUBDIR=	e17
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_EFL=	eina eet evas ecore edje emotion elementary
+USE_EFL_ECORE=	imf imf_evas input
+USE_GNOME=	gnomehack pkgconfig
+
+.include <bsd.port.mk>
diff --git a/x11/terminology/distinfo b/x11/terminology/distinfo
new file mode 100644
index 0000000..dc5a588
--- /dev/null
+++ b/x11/terminology/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/terminology-0.2.0.tar.bz2) = abe270a92f7e8734696d9e36bc276c790b3447c6962e9febfb861dbc4059784d
+SIZE (e17/terminology-0.2.0.tar.bz2) = 509135
diff --git a/x11/terminology/pkg-descr b/x11/terminology/pkg-descr
new file mode 100644
index 0000000..8eb54ae
--- /dev/null
+++ b/x11/terminology/pkg-descr
@@ -0,0 +1,3 @@
+Terminology is an EFL terminal emulator with some extra bells and whistles.
+
+WWW: http://www.enlightenment.org/ 
diff --git a/x11/terminology/pkg-plist b/x11/terminology/pkg-plist
new file mode 100644
index 0000000..7a69c4d
--- /dev/null
+++ b/x11/terminology/pkg-plist
@@ -0,0 +1,34 @@
+bin/terminology
+share/applications/terminology.desktop
+share/icons/terminology.png
+%%DATADIR%%/fonts/10x20.pcf
+%%DATADIR%%/fonts/4x6.pcf
+%%DATADIR%%/fonts/5x7.pcf
+%%DATADIR%%/fonts/5x8.pcf
+%%DATADIR%%/fonts/6x10.pcf
+%%DATADIR%%/fonts/6x12.pcf
+%%DATADIR%%/fonts/6x13.pcf
+%%DATADIR%%/fonts/6x9.pcf
+%%DATADIR%%/fonts/7x13.pcf
+%%DATADIR%%/fonts/7x14.pcf
+%%DATADIR%%/fonts/8x13.pcf
+%%DATADIR%%/fonts/9x15.pcf
+%%DATADIR%%/fonts/9x18.pcf
+%%DATADIR%%/fonts/nexus.pcf
+%%DATADIR%%/fonts/terminus-12.pcf
+%%DATADIR%%/fonts/terminus-14-bold.pcf
+%%DATADIR%%/fonts/terminus-14.pcf
+%%DATADIR%%/fonts/terminus-16-bold.pcf
+%%DATADIR%%/fonts/terminus-16.pcf
+%%DATADIR%%/fonts/terminus-18-bold.pcf
+%%DATADIR%%/fonts/terminus-18.pcf
+%%DATADIR%%/fonts/terminus-20-bold.pcf
+%%DATADIR%%/fonts/terminus-20.pcf
+%%DATADIR%%/images/terminology.png
+%%DATADIR%%/themes/default.edj
+%%DATADIR%%/themes/mild.edj
+%%DATADIR%%/themes/black.edj
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%
author	gblach <gblach@FreeBSD.org>	2012-12-22 20:54:59 +0000
committer	gblach <gblach@FreeBSD.org>	2012-12-22 20:54:59 +0000
commit	fb6528c60e3ea4f5ff74de6f21724d7ad28c0f7b (patch)
tree	9c4bc08591050b7b536082be6db8392c913f8089
parent	35e83ae5ca4ef2876eccf0e512467ede97187fb9 (diff)
download	FreeBSD-ports-fb6528c60e3ea4f5ff74de6f21724d7ad28c0f7b.zip FreeBSD-ports-fb6528c60e3ea4f5ff74de6f21724d7ad28c0f7b.tar.gz