- Update e17 applications suite to the recent snapshot.

  Thanks to Grzegorz Blach <magik@roorback.net> for doing the hard work
  preparing the initial version of the update!

PR:		ports/148038
Submitted by:	Grzegorz Blach <magik@roorback.net> (based on)

5 files changed, 148 insertions, 115 deletions

diff --git a/x11-wm/e17-module-language/Makefile b/x11-wm/e17-module-language/Makefile
index 4b273518d1e7..1e0779d0c955 100644
--- a/x11-wm/e17-module-language/Makefile
+++ b/x11-wm/e17-module-language/Makefile
@@ -1,31 +1,31 @@
 # New ports collection makefile for:	e17-module-language
-# Date created:		23 June 2006
-# Whom:			Stanislav Sedov <ssedov@mbsd.msk.ru>
+# Date created:		21 August 2010
+# Whom:			Grzegorz Blach <magik@roorback.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	language
-PORTVERSION=	20080223
-PORTREVISION=	5
-CATEGORIES=	x11-wm
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
+PORTVERSION=	20101003
+CATEGORIES=	x11-wm enlightenment
+MASTER_SITES=	http://files.roorback.net/e17/2010-10-03/modules/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	stas@FreeBSD.org
-COMMENT=	An e17 module to switch XKB input language
+MAINTAINER=	magik@roorback.net
+COMMENT=	An e17 XKB language/layout control module
 
-BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
+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
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget pkgconfig
-USE_EFL=	edje exml
-USE_XORG=	x11 xkbfile
+USE_XORG=	xkbfile
+USE_EFL=	edje libtool_hack modarch_hack
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git a/x11-wm/e17-module-language/distinfo b/x11-wm/e17-module-language/distinfo
index 1a265df3bc05..2f0514fa2183 100644
--- a/x11-wm/e17-module-language/distinfo
+++ b/x11-wm/e17-module-language/distinfo
@@ -1,3 +1,2 @@
-MD5 (language-20080223.tar.bz2) = 9a2fb69f4f2681d32215ae85b03667f4
-SHA256 (language-20080223.tar.bz2) = 073208e8874627682101f9a373188a481baa24261f3c1b820bcf2197d0837ec9
-SIZE (language-20080223.tar.bz2) = 405615
+SHA256 (e17/language-20101003.tar.bz2) = 051e4807cb4bcdb7fdd78edc127248fe31379b2e4f23e186ae99831906214e34
+SIZE (e17/language-20101003.tar.bz2) = 644953
diff --git a/x11-wm/e17-module-language/files/patch-configure b/x11-wm/e17-module-language/files/patch-configure
deleted file mode 100644
index 16091f080088..000000000000
--- a/x11-wm/e17-module-language/files/patch-configure
+++ /dev/null
@@ -1,26 +0,0 @@
---- configure.orig	Sun Jul  9 23:28:34 2006
-+++ configure	Sun Jul  9 23:29:18 2006
-@@ -22091,6 +22091,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+#include <X11/Xlib.h>
-+#include <X11/Xos.h>
-+#include <X11/XKBlib.h>
-+#include <X11/extensions/XKBfile.h>
-+#include <X11/extensions/XKBconfig.h>
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
-@@ -22135,6 +22140,11 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <X11/Xlib.h>
-+#include <X11/Xos.h>
-+#include <X11/XKBlib.h>
-+#include <X11/extensions/XKBfile.h>
-+#include <X11/extensions/XKBconfig.h>
- #include <$ac_header>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
diff --git a/x11-wm/e17-module-language/pkg-descr b/x11-wm/e17-module-language/pkg-descr
index 12881f1fd52e..aa8e714b8569 100644
--- a/x11-wm/e17-module-language/pkg-descr
+++ b/x11-wm/e17-module-language/pkg-descr
@@ -1,4 +1,3 @@
-This e17 module allows users to switch current XKB language in efficient way.
+AN e17 gadget to control active keyboard, keyboard layout, and layout variant.
 
-Author:	Aleksej 'sndev' Struk <astruk@gmail.com>
 WWW:	http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-language/pkg-plist b/x11-wm/e17-module-language/pkg-plist
index 86b38fe3bd9b..a53ba8ac941b 100644
--- a/x11-wm/e17-module-language/pkg-plist
+++ b/x11-wm/e17-module-language/pkg-plist
@@ -1,98 +1,159 @@
-lib/enlightenment/modules/language/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/language/%%E17_ARCH%%/module.la
-lib/enlightenment/modules/language/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/language/images/AFG_flag.png
-lib/enlightenment/modules/language/images/ALB_flag.png
+lib/enlightenment/modules/language/e-module-language.edj
+lib/enlightenment/modules/language/language.edj
+lib/enlightenment/modules/language/images/MMR_flag.png
+lib/enlightenment/modules/language/images/HUN_flag.png
+lib/enlightenment/modules/language/images/MKD_flag.png
 lib/enlightenment/modules/language/images/AND_flag.png
-lib/enlightenment/modules/language/images/ARA_flag.png
-lib/enlightenment/modules/language/images/ARM_flag.png
-lib/enlightenment/modules/language/images/AZE_flag.png
-lib/enlightenment/modules/language/images/BAN_flag.png
-lib/enlightenment/modules/language/images/BEL_flag.png
-lib/enlightenment/modules/language/images/BGR_flag.png
-lib/enlightenment/modules/language/images/BHU_flag.png
-lib/enlightenment/modules/language/images/BIH_flag.png
-lib/enlightenment/modules/language/images/BLR_flag.png
-lib/enlightenment/modules/language/images/BRA_flag.png
-lib/enlightenment/modules/language/images/CAN_flag.png
+lib/enlightenment/modules/language/images/USA_flag.png
+lib/enlightenment/modules/language/images/LTU_flag.png
+lib/enlightenment/modules/language/images/SCG_flag.png
+lib/enlightenment/modules/language/images/EST_flag.png
+lib/enlightenment/modules/language/images/unknown_flag.png
+lib/enlightenment/modules/language/images/POL_flag.png
 lib/enlightenment/modules/language/images/CHE_flag.png
-lib/enlightenment/modules/language/images/CZE_flag.png
 lib/enlightenment/modules/language/images/DEU_flag.png
-lib/enlightenment/modules/language/images/DNK_flag.png
-lib/enlightenment/modules/language/images/EPO_flag.png
-lib/enlightenment/modules/language/images/ESP_flag.png
-lib/enlightenment/modules/language/images/EST_flag.png
-lib/enlightenment/modules/language/images/FAO_flag.png
-lib/enlightenment/modules/language/images/FIN_flag.png
-lib/enlightenment/modules/language/images/FRA_flag.png
-lib/enlightenment/modules/language/images/GBR_flag.png
+lib/enlightenment/modules/language/images/THA_flag.png
+lib/enlightenment/modules/language/images/SYR_flag.png
+lib/enlightenment/modules/language/images/SWE_flag.png
+lib/enlightenment/modules/language/images/BAN_flag.png
+lib/enlightenment/modules/language/images/HRV_flag.png
 lib/enlightenment/modules/language/images/GEO_flag.png
-lib/enlightenment/modules/language/images/GHA_flag.png
+lib/enlightenment/modules/language/images/ROU_flag.png
+lib/enlightenment/modules/language/images/FRA_flag.png
+lib/enlightenment/modules/language/images/DNK_flag.png
+lib/enlightenment/modules/language/images/KYR_flag.png
+lib/enlightenment/modules/language/images/SVK_flag.png
+lib/enlightenment/modules/language/images/PAK_flag.png
+lib/enlightenment/modules/language/images/ARA_flag.png
+lib/enlightenment/modules/language/images/TUR_flag.png
 lib/enlightenment/modules/language/images/GRE_flag.png
-lib/enlightenment/modules/language/images/HRV_flag.png
-lib/enlightenment/modules/language/images/HUN_flag.png
-lib/enlightenment/modules/language/images/IND_flag.png
-lib/enlightenment/modules/language/images/IRL_flag.png
-lib/enlightenment/modules/language/images/IRN_flag.png
-lib/enlightenment/modules/language/images/ISL_flag.png
-lib/enlightenment/modules/language/images/ISR_flag.png
-lib/enlightenment/modules/language/images/ITA_flag.png
+lib/enlightenment/modules/language/images/UKR_flag.png
 lib/enlightenment/modules/language/images/JPN_flag.png
-lib/enlightenment/modules/language/images/KAZ_flag.png
-lib/enlightenment/modules/language/images/KHM_flag.png
-lib/enlightenment/modules/language/images/KYR_flag.png
-lib/enlightenment/modules/language/images/LAO_flag.png
-lib/enlightenment/modules/language/images/LTU_flag.png
-lib/enlightenment/modules/language/images/LVA_flag.png
+lib/enlightenment/modules/language/images/SRL_flag.png
 lib/enlightenment/modules/language/images/MAL_flag.png
-lib/enlightenment/modules/language/images/MAO_flag.png
-lib/enlightenment/modules/language/images/MKD_flag.png
+lib/enlightenment/modules/language/images/ISR_flag.png
+lib/enlightenment/modules/language/images/ISL_flag.png
+lib/enlightenment/modules/language/images/ALB_flag.png
 lib/enlightenment/modules/language/images/MLT_flag.png
-lib/enlightenment/modules/language/images/MMR_flag.png
-lib/enlightenment/modules/language/images/MNG_flag.png
+lib/enlightenment/modules/language/images/BIH_flag.png
+lib/enlightenment/modules/language/images/LAO_flag.png
+lib/enlightenment/modules/language/images/IRL_flag.png
+lib/enlightenment/modules/language/images/GHA_flag.png
+lib/enlightenment/modules/language/images/LVA_flag.png
 lib/enlightenment/modules/language/images/NLD_flag.png
-lib/enlightenment/modules/language/images/NOR_flag.png
-lib/enlightenment/modules/language/images/PAK_flag.png
-lib/enlightenment/modules/language/images/POL_flag.png
-lib/enlightenment/modules/language/images/PRT_flag.png
-lib/enlightenment/modules/language/images/ROU_flag.png
-lib/enlightenment/modules/language/images/RUS_flag.png
-lib/enlightenment/modules/language/images/SCG_flag.png
-lib/enlightenment/modules/language/images/SRL_flag.png
-lib/enlightenment/modules/language/images/SVK_flag.png
-lib/enlightenment/modules/language/images/SVN_flag.png
-lib/enlightenment/modules/language/images/SWE_flag.png
-lib/enlightenment/modules/language/images/SYR_flag.png
-lib/enlightenment/modules/language/images/THA_flag.png
+lib/enlightenment/modules/language/images/GBR_flag.png
+lib/enlightenment/modules/language/images/FAO_flag.png
+lib/enlightenment/modules/language/images/BLR_flag.png
+lib/enlightenment/modules/language/images/BHU_flag.png
+lib/enlightenment/modules/language/images/ARM_flag.png
+lib/enlightenment/modules/language/images/MAO_flag.png
+lib/enlightenment/modules/language/images/FIN_flag.png
+lib/enlightenment/modules/language/images/KAZ_flag.png
+lib/enlightenment/modules/language/images/IND_flag.png
+lib/enlightenment/modules/language/images/AFG_flag.png
 lib/enlightenment/modules/language/images/TJK_flag.png
-lib/enlightenment/modules/language/images/TUR_flag.png
-lib/enlightenment/modules/language/images/UKR_flag.png
-lib/enlightenment/modules/language/images/USA_flag.png
+lib/enlightenment/modules/language/images/KHM_flag.png
 lib/enlightenment/modules/language/images/UZB_flag.png
+lib/enlightenment/modules/language/images/CAN_flag.png
 lib/enlightenment/modules/language/images/VNM_flag.png
+lib/enlightenment/modules/language/images/EPO_flag.png
+lib/enlightenment/modules/language/images/NOR_flag.png
+lib/enlightenment/modules/language/images/PRT_flag.png
 lib/enlightenment/modules/language/images/ZAR_flag.png
-lib/enlightenment/modules/language/images/unknown_flag.png
-lib/enlightenment/modules/language/language.edj
-lib/enlightenment/modules/language/e-module-language.edj
+lib/enlightenment/modules/language/images/CZE_flag.png
+lib/enlightenment/modules/language/images/BRA_flag.png
+lib/enlightenment/modules/language/images/BEL_flag.png
+lib/enlightenment/modules/language/images/MNG_flag.png
+lib/enlightenment/modules/language/images/BGR_flag.png
+lib/enlightenment/modules/language/images/IRN_flag.png
+lib/enlightenment/modules/language/images/ITA_flag.png
+lib/enlightenment/modules/language/images/SVN_flag.png
+lib/enlightenment/modules/language/images/RUS_flag.png
+lib/enlightenment/modules/language/images/AZE_flag.png
+lib/enlightenment/modules/language/images/ESP_flag.png
+lib/enlightenment/modules/language/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/language/module.desktop
-%%NLS%%lib/enlightenment/modules/language/locale/eo/LC_MESSAGES/language.mo
-%%NLS%%lib/enlightenment/modules/language/locale/fi/LC_MESSAGES/language.mo
 %%NLS%%lib/enlightenment/modules/language/locale/fr/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/nl/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/cs/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/ar/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/lt/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/es/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/pl/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/hu/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/fo/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/nb/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/hr/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/bg/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/pt_BR/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/sk/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/tr/LC_MESSAGES/language.mo
 %%NLS%%lib/enlightenment/modules/language/locale/it/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/eo/LC_MESSAGES/language.mo
 %%NLS%%lib/enlightenment/modules/language/locale/sv/LC_MESSAGES/language.mo
-%%NLS%%@dirrm lib/enlightenment/modules/language/locale/eo/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/language/locale/eo
+%%NLS%%lib/enlightenment/modules/language/locale/fi/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/pt/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/ru/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/zh_CN/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/ja/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/de/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/uk/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/el/LC_MESSAGES/language.mo
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/pt
 %%NLS%%@dirrm lib/enlightenment/modules/language/locale/fi/LC_MESSAGES
 %%NLS%%@dirrm lib/enlightenment/modules/language/locale/fi
-%%NLS%%@dirrm lib/enlightenment/modules/language/locale/fr/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/language/locale/fr
-%%NLS%%@dirrm lib/enlightenment/modules/language/locale/it/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/language/locale/it
 %%NLS%%@dirrm lib/enlightenment/modules/language/locale/sv/LC_MESSAGES
 %%NLS%%@dirrm lib/enlightenment/modules/language/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/nb/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/nb
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/fo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/fo
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/fr
 %%NLS%%@dirrm lib/enlightenment/modules/language/locale
-@dirrm lib/enlightenment/modules/language/images
 @dirrm lib/enlightenment/modules/language/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/language/images
 @dirrm lib/enlightenment/modules/language
 @dirrmtry lib/enlightenment/modules
 @dirrmtry lib/enlightenment