3 files changed, 86 insertions, 26 deletions

diff --git a/x11-wm/e17-module-cpu/Makefile b/x11-wm/e17-module-cpu/Makefile
index 6ae9e5e58463..3284bc4a7561 100644
--- a/x11-wm/e17-module-cpu/Makefile
+++ b/x11-wm/e17-module-cpu/Makefile
@@ -6,24 +6,24 @@
 #
 
 PORTNAME=	cpu
-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 which allows users to monitor cpu load
 
-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
-GNU_CONFIGURE=	yes
+USE_EFL=	edje libtool_hack modarch_hack
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git a/x11-wm/e17-module-cpu/distinfo b/x11-wm/e17-module-cpu/distinfo
index 70530f65d7a2..3c6cdcb3b26e 100644
--- a/x11-wm/e17-module-cpu/distinfo
+++ b/x11-wm/e17-module-cpu/distinfo
@@ -1,3 +1,2 @@
-MD5 (cpu-20080223.tar.bz2) = 3b05b752b4580e74bcdfa81182b0a942
-SHA256 (cpu-20080223.tar.bz2) = a91b07fa671037b4add7af40e811730b1c7f09584b1965509a801d7306701950
-SIZE (cpu-20080223.tar.bz2) = 271713
+SHA256 (e17/cpu-20101003.tar.bz2) = 2b57fca0d621767f720eb652ffea60911c9d73ce1f6fca66c97b5e34323adc19
+SIZE (e17/cpu-20101003.tar.bz2) = 492973
diff --git a/x11-wm/e17-module-cpu/pkg-plist b/x11-wm/e17-module-cpu/pkg-plist
index 79b81ddb6f3a..3460d66b78cb 100644
--- a/x11-wm/e17-module-cpu/pkg-plist
+++ b/x11-wm/e17-module-cpu/pkg-plist
@@ -1,30 +1,91 @@
 lib/enlightenment/modules/cpu/cpu.edj
-lib/enlightenment/modules/cpu/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/cpu/%%E17_ARCH%%/module.la
-lib/enlightenment/modules/cpu/%%E17_ARCH%%/module.so
 lib/enlightenment/modules/cpu/module.desktop
 lib/enlightenment/modules/cpu/e-module-cpu.edj
-%%NLS%%lib/enlightenment/modules/cpu/locale/eo/LC_MESSAGES/cpu.mo
+lib/enlightenment/modules/cpu/%%E17_ARCH%%/module.so
+%%NLS%%lib/enlightenment/modules/cpu/locale/hr/LC_MESSAGES/cpu.mo
 %%NLS%%lib/enlightenment/modules/cpu/locale/bg/LC_MESSAGES/cpu.mo
-%%NLS%%lib/enlightenment/modules/cpu/locale/fi/LC_MESSAGES/cpu.mo
-%%NLS%%lib/enlightenment/modules/cpu/locale/it/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/nb/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/pl/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/es/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/fo/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/hu/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/he/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/ar/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/lt/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/cs/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/nl/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/zh_CN/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/fr/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/el/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/de/LC_MESSAGES/cpu.mo
 %%NLS%%lib/enlightenment/modules/cpu/locale/ja/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/uk/LC_MESSAGES/cpu.mo
 %%NLS%%lib/enlightenment/modules/cpu/locale/ru/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/fi/LC_MESSAGES/cpu.mo
 %%NLS%%lib/enlightenment/modules/cpu/locale/sv/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/pt/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/eo/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/it/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/da/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/tr/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/pt_BR/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/sk/LC_MESSAGES/cpu.mo
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/da/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/da
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/it
 %%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/eo/LC_MESSAGES
 %%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/eo
-%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/bg/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/sv
 %%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/fi/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/fi                                     
-%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/it/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/it                                     
-%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ja/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/fi
 %%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ru/LC_MESSAGES
 %%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ru
-%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/sv/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/fo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/fo
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/nb/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/nb
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/hr
 %%NLS%%@dirrm lib/enlightenment/modules/cpu/locale
 @dirrm lib/enlightenment/modules/cpu/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/cpu