3 files changed, 85 insertions, 22 deletions

diff --git a/x11-wm/e17-module-moon/Makefile b/x11-wm/e17-module-moon/Makefile
index 56b9e6e0a789..d97a50140342 100644
--- a/x11-wm/e17-module-moon/Makefile
+++ b/x11-wm/e17-module-moon/Makefile
@@ -6,25 +6,25 @@
 #
 
 PORTNAME=	moon
-PORTVERSION=	20080223
-PORTREVISION=	5
+PORTVERSION=	20101003
 PORTEPOCH=	1
-CATEGORIES=	x11-wm
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
+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 Moon Clock 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_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-moon/distinfo b/x11-wm/e17-module-moon/distinfo
index 985c259b8383..cb08da518d0c 100644
--- a/x11-wm/e17-module-moon/distinfo
+++ b/x11-wm/e17-module-moon/distinfo
@@ -1,3 +1,2 @@
-MD5 (moon-20080223.tar.bz2) = 77f4e625f597799c5bf160cbabfc1601
-SHA256 (moon-20080223.tar.bz2) = 0b8bd6bfe7147bbadddd642b35cb1d89a11d2bb5f1ad6f448185ebf948e85e62
-SIZE (moon-20080223.tar.bz2) = 648718
+SHA256 (e17/moon-20101003.tar.bz2) = 0eb8237564f3b819f898cb7f46e50917940ac8a6505af8dc6b4179d860426d94
+SIZE (e17/moon-20101003.tar.bz2) = 916374
diff --git a/x11-wm/e17-module-moon/pkg-plist b/x11-wm/e17-module-moon/pkg-plist
index fb85cb2abbce..e09dc5ffdf25 100644
--- a/x11-wm/e17-module-moon/pkg-plist
+++ b/x11-wm/e17-module-moon/pkg-plist
@@ -1,24 +1,88 @@
-lib/enlightenment/modules/moon/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/moon/%%E17_ARCH%%/module.la
-lib/enlightenment/modules/moon/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/moon/module.desktop
 lib/enlightenment/modules/moon/e-module-moon.edj
 lib/enlightenment/modules/moon/moon.edj
-%%NLS%%lib/enlightenment/modules/moon/locale/eo/LC_MESSAGES/moon.mo
-%%NLS%%lib/enlightenment/modules/moon/locale/fi/LC_MESSAGES/moon.mo
+lib/enlightenment/modules/moon/module.desktop
+lib/enlightenment/modules/moon/%%E17_ARCH%%/module.so
 %%NLS%%lib/enlightenment/modules/moon/locale/it/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/eo/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/tr/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/sk/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/pt_BR/LC_MESSAGES/moon.mo
 %%NLS%%lib/enlightenment/modules/moon/locale/ja/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/de/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/uk/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/el/LC_MESSAGES/moon.mo
 %%NLS%%lib/enlightenment/modules/moon/locale/sv/LC_MESSAGES/moon.mo
-%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/eo/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/eo
+%%NLS%%lib/enlightenment/modules/moon/locale/fi/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/pt/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/ru/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/cs/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/he/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/ar/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/km/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/lt/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/fr/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/zh_CN/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/nl/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/nb/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/hr/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/bg/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/es/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/pl/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/hu/LC_MESSAGES/moon.mo
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/nb/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/nb
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/km/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/km
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/pt
 %%NLS%%@dirrm lib/enlightenment/modules/moon/locale/fi/LC_MESSAGES
 %%NLS%%@dirrm lib/enlightenment/modules/moon/locale/fi
-%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/it/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/it
-%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/ja/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/ja
 %%NLS%%@dirrm lib/enlightenment/modules/moon/locale/sv/LC_MESSAGES
 %%NLS%%@dirrm lib/enlightenment/modules/moon/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/it
 %%NLS%%@dirrm lib/enlightenment/modules/moon/locale
 @dirrm lib/enlightenment/modules/moon/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/moon