- Update devel/efl to 1.18.1

- Update devel/py-efl to 1.18.0
- Update multimedia/rage to 0.2.1
- Update x11-wm/enligtenment to 0.21.2
- Bump PORTREVISION in graphics/edje_viewer
- Bump PORTREVISION in x11/terminology
- Merge graphics/evas_generic_loaders* into devel/efl
- Merge multimedia/emotion_generic_players-vlc into devel/efl
- Merge x11-toolkits/elementary into devel/efl

4 files changed, 20 insertions, 7 deletions

diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index ac3a1413dd14..541137ce4c09 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	enlightenment
-PORTVERSION=	0.20.6
+PORTVERSION=	0.21.2
 PORTEPOCH=	2
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://download.enlightenment.org/rel/apps/${PORTNAME}/
@@ -14,13 +14,12 @@ COMMENT=	Artistic X window manager
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libefl.so:devel/efl \
-		libelementary.so:x11-toolkits/elementary \
 		libxcb-keysyms.so:x11/xcb-util-keysyms
-RUN_DEPENDS=	${LOCALBASE}/lib/evas/utils/evas_image_loader.svg:graphics/evas_generic_loaders-svg
 
 GNU_CONFIGURE=	yes
 USES=		alias autoreconf desktop-file-utils execinfo gettext-tools \
-		libtool pathfix iconv gmake pkgconfig tar:xz
+		gmake iconv libtool pathfix pkgconfig tar:xz
+USE_XORG=	xcb
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 SUB_FILES=	pkg-message
diff --git a/x11-wm/enlightenment/Makefile.plist b/x11-wm/enlightenment/Makefile.plist
index 01c9898366a8..15e95dcc08ec 100644
--- a/x11-wm/enlightenment/Makefile.plist
+++ b/x11-wm/enlightenment/Makefile.plist
@@ -1,2 +1,2 @@
-ENLIGHTENMENT_ARCH=	${OPSYS:tl}${OSREL}-${ARCH}-ver-autocannoli-0.20
+ENLIGHTENMENT_ARCH=	${OPSYS:tl}${OSREL}-${ARCH}-ver-0.21
 PLIST_SUB=		ENLIGHTENMENT_ARCH=${ENLIGHTENMENT_ARCH}
diff --git a/x11-wm/enlightenment/distinfo b/x11-wm/enlightenment/distinfo
index 4627f52e7343..0e250c1231fd 100644
--- a/x11-wm/enlightenment/distinfo
+++ b/x11-wm/enlightenment/distinfo
@@ -1,2 +1,3 @@
-SHA256 (enlightenment/enlightenment-0.20.6.tar.xz) = f21fbace15b8ea0e47c7aeb16a3f4d1e8a41cb85bc0035491091518b0ca55085
-SIZE (enlightenment/enlightenment-0.20.6.tar.xz) = 25030572
+TIMESTAMP = 1474757893
+SHA256 (enlightenment/enlightenment-0.21.2.tar.xz) = a877645dc70aee71141013888863b69a1029f575f685e285b570db7c736f253a
+SIZE (enlightenment/enlightenment-0.21.2.tar.xz) = 25277864
diff --git a/x11-wm/enlightenment/pkg-plist b/x11-wm/enlightenment/pkg-plist
index 30855368e2be..091a0c0c6cc2 100644
--- a/x11-wm/enlightenment/pkg-plist
+++ b/x11-wm/enlightenment/pkg-plist
@@ -8,6 +8,7 @@ bin/enlightenment_start
 etc/enlightenment/sysactions.conf
 etc/xdg/menus/e-applications.menu
 include/enlightenment/e.h
+include/enlightenment/e_Efx.h
 include/enlightenment/e_about.h
 include/enlightenment/e_acpi.h
 include/enlightenment/e_actions.h
@@ -17,6 +18,7 @@ include/enlightenment/e_auth.h
 include/enlightenment/e_backlight.h
 include/enlightenment/e_bg.h
 include/enlightenment/e_bindings.h
+include/enlightenment/e_bryce.h
 include/enlightenment/e_client.h
 include/enlightenment/e_client.x
 include/enlightenment/e_color.h
@@ -63,6 +65,7 @@ include/enlightenment/e_focus.h
 include/enlightenment/e_font.h
 include/enlightenment/e_gadcon.h
 include/enlightenment/e_gadcon_popup.h
+include/enlightenment/e_gadget.h
 include/enlightenment/e_grab_dialog.h
 include/enlightenment/e_grabinput.h
 include/enlightenment/e_hints.h
@@ -130,6 +133,7 @@ include/enlightenment/e_toolbar.h
 include/enlightenment/e_update.h
 include/enlightenment/e_user.h
 include/enlightenment/e_utils.h
+include/enlightenment/e_video.h
 include/enlightenment/e_widget.h
 include/enlightenment/e_widget_aspect.h
 include/enlightenment/e_widget_bgpreview.h
@@ -298,9 +302,15 @@ lib/enlightenment/modules/temperature/module.desktop
 lib/enlightenment/modules/tiling/e-module-tiling.edj
 lib/enlightenment/modules/tiling/%%ENLIGHTENMENT_ARCH%%/module.so
 lib/enlightenment/modules/tiling/module.desktop
+lib/enlightenment/modules/time/e-module-time.edj
+lib/enlightenment/modules/time/%%ENLIGHTENMENT_ARCH%%/module.so
+lib/enlightenment/modules/time/module.desktop
 lib/enlightenment/modules/winlist/e-module-winlist.edj
 lib/enlightenment/modules/winlist/%%ENLIGHTENMENT_ARCH%%/module.so
 lib/enlightenment/modules/winlist/module.desktop
+lib/enlightenment/modules/wireless/e-module-wireless.edj
+lib/enlightenment/modules/wireless/%%ENLIGHTENMENT_ARCH%%/module.so
+lib/enlightenment/modules/wireless/module.desktop
 lib/enlightenment/modules/wizard/def-ibar.txt
 lib/enlightenment/modules/wizard/desktop/home.desktop
 lib/enlightenment/modules/wizard/desktop/root.desktop
@@ -314,6 +324,7 @@ lib/enlightenment/modules/wizard/%%ENLIGHTENMENT_ARCH%%/page_030.so
 lib/enlightenment/modules/wizard/%%ENLIGHTENMENT_ARCH%%/page_040.so
 lib/enlightenment/modules/wizard/%%ENLIGHTENMENT_ARCH%%/page_050.so
 lib/enlightenment/modules/wizard/%%ENLIGHTENMENT_ARCH%%/page_060.so
+lib/enlightenment/modules/wizard/%%ENLIGHTENMENT_ARCH%%/page_065.so
 lib/enlightenment/modules/wizard/%%ENLIGHTENMENT_ARCH%%/page_070.so
 lib/enlightenment/modules/wizard/%%ENLIGHTENMENT_ARCH%%/page_080.so
 lib/enlightenment/modules/wizard/%%ENLIGHTENMENT_ARCH%%/page_090.so
@@ -332,6 +343,7 @@ lib/enlightenment/modules/xkbswitch/module.desktop
 lib/enlightenment/utils/enlightenment_alert
 lib/enlightenment/utils/enlightenment_backlight
 lib/enlightenment/utils/enlightenment_ckpasswd
+lib/enlightenment/utils/enlightenment_elm_cfgtool
 lib/enlightenment/utils/enlightenment_fm
 lib/enlightenment/utils/enlightenment_fm_op
 lib/enlightenment/utils/enlightenment_static_grabber
@@ -582,6 +594,7 @@ share/applications/enlightenment_filemanager.desktop
 %%NLS%%share/locale/sv/LC_MESSAGES/enlightenment.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/enlightenment.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/enlightenment.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/enlightenment.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/enlightenment.mo
 share/pixmaps/emixer.png