3 files changed, 84 insertions, 15 deletions

diff --git a/x11-wm/e17-module-mail/Makefile b/x11-wm/e17-module-mail/Makefile
index 8ab08f97bfea..dd84ea697959 100644
--- a/x11-wm/e17-module-mail/Makefile
+++ b/x11-wm/e17-module-mail/Makefile
@@ -6,25 +6,25 @@
 #
 
 PORTNAME=	mail
-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 check your mailboxes (like xbiff does)
 
-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
+USE_EFL=	edje libtool_hack modarch_hack
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git a/x11-wm/e17-module-mail/distinfo b/x11-wm/e17-module-mail/distinfo
index 8c332f9f87e6..9751e880e0b7 100644
--- a/x11-wm/e17-module-mail/distinfo
+++ b/x11-wm/e17-module-mail/distinfo
@@ -1,3 +1,2 @@
-MD5 (mail-20080223.tar.bz2) = b98d34ad295095779e5c8a2286e77f62
-SHA256 (mail-20080223.tar.bz2) = 0bc096b188c0dae6347cd8acb7e7b806fb21b7263181b6e1e1e53c10977c7581
-SIZE (mail-20080223.tar.bz2) = 304423
+SHA256 (e17/mail-20101003.tar.bz2) = 1a3d82b12c772fe9bc042396cad86525a5ea1fdf8397bc974e72b9c418754276
+SIZE (e17/mail-20101003.tar.bz2) = 518882
diff --git a/x11-wm/e17-module-mail/pkg-plist b/x11-wm/e17-module-mail/pkg-plist
index 5fe294a96b64..d5b898619773 100644
--- a/x11-wm/e17-module-mail/pkg-plist
+++ b/x11-wm/e17-module-mail/pkg-plist
@@ -1,13 +1,83 @@
-lib/enlightenment/modules/mail/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/mail/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/mail/module.desktop
+lib/enlightenment/modules/mail/e-module-mail.edj
 lib/enlightenment/modules/mail/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/mail/mail.edj
-lib/enlightenment/modules/mail/e-module-mail.edj
-lib/enlightenment/modules/mail/module.desktop
-%%NLS%%lib/enlightenment/modules/mail/locale/fi/LC_MESSAGES/mail.mo
 %%NLS%%lib/enlightenment/modules/mail/locale/it/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/eo/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/tr/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/sk/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/de/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/ja/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/uk/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/el/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/th/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/zh_CN/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/fi/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/sv/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/pt/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/ru/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/cs/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/he/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/ar/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/lt/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/fr/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/nl/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/hr/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/bg/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/pl/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/es/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/hu/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/pt_BR/LC_MESSAGES/mail.mo
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/sv
 %%NLS%%@dirrm lib/enlightenment/modules/mail/locale/fi/LC_MESSAGES
 %%NLS%%@dirrm lib/enlightenment/modules/mail/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/th/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/th
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/eo
 %%NLS%%@dirrm lib/enlightenment/modules/mail/locale/it/LC_MESSAGES
 %%NLS%%@dirrm lib/enlightenment/modules/mail/locale/it
 %%NLS%%@dirrm lib/enlightenment/modules/mail/locale