3 files changed, 31 insertions, 9 deletions

diff --git a/x11-wm/e17-module-language/Makefile b/x11-wm/e17-module-language/Makefile
index 8107c559daaf..5bdd82fadb41 100644
--- a/x11-wm/e17-module-language/Makefile
+++ b/x11-wm/e17-module-language/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	language
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 PKGNAMEPREFIX=	e17-module-
@@ -25,5 +25,14 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget pkgconfig
 USE_EFL=	edje exml
+USE_XORG=	x11 xkbfile
+
+.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-language/distinfo b/x11-wm/e17-module-language/distinfo
index 72899efb161e..1a265df3bc05 100644
--- a/x11-wm/e17-module-language/distinfo
+++ b/x11-wm/e17-module-language/distinfo
@@ -1,3 +1,3 @@
-MD5 (language-20070223.tar.bz2) = 7c915bfbb7bd52e9d0943488c0212a1d
-SHA256 (language-20070223.tar.bz2) = f80623d4ab1b6b259d21d546493fde30892aaf59b5c165dd017a7ab4a0608334
-SIZE (language-20070223.tar.bz2) = 456281
+MD5 (language-20080223.tar.bz2) = 9a2fb69f4f2681d32215ae85b03667f4
+SHA256 (language-20080223.tar.bz2) = 073208e8874627682101f9a373188a481baa24261f3c1b820bcf2197d0837ec9
+SIZE (language-20080223.tar.bz2) = 405615
diff --git a/x11-wm/e17-module-language/pkg-plist b/x11-wm/e17-module-language/pkg-plist
index b4a26ed34c97..86b38fe3bd9b 100644
--- a/x11-wm/e17-module-language/pkg-plist
+++ b/x11-wm/e17-module-language/pkg-plist
@@ -73,11 +73,24 @@ lib/enlightenment/modules/language/images/VNM_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/module.desktop
-lib/enlightenment/modules/language/module.edj
-share/locale/eo/LC_MESSAGES/language.mo
-share/locale/it/LC_MESSAGES/language.mo
-share/locale/sv/LC_MESSAGES/language.mo
+%%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/it/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%%@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
 @dirrm lib/enlightenment/modules/language/images
 @dirrm lib/enlightenment/modules/language/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/language