aboutsummaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorStanislav Sedov <stas@FreeBSD.org>2008-03-11 21:13:53 +0000
committerStanislav Sedov <stas@FreeBSD.org>2008-03-11 21:13:53 +0000
commit9a2e4c8b780fc607dc4b4adabefb354c84401a96 (patch)
treef59767aed29b447d3d80ab987e898598663c27e3 /x11-wm
parent621c804e48a9fdddd6a00d78585fa8cb20c8460e (diff)
downloadports-9a2e4c8b780fc607dc4b4adabefb354c84401a96.tar.gz
ports-9a2e4c8b780fc607dc4b4adabefb354c84401a96.zip
Notes
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/e16/Makefile5
-rw-r--r--x11-wm/e17-module-calendar/Makefile11
-rw-r--r--x11-wm/e17-module-calendar/distinfo6
-rw-r--r--x11-wm/e17-module-calendar/pkg-plist34
-rw-r--r--x11-wm/e17-module-cpu/Makefile4
-rw-r--r--x11-wm/e17-module-cpu/distinfo6
-rw-r--r--x11-wm/e17-module-cpu/pkg-plist24
-rw-r--r--x11-wm/e17-module-deskshow/Makefile4
-rw-r--r--x11-wm/e17-module-deskshow/distinfo6
-rw-r--r--x11-wm/e17-module-deskshow/pkg-plist3
-rw-r--r--x11-wm/e17-module-flame/Makefile4
-rw-r--r--x11-wm/e17-module-flame/distinfo6
-rw-r--r--x11-wm/e17-module-flame/pkg-plist19
-rw-r--r--x11-wm/e17-module-language/Makefile13
-rw-r--r--x11-wm/e17-module-language/distinfo6
-rw-r--r--x11-wm/e17-module-language/pkg-plist21
-rw-r--r--x11-wm/e17-module-mail/Makefile12
-rw-r--r--x11-wm/e17-module-mail/distinfo6
-rw-r--r--x11-wm/e17-module-mail/pkg-plist11
-rw-r--r--x11-wm/e17-module-mem/Makefile4
-rw-r--r--x11-wm/e17-module-mem/distinfo6
-rw-r--r--x11-wm/e17-module-mem/pkg-plist28
-rw-r--r--x11-wm/e17-module-mixer/Makefile4
-rw-r--r--x11-wm/e17-module-mixer/distinfo6
-rw-r--r--x11-wm/e17-module-mixer/pkg-plist14
-rw-r--r--x11-wm/e17-module-moon/Makefile4
-rw-r--r--x11-wm/e17-module-moon/distinfo6
-rw-r--r--x11-wm/e17-module-moon/pkg-plist22
-rw-r--r--x11-wm/e17-module-rain/Makefile4
-rw-r--r--x11-wm/e17-module-rain/distinfo6
-rw-r--r--x11-wm/e17-module-rain/pkg-plist27
-rw-r--r--x11-wm/e17-module-screenshot/Makefile35
-rw-r--r--x11-wm/e17-module-screenshot/distinfo6
-rw-r--r--x11-wm/e17-module-screenshot/pkg-plist11
-rw-r--r--x11-wm/e17-module-slideshow/Makefile4
-rw-r--r--x11-wm/e17-module-slideshow/distinfo6
-rw-r--r--x11-wm/e17-module-slideshow/pkg-plist28
-rw-r--r--x11-wm/e17-module-snow/Makefile4
-rw-r--r--x11-wm/e17-module-snow/distinfo6
-rw-r--r--x11-wm/e17-module-snow/pkg-plist27
-rw-r--r--x11-wm/e17-module-uptime/Makefile4
-rw-r--r--x11-wm/e17-module-uptime/distinfo6
-rw-r--r--x11-wm/e17-module-uptime/pkg-plist37
-rw-r--r--x11-wm/e17-module-weather/Makefile4
-rw-r--r--x11-wm/e17-module-weather/distinfo6
-rw-r--r--x11-wm/e17-module-weather/pkg-plist85
-rw-r--r--x11-wm/e17-module-winselector/Makefile4
-rw-r--r--x11-wm/e17-module-winselector/distinfo6
-rw-r--r--x11-wm/e17-module-winselector/pkg-plist3
-rw-r--r--x11-wm/e17-utils/Makefile50
-rw-r--r--x11-wm/e17-utils/distinfo6
-rw-r--r--x11-wm/e17-utils/pkg-plist23
-rw-r--r--x11-wm/enlightenment-devel/Makefile14
-rw-r--r--x11-wm/enlightenment-devel/distinfo6
-rw-r--r--x11-wm/enlightenment-devel/files/patch-src_bin_Makefile.in11
-rw-r--r--x11-wm/enlightenment-devel/files/patch-src_modules_cpufreq_Makefile.in11
-rw-r--r--x11-wm/enlightenment-devel/pkg-plist411
-rw-r--r--x11-wm/enlightenment/Makefile5
-rw-r--r--x11-wm/fluxbox/Makefile3
-rw-r--r--x11-wm/fluxspace/Makefile6
-rw-r--r--x11-wm/kahakai/Makefile6
-rw-r--r--x11-wm/phluid/Makefile5
-rw-r--r--x11-wm/skippy/Makefile6
-rw-r--r--x11-wm/waimea/Makefile4
64 files changed, 857 insertions, 324 deletions
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index 1dc69ad6a68b..ad3a4fe906a0 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -7,6 +7,7 @@
PORTNAME= enlightenment
PORTVERSION= 0.16.8.12
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,8 +16,7 @@ DISTNAME= e16-${PORTVERSION}-0.01
MAINTAINER= vanilla@FreeBSD.org
COMMENT= A very artistic X window manager
-LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2 \
- Xft.2:${PORTSDIR}/x11-fonts/libXft
+LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft
DATADIR= ${PREFIX}/share/e16
@@ -24,6 +24,7 @@ USE_X_PREFIX= yes
USE_XORG= xbitmaps
USE_ICONV= yes
USE_GMAKE= yes
+USE_EFL= imlib2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-fsstd --disable-esdtest --disable-dependency-tracking \
--disable-rpath
diff --git a/x11-wm/e17-module-calendar/Makefile b/x11-wm/e17-module-calendar/Makefile
index 72323396da12..724071efdff0 100644
--- a/x11-wm/e17-module-calendar/Makefile
+++ b/x11-wm/e17-module-calendar/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= calendar
-PORTVERSION= 20060926
-PORTREVISION= 1
+PORTVERSION= 20080223
+PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
@@ -27,8 +27,6 @@ USE_EFL= ecore evas edje eet
USE_EFL_ESMART= trans_x11
GNU_CONFIGURE= yes
-IGNORE= doesn't compile with recent e17
-
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
@@ -37,7 +35,4 @@ CONFIGURE_ARGS= --disable-nls
PLIST_SUB+= NLS="@comment "
.endif
-post-patch:
- @${REINPLACE_CMD} -e s,`${PRINTF} '\r'`,,g ${WRKSRC}/src/*.[ch]
-
.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-calendar/distinfo b/x11-wm/e17-module-calendar/distinfo
index 492ca7b8e1dc..c78a68a819af 100644
--- a/x11-wm/e17-module-calendar/distinfo
+++ b/x11-wm/e17-module-calendar/distinfo
@@ -1,3 +1,3 @@
-MD5 (calendar-20060926.tar.bz2) = a7c47f3efc02a2688ce4b8cc3fe2a659
-SHA256 (calendar-20060926.tar.bz2) = cdfaa4277375994287149310cf3b2a4be224cd38304ff3909f99006c55ec9331
-SIZE (calendar-20060926.tar.bz2) = 552639
+MD5 (calendar-20080223.tar.bz2) = 71d12bd35f1bf10e6b9d7ffdfa7795cd
+SHA256 (calendar-20080223.tar.bz2) = 05a6557c4dbbada9665d340084476b015442daebdf03708ba72fe69dc9ed0b5d
+SIZE (calendar-20080223.tar.bz2) = 305824
diff --git a/x11-wm/e17-module-calendar/pkg-plist b/x11-wm/e17-module-calendar/pkg-plist
index e74419126e29..ccaf607ad5bd 100644
--- a/x11-wm/e17-module-calendar/pkg-plist
+++ b/x11-wm/e17-module-calendar/pkg-plist
@@ -1,23 +1,15 @@
-lib/enlightenment/modules/calendar/NoImage_icon.png
-lib/enlightenment/modules/calendar/arrow.edj
-lib/enlightenment/modules/calendar/backimage.edj
lib/enlightenment/modules/calendar/calendar.edj
-lib/enlightenment/modules/calendar/label.edj
-lib/enlightenment/modules/calendar/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/calendar/module.eap
-lib/enlightenment/modules/calendar/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/calendar/%%MODULE_ARCH%%/module.so
-lib/enlightenment/modules/calendar/module_icon.png
-lib/enlightenment/modules/calendar/today.edj
-lib/enlightenment/modules/calendar/topimage.edj
-lib/enlightenment/modules/calendar/weekday.edj
-lib/enlightenment/modules/calendar/weekend.edj
-%%NLS%%share/locale/bg/LC_MESSAGES/calendar.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/calendar.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/calendar.mo
-%%NLS%%share/locale/it/LC_MESSAGES/calendar.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/calendar.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/calendar.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/calendar.mo
-@dirrm lib/enlightenment/modules/calendar/%%MODULE_ARCH%%
+lib/enlightenment/modules/calendar/e-module-calendar.edj
+lib/enlightenment/modules/calendar/module.desktop
+lib/enlightenment/modules/calendar/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/calendar/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/calendar/%%E17_ARCH%%/module.so
+%%NLS%%lib/enlightenment/modules/calendar/locale/fi/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/it/LC_MESSAGES/calendar.mo
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale
+@dirrm lib/enlightenment/modules/calendar/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/calendar
diff --git a/x11-wm/e17-module-cpu/Makefile b/x11-wm/e17-module-cpu/Makefile
index f6e16b1af42b..bfb3453c3df8 100644
--- a/x11-wm/e17-module-cpu/Makefile
+++ b/x11-wm/e17-module-cpu/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= cpu
-PORTVERSION= 20070223
-PORTREVISION= 1
+PORTVERSION= 20080223
+PORTREVISION= 0
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-cpu/distinfo b/x11-wm/e17-module-cpu/distinfo
index eab0e6c2036e..70530f65d7a2 100644
--- a/x11-wm/e17-module-cpu/distinfo
+++ b/x11-wm/e17-module-cpu/distinfo
@@ -1,3 +1,3 @@
-MD5 (cpu-20070223.tar.bz2) = 30e514b12b1962bdccc25efe7fdb01b6
-SHA256 (cpu-20070223.tar.bz2) = a4ff1df53f919f0b101eaf335038a88e6d8712a1648528982e411a3805d75b96
-SIZE (cpu-20070223.tar.bz2) = 261528
+MD5 (cpu-20080223.tar.bz2) = 3b05b752b4580e74bcdfa81182b0a942
+SHA256 (cpu-20080223.tar.bz2) = a91b07fa671037b4add7af40e811730b1c7f09584b1965509a801d7306701950
+SIZE (cpu-20080223.tar.bz2) = 271713
diff --git a/x11-wm/e17-module-cpu/pkg-plist b/x11-wm/e17-module-cpu/pkg-plist
index 1f5208e5a15b..79b81ddb6f3a 100644
--- a/x11-wm/e17-module-cpu/pkg-plist
+++ b/x11-wm/e17-module-cpu/pkg-plist
@@ -3,7 +3,29 @@ 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/module.edj
+lib/enlightenment/modules/cpu/e-module-cpu.edj
+%%NLS%%lib/enlightenment/modules/cpu/locale/eo/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/ja/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/ru/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/sv/LC_MESSAGES/cpu.mo
+%%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/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/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
@dirrm lib/enlightenment/modules/cpu/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/cpu
@dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-deskshow/Makefile b/x11-wm/e17-module-deskshow/Makefile
index dae67ad0b679..8b76593f0255 100644
--- a/x11-wm/e17-module-deskshow/Makefile
+++ b/x11-wm/e17-module-deskshow/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= deskshow
-PORTVERSION= 20070223
-PORTREVISION= 1
+PORTVERSION= 20080223
+PORTREVISION= 0
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-deskshow/distinfo b/x11-wm/e17-module-deskshow/distinfo
index 02a446cb2b0d..733891cfa3a2 100644
--- a/x11-wm/e17-module-deskshow/distinfo
+++ b/x11-wm/e17-module-deskshow/distinfo
@@ -1,3 +1,3 @@
-MD5 (deskshow-20070223.tar.bz2) = a18ff84163447ea899cc21ff71718f0c
-SHA256 (deskshow-20070223.tar.bz2) = 98b1b9138fa75d43a8e4a2c9c461007bf3129d5aa934798241e12c22b12bdfb5
-SIZE (deskshow-20070223.tar.bz2) = 281233
+MD5 (deskshow-20080223.tar.bz2) = d7d969b736b436930d35e56a9406ed0c
+SHA256 (deskshow-20080223.tar.bz2) = dcf5e551c191e485a1beece04f986babdfc3bf45f70a0d2915e9a18c71c7d972
+SIZE (deskshow-20080223.tar.bz2) = 252520
diff --git a/x11-wm/e17-module-deskshow/pkg-plist b/x11-wm/e17-module-deskshow/pkg-plist
index a5528559f717..b63bdae99989 100644
--- a/x11-wm/e17-module-deskshow/pkg-plist
+++ b/x11-wm/e17-module-deskshow/pkg-plist
@@ -3,8 +3,7 @@ lib/enlightenment/modules/deskshow/%%E17_ARCH%%/module.a
lib/enlightenment/modules/deskshow/%%E17_ARCH%%/module.la
lib/enlightenment/modules/deskshow/%%E17_ARCH%%/module.so
lib/enlightenment/modules/deskshow/module.desktop
-lib/enlightenment/modules/deskshow/module.edj
-lib/enlightenment/modules/deskshow/module_icon.png
+lib/enlightenment/modules/deskshow/e-module-deskshow.edj
@dirrm lib/enlightenment/modules/deskshow/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/deskshow
@dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-flame/Makefile b/x11-wm/e17-module-flame/Makefile
index 278fe318b88c..510f458c9689 100644
--- a/x11-wm/e17-module-flame/Makefile
+++ b/x11-wm/e17-module-flame/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= flame
-PORTVERSION= 20070223
-PORTREVISION= 1
+PORTVERSION= 20080223
+PORTREVISION= 0
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-flame/distinfo b/x11-wm/e17-module-flame/distinfo
index 7b40e0f4f2dc..69ba773e3ed1 100644
--- a/x11-wm/e17-module-flame/distinfo
+++ b/x11-wm/e17-module-flame/distinfo
@@ -1,3 +1,3 @@
-MD5 (flame-20070223.tar.bz2) = 4fbb97b86add29eef207cda3dd802468
-SHA256 (flame-20070223.tar.bz2) = 18f81de98337826d04716278fe12efc7f0043cfe05f391b21e93ef9777be8738
-SIZE (flame-20070223.tar.bz2) = 278915
+MD5 (flame-20080223.tar.bz2) = a6bc14b59ea1c7d40d0994aaf7545fff
+SHA256 (flame-20080223.tar.bz2) = 242a5e4be9cc8863ef4b95fb71b9e305a6eaa08baa9c7ef85ab6c5d4faad38e9
+SIZE (flame-20080223.tar.bz2) = 229806
diff --git a/x11-wm/e17-module-flame/pkg-plist b/x11-wm/e17-module-flame/pkg-plist
index 6651443c6b32..76d917dd30f9 100644
--- a/x11-wm/e17-module-flame/pkg-plist
+++ b/x11-wm/e17-module-flame/pkg-plist
@@ -2,11 +2,20 @@ lib/enlightenment/modules/flame/%%E17_ARCH%%/module.a
lib/enlightenment/modules/flame/%%E17_ARCH%%/module.la
lib/enlightenment/modules/flame/%%E17_ARCH%%/module.so
lib/enlightenment/modules/flame/module.desktop
-lib/enlightenment/modules/flame/module.edj
-%%NLS%%share/locale/eo/LC_MESSAGES/flame.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/flame.mo
-%%NLS%%share/locale/it/LC_MESSAGES/flame.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/flame.mo
+lib/enlightenment/modules/flame/e-module-flame.edj
+%%NLS%%lib/enlightenment/modules/flame/locale/eo/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/fi/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/it/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/ja/LC_MESSAGES/flame.mo
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale
@dirrm lib/enlightenment/modules/flame/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/flame
@dirrmtry lib/enlightenment/modules
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
diff --git a/x11-wm/e17-module-mail/Makefile b/x11-wm/e17-module-mail/Makefile
index 2e61a02d11ef..cf89623fea6d 100644
--- a/x11-wm/e17-module-mail/Makefile
+++ b/x11-wm/e17-module-mail/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= mail
-PORTVERSION= 20070223
-PORTREVISION= 1
+PORTVERSION= 20080223
+PORTREVISION= 0
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
@@ -26,4 +26,12 @@ USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
USE_EFL= edje
+.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-mail/distinfo b/x11-wm/e17-module-mail/distinfo
index 2d267b2dcf5d..8c332f9f87e6 100644
--- a/x11-wm/e17-module-mail/distinfo
+++ b/x11-wm/e17-module-mail/distinfo
@@ -1,3 +1,3 @@
-MD5 (mail-20070223.tar.bz2) = c300a031aa7e68ad4f45305e3a4bacbd
-SHA256 (mail-20070223.tar.bz2) = b3ef91549cc061904d8aea7e9a9ac44066fcdfe951bfb6da214afc11ea055207
-SIZE (mail-20070223.tar.bz2) = 344411
+MD5 (mail-20080223.tar.bz2) = b98d34ad295095779e5c8a2286e77f62
+SHA256 (mail-20080223.tar.bz2) = 0bc096b188c0dae6347cd8acb7e7b806fb21b7263181b6e1e1e53c10977c7581
+SIZE (mail-20080223.tar.bz2) = 304423
diff --git a/x11-wm/e17-module-mail/pkg-plist b/x11-wm/e17-module-mail/pkg-plist
index d32b8e0e82c8..5fe294a96b64 100644
--- a/x11-wm/e17-module-mail/pkg-plist
+++ b/x11-wm/e17-module-mail/pkg-plist
@@ -2,10 +2,15 @@ lib/enlightenment/modules/mail/%%E17_ARCH%%/module.a
lib/enlightenment/modules/mail/%%E17_ARCH%%/module.la
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
-lib/enlightenment/modules/mail/module.edj
-lib/enlightenment/modules/mail/module_icon.png
-share/locale/it/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/fi/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/it/LC_MESSAGES/mail.mo
+%%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/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale
@dirrm lib/enlightenment/modules/mail/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/mail
@dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-mem/Makefile b/x11-wm/e17-module-mem/Makefile
index e2c7d3e74d4b..fdfe07354e25 100644
--- a/x11-wm/e17-module-mem/Makefile
+++ b/x11-wm/e17-module-mem/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= mem
-PORTVERSION= 20070223
-PORTREVISION= 1
+PORTVERSION= 20080223
+PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-wm/e17-module-mem/distinfo b/x11-wm/e17-module-mem/distinfo
index 50f192030695..185749c2a842 100644
--- a/x11-wm/e17-module-mem/distinfo
+++ b/x11-wm/e17-module-mem/distinfo
@@ -1,3 +1,3 @@
-MD5 (mem-20070223.tar.bz2) = 806aae2b3cc2e748a9b26bd8363265ab
-SHA256 (mem-20070223.tar.bz2) = 7d311e2f1efff3e54f33541d338a4ef63a4256e7969f1d7993d84d5a94bceae3
-SIZE (mem-20070223.tar.bz2) = 426211
+MD5 (mem-20080223.tar.bz2) = 835c499960837db2d2db98f6f3dfef37
+SHA256 (mem-20080223.tar.bz2) = c959441f8749f084e9b1967640566e94ba1c13e27a8dceab198fe8aa0726dadf
+SIZE (mem-20080223.tar.bz2) = 383825
diff --git a/x11-wm/e17-module-mem/pkg-plist b/x11-wm/e17-module-mem/pkg-plist
index e6d9793970a2..592205b8e34d 100644
--- a/x11-wm/e17-module-mem/pkg-plist
+++ b/x11-wm/e17-module-mem/pkg-plist
@@ -2,15 +2,27 @@ lib/enlightenment/modules/mem/%%E17_ARCH%%/module.a
lib/enlightenment/modules/mem/%%E17_ARCH%%/module.la
lib/enlightenment/modules/mem/%%E17_ARCH%%/module.so
lib/enlightenment/modules/mem/mem.edj
+lib/enlightenment/modules/mem/e-module-mem.edj
lib/enlightenment/modules/mem/module.desktop
-lib/enlightenment/modules/mem/module.edj
-lib/enlightenment/modules/mem/module_icon.png
-%%NLS%%share/locale/eo/LC_MESSAGES/mem.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/mem.mo
-%%NLS%%share/locale/it/LC_MESSAGES/mem.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/mem.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/mem.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/eo/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/fi/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/it/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/ja/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/ru/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/sv/LC_MESSAGES/mem.mo
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale
@dirrm lib/enlightenment/modules/mem/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/mem
@dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-mixer/Makefile b/x11-wm/e17-module-mixer/Makefile
index f18221d40a69..c3d53eadcd2e 100644
--- a/x11-wm/e17-module-mixer/Makefile
+++ b/x11-wm/e17-module-mixer/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= mixer
-PORTVERSION= 20070223
-PORTREVISION= 1
+PORTVERSION= 20080223
+PORTREVISION= 0
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-mixer/distinfo b/x11-wm/e17-module-mixer/distinfo
index a90a4bba763e..73b0c692169a 100644
--- a/x11-wm/e17-module-mixer/distinfo
+++ b/x11-wm/e17-module-mixer/distinfo
@@ -1,3 +1,3 @@
-MD5 (mixer-20070223.tar.bz2) = cc6f42aa6e610276e24c6751d4dd74c5
-SHA256 (mixer-20070223.tar.bz2) = c59985082b4cadcb9feccf1bc30f436fd1908f32d2f87bf53a9a47eaab6942c6
-SIZE (mixer-20070223.tar.bz2) = 338312
+MD5 (mixer-20080223.tar.bz2) = 578efbd7f92e64532cd1511d0158e8dd
+SHA256 (mixer-20080223.tar.bz2) = 7a6b814bae322e8ac5988f532410ea092967d16f7b3742bd5f2cc01bd672d7ff
+SIZE (mixer-20080223.tar.bz2) = 289275
diff --git a/x11-wm/e17-module-mixer/pkg-plist b/x11-wm/e17-module-mixer/pkg-plist
index 65daad44b823..23d0ae78ed2d 100644
--- a/x11-wm/e17-module-mixer/pkg-plist
+++ b/x11-wm/e17-module-mixer/pkg-plist
@@ -2,10 +2,18 @@ lib/enlightenment/modules/mixer/%%E17_ARCH%%/module.a
lib/enlightenment/modules/mixer/%%E17_ARCH%%/module.la
lib/enlightenment/modules/mixer/%%E17_ARCH%%/module.so
lib/enlightenment/modules/mixer/mixer.edj
+lib/enlightenment/modules/mixer/e-module-mixer.edj
lib/enlightenment/modules/mixer/module.desktop
-lib/enlightenment/modules/mixer/module.edj
-%%NLS%%share/locale/it/LC_MESSAGES/mixer.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/mixer.mo
+%%NLS%%lib/enlightenment/modules/mixer/locale/fi/LC_MESSAGES/mixer.mo
+%%NLS%%lib/enlightenment/modules/mixer/locale/it/LC_MESSAGES/mixer.mo
+%%NLS%%lib/enlightenment/modules/mixer/locale/sv/LC_MESSAGES/mixer.mo
+%%NLS%%@dirrm lib/enlightenment/modules/mixer/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mixer/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/mixer/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mixer/locale/it/
+%%NLS%%@dirrm lib/enlightenment/modules/mixer/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mixer/locale/sv/
+%%NLS%%@dirrm lib/enlightenment/modules/mixer/locale
@dirrm lib/enlightenment/modules/mixer/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/mixer
@dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-moon/Makefile b/x11-wm/e17-module-moon/Makefile
index 01eee6b51d99..5c5afc33b2b5 100644
--- a/x11-wm/e17-module-moon/Makefile
+++ b/x11-wm/e17-module-moon/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= moon
-PORTVERSION= 20070223
-PORTREVISION= 1
+PORTVERSION= 20080223
+PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-wm/e17-module-moon/distinfo b/x11-wm/e17-module-moon/distinfo
index b686069e9d75..985c259b8383 100644
--- a/x11-wm/e17-module-moon/distinfo
+++ b/x11-wm/e17-module-moon/distinfo
@@ -1,3 +1,3 @@
-MD5 (moon-20070223.tar.bz2) = a110d53bc5a05297e93a3a1eb05c9c11
-SHA256 (moon-20070223.tar.bz2) = 4e387eabe35435c61da7fd84a33cad8f8f3db31092c44bdf65834273f5f4a775
-SIZE (moon-20070223.tar.bz2) = 699637
+MD5 (moon-20080223.tar.bz2) = 77f4e625f597799c5bf160cbabfc1601
+SHA256 (moon-20080223.tar.bz2) = 0b8bd6bfe7147bbadddd642b35cb1d89a11d2bb5f1ad6f448185ebf948e85e62
+SIZE (moon-20080223.tar.bz2) = 648718
diff --git a/x11-wm/e17-module-moon/pkg-plist b/x11-wm/e17-module-moon/pkg-plist
index 9e45a173c835..fb85cb2abbce 100644
--- a/x11-wm/e17-module-moon/pkg-plist
+++ b/x11-wm/e17-module-moon/pkg-plist
@@ -2,12 +2,24 @@ 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/module.edj
+lib/enlightenment/modules/moon/e-module-moon.edj
lib/enlightenment/modules/moon/moon.edj
-%%NLS%%share/locale/eo/LC_MESSAGES/moon.mo
-%%NLS%%share/locale/it/LC_MESSAGES/moon.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/moon.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/eo/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/fi/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/it/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/ja/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%%@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
@dirrm lib/enlightenment/modules/moon/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/moon
@dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-rain/Makefile b/x11-wm/e17-module-rain/Makefile
index 155c65f629b1..71527be76277 100644
--- a/x11-wm/e17-module-rain/Makefile
+++ b/x11-wm/e17-module-rain/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= rain
-PORTVERSION= 20070223
-PORTREVISION= 1
+PORTVERSION= 20080223
+PORTREVISION= 0
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-rain/distinfo b/x11-wm/e17-module-rain/distinfo
index 15917d0bc525..56101a06a01f 100644
--- a/x11-wm/e17-module-rain/distinfo
+++ b/x11-wm/e17-module-rain/distinfo
@@ -1,3 +1,3 @@
-MD5 (rain-20070223.tar.bz2) = 18fa7a1fdf1cd51098620a0514436d34
-SHA256 (rain-20070223.tar.bz2) = f132a1118622fd718b32ca5c28e415b5af3edc51d87642b58885ea723a344806
-SIZE (rain-20070223.tar.bz2) = 347010
+MD5 (rain-20080223.tar.bz2) = 639e63c2b425d83b11ba0bc4860a954f
+SHA256 (rain-20080223.tar.bz2) = 8723b2b56fce6c24db8d4586ad4d00104db26690a40addec2a518855576264b7
+SIZE (rain-20080223.tar.bz2) = 302065
diff --git a/x11-wm/e17-module-rain/pkg-plist b/x11-wm/e17-module-rain/pkg-plist
index 3b4f45a09cfc..cd9fcbdd71fd 100644
--- a/x11-wm/e17-module-rain/pkg-plist
+++ b/x11-wm/e17-module-rain/pkg-plist
@@ -6,13 +6,26 @@ lib/enlightenment/modules/rain/%%E17_ARCH%%/module.a
lib/enlightenment/modules/rain/%%E17_ARCH%%/module.la
lib/enlightenment/modules/rain/%%E17_ARCH%%/module.so
lib/enlightenment/modules/rain/module.desktop
-lib/enlightenment/modules/rain/module.edj
-%%NLS%%share/locale/eo/LC_MESSAGES/rain.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/rain.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/rain.mo
-%%NLS%%share/locale/it/LC_MESSAGES/rain.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/rain.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/rain.mo
+lib/enlightenment/modules/rain/e-module-rain.edj
+%%NLS%%lib/enlightenment/modules/rain/locale/eo/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/fi/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/fr/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/it/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/ja/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/sv/LC_MESSAGES/rain.mo
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale
@dirrm lib/enlightenment/modules/rain/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/rain
@dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-screenshot/Makefile b/x11-wm/e17-module-screenshot/Makefile
index 405edd0fda9f..1639edacaedd 100644
--- a/x11-wm/e17-module-screenshot/Makefile
+++ b/x11-wm/e17-module-screenshot/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= screenshot
-PORTVERSION= 20070223
-PORTREVISION= 1
+PORTVERSION= 20080223
+PORTREVISION= 0
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
@@ -16,8 +16,10 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= An e17 module which allows users to take screenshots
-BUILD_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+BUILD_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel \
+ emprint:${PORTSDIR}/x11/emprint
+RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel \
+ emprint:${PORTSDIR}/x11/emprint
GNU_CONFIGURE= yes
USE_BZIP2= yes
@@ -25,27 +27,4 @@ USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
USE_EFL= edje
-OPTIONS= IMAGIC "Use ImageMagick" on \
- SCROT "Use Scrot" off
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_IMAGIC)
-BUILD_DEPENDS+= import:${PORTSDIR}/graphics/ImageMagick
-RUN_DEPENDS+= import:${PORTSDIR}/graphics/ImageMagick
-.endif
-
-.if defined(WITH_SCROT)
-BUILD_DEPENDS+= scrot:${PORTSDIR}/graphics/scrot
-RUN_DEPENDS+= scrot:${PORTSDIR}/graphics/scrot
-.endif
-
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS= --disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-screenshot/distinfo b/x11-wm/e17-module-screenshot/distinfo
index a5226e0d1280..458f212e6f78 100644
--- a/x11-wm/e17-module-screenshot/distinfo
+++ b/x11-wm/e17-module-screenshot/distinfo
@@ -1,3 +1,3 @@
-MD5 (screenshot-20070223.tar.bz2) = d351d0fb604bf87c5eaf80c0a8089c96
-SHA256 (screenshot-20070223.tar.bz2) = 16e3fcfe9479791af46c3d8fb933fc3020d522c013f26e8847516f4561824e54
-SIZE (screenshot-20070223.tar.bz2) = 407617
+MD5 (screenshot-20080223.tar.bz2) = 21cc85f9743230fe807e634f493697c9
+SHA256 (screenshot-20080223.tar.bz2) = eb1cc3372fe9548bd438f5cc4e4863b84849481c49e4a6186e9df56aae2bddc9
+SIZE (screenshot-20080223.tar.bz2) = 247699
diff --git a/x11-wm/e17-module-screenshot/pkg-plist b/x11-wm/e17-module-screenshot/pkg-plist
index bf1d4b69764d..3b1727746708 100644
--- a/x11-wm/e17-module-screenshot/pkg-plist
+++ b/x11-wm/e17-module-screenshot/pkg-plist
@@ -2,16 +2,7 @@ lib/enlightenment/modules/screenshot/%%E17_ARCH%%/module.a
lib/enlightenment/modules/screenshot/%%E17_ARCH%%/module.la
lib/enlightenment/modules/screenshot/%%E17_ARCH%%/module.so
lib/enlightenment/modules/screenshot/module.desktop
-lib/enlightenment/modules/screenshot/module.edj
-lib/enlightenment/modules/screenshot/module_icon.png
-lib/enlightenment/modules/screenshot/screenshot.edj
-%%NLS%%share/locale/eo/LC_MESSAGES/screenshot.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/screenshot.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/screenshot.mo
-%%NLS%%share/locale/it/LC_MESSAGES/screenshot.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/screenshot.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/screenshot.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/screenshot.mo
+lib/enlightenment/modules/screenshot/e-module-screenshot.edj
@dirrm lib/enlightenment/modules/screenshot/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/screenshot
@dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-slideshow/Makefile b/x11-wm/e17-module-slideshow/Makefile
index ad25dcef43df..47f48ca45d6b 100644
--- a/x11-wm/e17-module-slideshow/Makefile
+++ b/x11-wm/e17-module-slideshow/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= slideshow
-PORTVERSION= 20070223
-PORTREVISION= 1
+PORTVERSION= 20080223
+PORTREVISION= 0
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-slideshow/distinfo b/x11-wm/e17-module-slideshow/distinfo
index 657acb2a7fd8..ce8938b85acc 100644
--- a/x11-wm/e17-module-slideshow/distinfo
+++ b/x11-wm/e17-module-slideshow/distinfo
@@ -1,3 +1,3 @@
-MD5 (slideshow-20070223.tar.bz2) = 619c2f89b4fe10fc608f3694a74a99ee
-SHA256 (slideshow-20070223.tar.bz2) = 59b481d3bdb1bd38187fc397f4a2f3922befc41713ede7dd08a30353321e1a25
-SIZE (slideshow-20070223.tar.bz2) = 284528
+MD5 (slideshow-20080223.tar.bz2) = 451ba84f1f04ea04d23b5c9e313470c9
+SHA256 (slideshow-20080223.tar.bz2) = ddc5e1298512fb219c6ee7403d45b0e9be540f44a9f4b4cb49c106ff68e89e63
+SIZE (slideshow-20080223.tar.bz2) = 239915
diff --git a/x11-wm/e17-module-slideshow/pkg-plist b/x11-wm/e17-module-slideshow/pkg-plist
index fb0ceadcb818..60d0b7ec2b4e 100644
--- a/x11-wm/e17-module-slideshow/pkg-plist
+++ b/x11-wm/e17-module-slideshow/pkg-plist
@@ -2,15 +2,27 @@ lib/enlightenment/modules/slideshow/%%E17_ARCH%%/module.a
lib/enlightenment/modules/slideshow/%%E17_ARCH%%/module.la
lib/enlightenment/modules/slideshow/%%E17_ARCH%%/module.so
lib/enlightenment/modules/slideshow/module.desktop
-lib/enlightenment/modules/slideshow/module.edj
-lib/enlightenment/modules/slideshow/module_icon.png
+lib/enlightenment/modules/slideshow/e-module-slideshow.edj
lib/enlightenment/modules/slideshow/slideshow.edj
-%%NLS%%share/locale/eo/LC_MESSAGES/slideshow.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/slideshow.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/slideshow.mo
-%%NLS%%share/locale/it/LC_MESSAGES/slideshow.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/slideshow.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/eo/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/fi/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/fr/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/it/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/ja/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/sv/LC_MESSAGES/slideshow.mo
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale
@dirrm lib/enlightenment/modules/slideshow/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/slideshow
@dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-snow/Makefile b/x11-wm/e17-module-snow/Makefile
index b79c8a7dd8c2..7d2084cacbc2 100644
--- a/x11-wm/e17-module-snow/Makefile
+++ b/x11-wm/e17-module-snow/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= snow
-PORTVERSION= 20070223
-PORTREVISION= 1
+PORTVERSION= 20080223
+PORTREVISION= 0
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-snow/distinfo b/x11-wm/e17-module-snow/distinfo
index c88a10edbbf2..70f2f1b77341 100644
--- a/x11-wm/e17-module-snow/distinfo
+++ b/x11-wm/e17-module-snow/distinfo
@@ -1,3 +1,3 @@
-MD5 (snow-20070223.tar.bz2) = 820d1c99ba6007e4d0d7eca164cbbe9a
-SHA256 (snow-20070223.tar.bz2) = 4695cc214ababccb04ca746626bc87edeb32c5319c1b3f9b76eb92c7023c8396
-SIZE (snow-20070223.tar.bz2) = 278212
+MD5 (snow-20080223.tar.bz2) = 34c2e67e72f3c5b77813e01ec0e6102d
+SHA256 (snow-20080223.tar.bz2) = 869ba38e49a929cab5dd31a1c3b0e7e66676e1aa41596f2088c9be8ef223013d
+SIZE (snow-20080223.tar.bz2) = 234493
diff --git a/x11-wm/e17-module-snow/pkg-plist b/x11-wm/e17-module-snow/pkg-plist
index 31ad449eeda5..2f328ce1cb46 100644
--- a/x11-wm/e17-module-snow/pkg-plist
+++ b/x11-wm/e17-module-snow/pkg-plist
@@ -5,14 +5,27 @@ lib/enlightenment/modules/snow/%%E17_ARCH%%/module.a
lib/enlightenment/modules/snow/%%E17_ARCH%%/module.la
lib/enlightenment/modules/snow/%%E17_ARCH%%/module.so
lib/enlightenment/modules/snow/module.desktop
-lib/enlightenment/modules/snow/module.edj
+lib/enlightenment/modules/snow/e-module-snow.edj
lib/enlightenment/modules/snow/tree.png
-%%NLS%%share/locale/eo/LC_MESSAGES/snow.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/snow.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/snow.mo
-%%NLS%%share/locale/it/LC_MESSAGES/snow.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/snow.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/eo/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/fi/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/fr/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/it/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/ja/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/sv/LC_MESSAGES/snow.mo
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale
@dirrm lib/enlightenment/modules/snow/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/snow
@dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-uptime/Makefile b/x11-wm/e17-module-uptime/Makefile
index 41f7cb1d2e4e..5b7b9b457ec0 100644
--- a/x11-wm/e17-module-uptime/Makefile
+++ b/x11-wm/e17-module-uptime/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= uptime
-PORTVERSION= 20070223
-PORTREVISION= 1
+PORTVERSION= 20080223
+PORTREVISION= 0
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-uptime/distinfo b/x11-wm/e17-module-uptime/distinfo
index a638c4ae756d..45f29f45c564 100644
--- a/x11-wm/e17-module-uptime/distinfo
+++ b/x11-wm/e17-module-uptime/distinfo
@@ -1,3 +1,3 @@
-MD5 (uptime-20070223.tar.bz2) = 0c806db8ced0ec7e6b544cd0096cbe83
-SHA256 (uptime-20070223.tar.bz2) = 96ebb7053d410ed5f56cf0359ad7d7e7c393de376b349dc1107c96355d76d2d0
-SIZE (uptime-20070223.tar.bz2) = 316556
+MD5 (uptime-20080223.tar.bz2) = 5e9d0e8da1f42c000179f32fd5366d72
+SHA256 (uptime-20080223.tar.bz2) = 73d354196917e907aa8568981cb650407d010954454745d76018ffe0f5c92e67
+SIZE (uptime-20080223.tar.bz2) = 272634
diff --git a/x11-wm/e17-module-uptime/pkg-plist b/x11-wm/e17-module-uptime/pkg-plist
index 37f9e851da0e..af2dfdfb44aa 100644
--- a/x11-wm/e17-module-uptime/pkg-plist
+++ b/x11-wm/e17-module-uptime/pkg-plist
@@ -2,18 +2,31 @@ lib/enlightenment/modules/uptime/%%E17_ARCH%%/module.a
lib/enlightenment/modules/uptime/%%E17_ARCH%%/module.la
lib/enlightenment/modules/uptime/%%E17_ARCH%%/module.so
lib/enlightenment/modules/uptime/module.desktop
-lib/enlightenment/modules/uptime/module.edj
lib/enlightenment/modules/uptime/uptime.edj
-lib/enlightenment/modules/uptime/uptime.png
-share/locale/bg/LC_MESSAGES/uptime.mo
-share/locale/eo/LC_MESSAGES/uptime.mo
-share/locale/fi/LC_MESSAGES/uptime.mo
-share/locale/it/LC_MESSAGES/uptime.mo
-share/locale/ja/LC_MESSAGES/uptime.mo
-share/locale/sv/LC_MESSAGES/uptime.mo
-share/nls/POSIX
-share/nls/en_US.US-ASCII
-@dirrmtry lib/enlightenment/modules/uptime/%%E17_ARCH%%
-@dirrmtry lib/enlightenment/modules/uptime
+lib/enlightenment/modules/uptime/e-module-uptime.edj
+%%NLS%%lib/enlightenment/modules/uptime/locale/bg/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/eo/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/fi/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/fr/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/it/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/ja/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/sv/LC_MESSAGES/uptime.mo
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale
+@dirrm lib/enlightenment/modules/uptime/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/uptime
@dirrmtry lib/enlightenment/modules
@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-weather/Makefile b/x11-wm/e17-module-weather/Makefile
index 376696b84436..c9b84e7eb2b0 100644
--- a/x11-wm/e17-module-weather/Makefile
+++ b/x11-wm/e17-module-weather/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= weather
-PORTVERSION= 20070223
-PORTREVISION= 1
+PORTVERSION= 20080223
+PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11-wm/e17-module-weather/distinfo b/x11-wm/e17-module-weather/distinfo
index b552ac86e987..e10aeab54741 100644
--- a/x11-wm/e17-module-weather/distinfo
+++ b/x11-wm/e17-module-weather/distinfo
@@ -1,3 +1,3 @@
-MD5 (weather-20070223.tar.bz2) = f8b7e939ed671722639e5d1fff8ed5cf
-SHA256 (weather-20070223.tar.bz2) = 796a3a1167677e1360af7d997245f7d6400b89e1b9d173e9d775325fc2c77056
-SIZE (weather-20070223.tar.bz2) = 868191
+MD5 (weather-20080223.tar.bz2) = b275301cf3bfc104c62b59ab59b7195a
+SHA256 (weather-20080223.tar.bz2) = 04ac1173638961708c3787d49bafff44a138da528a6e8b5bed81cc23f251d8bc
+SIZE (weather-20080223.tar.bz2) = 930951
diff --git a/x11-wm/e17-module-weather/pkg-plist b/x11-wm/e17-module-weather/pkg-plist
index 8c41253f625e..69beaa879d6a 100644
--- a/x11-wm/e17-module-weather/pkg-plist
+++ b/x11-wm/e17-module-weather/pkg-plist
@@ -2,12 +2,87 @@ lib/enlightenment/modules/weather/%%E17_ARCH%%/module.a
lib/enlightenment/modules/weather/%%E17_ARCH%%/module.la
lib/enlightenment/modules/weather/%%E17_ARCH%%/module.so
lib/enlightenment/modules/weather/module.desktop
-lib/enlightenment/modules/weather/module.edj
lib/enlightenment/modules/weather/weather.edj
-%%NLS%%share/locale/eo/LC_MESSAGES/weather.mo
-%%NLS%%share/locale/it/LC_MESSAGES/weather.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/weather.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/weather.mo
+lib/enlightenment/modules/weather/e-module-weather.edj
+lib/enlightenment/modules/weather/images/blizzard.png
+lib/enlightenment/modules/weather/images/blowingsnow.png
+lib/enlightenment/modules/weather/images/chancetstorm.png
+lib/enlightenment/modules/weather/images/chancetstormn.png
+lib/enlightenment/modules/weather/images/clear-sky.png
+lib/enlightenment/modules/weather/images/cloud.png
+lib/enlightenment/modules/weather/images/cloudy.png
+lib/enlightenment/modules/weather/images/cloudy_night.png
+lib/enlightenment/modules/weather/images/drizzle.png
+lib/enlightenment/modules/weather/images/fair.png
+lib/enlightenment/modules/weather/images/fdrizzle.png
+lib/enlightenment/modules/weather/images/flurries.png
+lib/enlightenment/modules/weather/images/fog.png
+lib/enlightenment/modules/weather/images/freezingrain.png
+lib/enlightenment/modules/weather/images/hazy.png
+lib/enlightenment/modules/weather/images/heavy-rain.png
+lib/enlightenment/modules/weather/images/ice.png
+lib/enlightenment/modules/weather/images/isolated.t-storm.png
+lib/enlightenment/modules/weather/images/light-rain.png
+lib/enlightenment/modules/weather/images/light-snow.png
+lib/enlightenment/modules/weather/images/luna-ceatza.png
+lib/enlightenment/modules/weather/images/luna-nori.png
+lib/enlightenment/modules/weather/images/mcloudy.png
+lib/enlightenment/modules/weather/images/mcloudyn.png
+lib/enlightenment/modules/weather/images/mcloudynr.png
+lib/enlightenment/modules/weather/images/mcloudyns.png
+lib/enlightenment/modules/weather/images/mcloudyr.png
+lib/enlightenment/modules/weather/images/mcloudys.png
+lib/enlightenment/modules/weather/images/moon-rain.png
+lib/enlightenment/modules/weather/images/moon-snow.png
+lib/enlightenment/modules/weather/images/moon-tstorm.png
+lib/enlightenment/modules/weather/images/moon.png
+lib/enlightenment/modules/weather/images/mostly-cloudy.png
+lib/enlightenment/modules/weather/images/pcloudy.png
+lib/enlightenment/modules/weather/images/pcloudyn.png
+lib/enlightenment/modules/weather/images/pcloudynr.png
+lib/enlightenment/modules/weather/images/pcloudyns.png
+lib/enlightenment/modules/weather/images/pcloudyr.png
+lib/enlightenment/modules/weather/images/pcloudyrn.png
+lib/enlightenment/modules/weather/images/pcloudys.png
+lib/enlightenment/modules/weather/images/rain.png
+lib/enlightenment/modules/weather/images/rainandsnow.png
+lib/enlightenment/modules/weather/images/showers.png
+lib/enlightenment/modules/weather/images/sleet.png
+lib/enlightenment/modules/weather/images/smoke.png
+lib/enlightenment/modules/weather/images/snow.png
+lib/enlightenment/modules/weather/images/snowshowers.png
+lib/enlightenment/modules/weather/images/sun-light-clouds.png
+lib/enlightenment/modules/weather/images/sun.png
+lib/enlightenment/modules/weather/images/suncloud.png
+lib/enlightenment/modules/weather/images/sunny.png
+lib/enlightenment/modules/weather/images/sunnyn.png
+lib/enlightenment/modules/weather/images/sunrain.png
+lib/enlightenment/modules/weather/images/sunsnow.png
+lib/enlightenment/modules/weather/images/t-storm_night.png
+lib/enlightenment/modules/weather/images/thunder.png
+lib/enlightenment/modules/weather/images/tstorm.png
+lib/enlightenment/modules/weather/images/tstormn.png
+lib/enlightenment/modules/weather/images/unknown.png
+lib/enlightenment/modules/weather/images/wind.png
+lib/enlightenment/modules/weather/images/wswarning.png
+lib/enlightenment/modules/weather/images/wswatch.png
+%%NLS%%lib/enlightenment/modules/weather/locale/eo/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/fi/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/it/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/ja/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/sv/LC_MESSAGES/weather.mo
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale
+@dirrm lib/enlightenment/modules/weather/images
@dirrm lib/enlightenment/modules/weather/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/weather
@dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-winselector/Makefile b/x11-wm/e17-module-winselector/Makefile
index 485bf032a019..913233e4d994 100644
--- a/x11-wm/e17-module-winselector/Makefile
+++ b/x11-wm/e17-module-winselector/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= winselector
-PORTVERSION= 20070223
-PORTREVISION= 1
+PORTVERSION= 20080223
+PORTREVISION= 0
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11-wm/e17-module-winselector/distinfo b/x11-wm/e17-module-winselector/distinfo
index 417522d22d7b..bf1bec42b879 100644
--- a/x11-wm/e17-module-winselector/distinfo
+++ b/x11-wm/e17-module-winselector/distinfo
@@ -1,3 +1,3 @@
-MD5 (winselector-20070223.tar.bz2) = bfd3d02ddda2bec18a400175bf6d6b6a
-SHA256 (winselector-20070223.tar.bz2) = b25e693378fd8cd64d69c8d5301b915e94b48e8d18a012850efef0ce928d0794
-SIZE (winselector-20070223.tar.bz2) = 271828
+MD5 (winselector-20080223.tar.bz2) = a3f10fee0c678ebff0dfa0a9f970362d
+SHA256 (winselector-20080223.tar.bz2) = 30a87d45b954627dcb44e5a2f404a59c6f5eb1dcb0938a2b4bfe07aec74f0332
+SIZE (winselector-20080223.tar.bz2) = 246692
diff --git a/x11-wm/e17-module-winselector/pkg-plist b/x11-wm/e17-module-winselector/pkg-plist
index 27724a16ee28..61cdf4bfb075 100644
--- a/x11-wm/e17-module-winselector/pkg-plist
+++ b/x11-wm/e17-module-winselector/pkg-plist
@@ -2,8 +2,7 @@ lib/enlightenment/modules/winselector/%%E17_ARCH%%/module.a
lib/enlightenment/modules/winselector/%%E17_ARCH%%/module.la
lib/enlightenment/modules/winselector/%%E17_ARCH%%/module.so
lib/enlightenment/modules/winselector/module.desktop
-lib/enlightenment/modules/winselector/module.edj
-lib/enlightenment/modules/winselector/module_icon.png
+lib/enlightenment/modules/winselector/e-module-winselector.edj
lib/enlightenment/modules/winselector/winselector.edj
@dirrm lib/enlightenment/modules/winselector/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/winselector
diff --git a/x11-wm/e17-utils/Makefile b/x11-wm/e17-utils/Makefile
index 297e3b60d87e..fe04e4f1337f 100644
--- a/x11-wm/e17-utils/Makefile
+++ b/x11-wm/e17-utils/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= utils
-PORTVERSION= 20070223
-PORTREVISION= 1
+PORTVERSION= 20080223
+PORTREVISION= 0
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-
@@ -17,16 +17,50 @@ DISTNAME= e_${PORTNAME}-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= Various supplementary utilities for e17 window manager
-BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-
DATADIR= ${PREFIX}/share/e_utils
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
-USE_EFL= imlib2 evas edje ecore embryo eet ewl engrave epsilon
-USE_EFL_ESMART= trans_x11
+USE_EFL= imlib2 engrave ecore
+USE_EFL_ECORE= evas file config
+
+OPTIONS= SETROOT "Build e17setroot" on \
+ ENTANGLE "Build entangle" on \
+ EXIGE "Build exige" on
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_SETROOT) && defined(WITHOUT_ENTANGLE) && \
+ defined(WITHOUT_EXIGE)
+IGNORE= select at least one utility to install
+.endif
+
+.if !defined(WITHOUT_SETROOT)
+BUILD_DEPENDS+= enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS+= enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
+PLIST_SUB+= SETROOT=""
+.else
+PLIST_SUB+= SETROOT="@comment "
+.endif
+
+.if !defined(WITHOUT_ENTANGLE)
+BUILD_DEPENDS+= enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS+= enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
+USE_EFL+= edje eet
+USE_EFL_ESMART+= container text_entry
+PLIST_SUB+= ENTANGLE=""
+.else
+PLIST_SUB+= ENTANGLE="@comment "
+.endif
+
+.if !defined(WITHOUT_EXIGE)
+USE_EFL+= edje eet
+USE_EFL_ESMART+= container text_entry
+PLIST_SUB+= EXIGE=""
+.else
+PLIST_SUB+= EXIGE="@comment "
+.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/e17-utils/distinfo b/x11-wm/e17-utils/distinfo
index b457c41f88bc..92454ec99aac 100644
--- a/x11-wm/e17-utils/distinfo
+++ b/x11-wm/e17-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (e_utils-20070223.tar.bz2) = 3ed1786358166c1cc0cfbccfbdd6a192
-SHA256 (e_utils-20070223.tar.bz2) = a9b86d8beaf995aa8643e0d5c6002e74576b64caf9b56485e1b6fdb9da822f8a
-SIZE (e_utils-20070223.tar.bz2) = 776040
+MD5 (e_utils-20080223.tar.bz2) = 1e82c2c0767fb85ac15c185f2dc53f24
+SHA256 (e_utils-20080223.tar.bz2) = a5ee61f6cac8275f6c0aca3cdaade9b4e58b345c645ee7e060dd4fa0a08ce58d
+SIZE (e_utils-20080223.tar.bz2) = 795101
diff --git a/x11-wm/e17-utils/pkg-plist b/x11-wm/e17-utils/pkg-plist
index 198db601145c..6d9897b9df33 100644
--- a/x11-wm/e17-utils/pkg-plist
+++ b/x11-wm/e17-utils/pkg-plist
@@ -1,13 +1,12 @@
-bin/e17setroot
-bin/entangle
-bin/exige
-%%DATADIR%%/data/entangle/default.edj
+%%SETROOT%%bin/e17setroot
+%%ENTANGLE%%bin/entangle
+%%EXIGE%%bin/exige
+%%ENTANGLE%%%%DATADIR%%/data/entangle/default.edj
+%%ENTANGLE%%share/enlightenment/config-apps/entangle.eap
%%DATADIR%%/data/exige/default.edj
-share/enlightenment/config-apps/entangle.eap
-@dirrmtry share/enlightenment
-@dirrmtry share/enlightenment/config-apps
-@dirrm %%DATADIR%%/data/exige
-@dirrm %%DATADIR%%/data/entangle
-@dirrm %%DATADIR%%/data/e17genmenu
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%
+%%EXIGE%%@dirrm %%DATADIR%%/data/exige
+%%ENTANGLE%%@dirrm %%DATADIR%%/data/entangle
+%%ENTANGLE%%@dirrmtry share/enlightenment/config-apps
+%%ENTANGLE%%@dirrmtry share/enlightenment
+@dirrmtry %%DATADIR%%/data
+@dirrmtry %%DATADIR%%
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index da29380273bc..86b513748651 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -6,12 +6,12 @@
#
PORTNAME= enlightenment
-PORTVERSION= 20070223
-PORTREVISION= 1
-PORTEPOCH= 1
+PORTVERSION= 0.16.999.042
+PORTREVISION= 0
+PORTEPOCH= 2
CATEGORIES= x11-wm
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
-DISTNAME= e-${PORTVERSION}
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+ http://download.enlightenment.org/snapshots/2008-01-25/
MAINTAINER= stas@FreeBSD.org
COMMENT= A very artistic X window manager
@@ -19,7 +19,9 @@ COMMENT= A very artistic X window manager
USE_GMAKE= yes
USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_EFL= imlib2 evas edje ecore embryo eet
+USE_EFL= imlib2 evas edje ecore embryo eet efreet edbus
+USE_EFL_ECORE= evas config file ipc con job txt imf imf_evas
+USE_EFL_EVAS_LOADERS= edb eet jpeg png
USE_ICONV= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
diff --git a/x11-wm/enlightenment-devel/distinfo b/x11-wm/enlightenment-devel/distinfo
index bddc264ce440..83f2a39f5600 100644
--- a/x11-wm/enlightenment-devel/distinfo
+++ b/x11-wm/enlightenment-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (e-20070223.tar.bz2) = d7c5ca68a6a276fdf4fa45e26757c7eb
-SHA256 (e-20070223.tar.bz2) = c9d112c1f0a9e5690745a3e6f8a45fa76366883d21d9c85010e5f22239b765a5
-SIZE (e-20070223.tar.bz2) = 31413115
+MD5 (enlightenment-0.16.999.042.tar.bz2) = f729622a0dd21eafb6fadc44a12b8e28
+SHA256 (enlightenment-0.16.999.042.tar.bz2) = 7605e877fcf213b0a6a0bfc46101a981d2e3eb6f2dcec04795a3e314ab8d0981
+SIZE (enlightenment-0.16.999.042.tar.bz2) = 32566682
diff --git a/x11-wm/enlightenment-devel/files/patch-src_bin_Makefile.in b/x11-wm/enlightenment-devel/files/patch-src_bin_Makefile.in
new file mode 100644
index 000000000000..e5a89cd7e4b6
--- /dev/null
+++ b/x11-wm/enlightenment-devel/files/patch-src_bin_Makefile.in
@@ -0,0 +1,11 @@
+--- src/bin/Makefile.in.orig 2008-03-11 02:13:30.000000000 +0300
++++ src/bin/Makefile.in 2008-03-11 02:13:34.000000000 +0300
+@@ -659,7 +659,7 @@
+ e_xinerama.c
+
+ enlightenment_init_LDFLAGS = @e_libs@
+-setuid_root_mode = a=rx,u+xs
++setuid_root_mode = a=rx,u+x
+ installed_headersdir = $(prefix)/include/enlightenment
+ installed_headers_DATA = $(ENLIGHTENMENTHEADERS)
+ all: all-am
diff --git a/x11-wm/enlightenment-devel/files/patch-src_modules_cpufreq_Makefile.in b/x11-wm/enlightenment-devel/files/patch-src_modules_cpufreq_Makefile.in
new file mode 100644
index 000000000000..595ace9be74f
--- /dev/null
+++ b/x11-wm/enlightenment-devel/files/patch-src_modules_cpufreq_Makefile.in
@@ -0,0 +1,11 @@
+--- src/modules/cpufreq/Makefile.in.orig 2008-03-11 02:13:50.000000000 +0300
++++ src/modules/cpufreq/Makefile.in 2008-03-11 02:13:54.000000000 +0300
+@@ -274,7 +274,7 @@
+ freqset_DATA = \
+ freqset$(EXEEXT)
+
+-setuid_root_mode = a=rx,u+xs
++setuid_root_mode = a=rx,u+x
+ freqset_SOURCES = freqset.c
+ all: all-am
+
diff --git a/x11-wm/enlightenment-devel/pkg-plist b/x11-wm/enlightenment-devel/pkg-plist
index da82d2defcaf..fcef23c20028 100644
--- a/x11-wm/enlightenment-devel/pkg-plist
+++ b/x11-wm/enlightenment-devel/pkg-plist
@@ -1,17 +1,17 @@
bin/enlightenment
bin/enlightenment-config
+bin/enlightenment_fm
bin/enlightenment_imc
+bin/enlightenment_init
bin/enlightenment_remote
bin/enlightenment_start
bin/enlightenment_sys
bin/enlightenment_thumb
-etc/enlightenment/sysactions.conf
+%%ETCDIR%%/sysactions.conf
include/enlightenment/e.h
include/enlightenment/e_about.h
include/enlightenment/e_actions.h
include/enlightenment/e_alert.h
-include/enlightenment/e_apps.h
-include/enlightenment/e_apps_error.h
include/enlightenment/e_atoms.h
include/enlightenment/e_bg.h
include/enlightenment/e_bindings.h
@@ -22,6 +22,7 @@ include/enlightenment/e_color.h
include/enlightenment/e_color_class.h
include/enlightenment/e_color_dialog.h
include/enlightenment/e_config.h
+include/enlightenment/e_config_data.h
include/enlightenment/e_config_dialog.h
include/enlightenment/e_configure.h
include/enlightenment/e_confirm_dialog.h
@@ -37,18 +38,20 @@ include/enlightenment/e_editable.h
include/enlightenment/e_entry.h
include/enlightenment/e_entry_dialog.h
include/enlightenment/e_error.h
-include/enlightenment/e_exebuf.h
+include/enlightenment/e_exec.h
include/enlightenment/e_exehist.h
-include/enlightenment/e_fdo_menu_to_order.h
include/enlightenment/e_filereg.h
include/enlightenment/e_flowlayout.h
include/enlightenment/e_fm.h
+include/enlightenment/e_fm_custom.h
+include/enlightenment/e_fm_hal.h
include/enlightenment/e_fm_mime.h
include/enlightenment/e_fm_prop.h
+include/enlightenment/e_fm_shared.h
include/enlightenment/e_focus.h
include/enlightenment/e_font.h
-include/enlightenment/e_fwin.h
include/enlightenment/e_gadcon.h
+include/enlightenment/e_gadcon_popup.h
include/enlightenment/e_grabinput.h
include/enlightenment/e_hints.h
include/enlightenment/e_icon.h
@@ -59,48 +62,13 @@ include/enlightenment/e_int_border_locks.h
include/enlightenment/e_int_border_menu.h
include/enlightenment/e_int_border_prop.h
include/enlightenment/e_int_border_remember.h
-include/enlightenment/e_int_config_apps.h
-include/enlightenment/e_int_config_borders.h
-include/enlightenment/e_int_config_cfgdialogs.h
-include/enlightenment/e_int_config_clientlist.h
-include/enlightenment/e_int_config_color_classes.h
-include/enlightenment/e_int_config_cursor.h
-include/enlightenment/e_int_config_desk.h
-include/enlightenment/e_int_config_desklock.h
-include/enlightenment/e_int_config_desks.h
-include/enlightenment/e_int_config_display.h
-include/enlightenment/e_int_config_dpms.h
-include/enlightenment/e_int_config_exebuf.h
-include/enlightenment/e_int_config_focus.h
-include/enlightenment/e_int_config_fonts.h
-include/enlightenment/e_int_config_icon_themes.h
-include/enlightenment/e_int_config_imc.h
-include/enlightenment/e_int_config_imc_import.h
-include/enlightenment/e_int_config_intl.h
-include/enlightenment/e_int_config_keybindings.h
-include/enlightenment/e_int_config_menus.h
-include/enlightenment/e_int_config_mime.h
-include/enlightenment/e_int_config_mime_edit.h
include/enlightenment/e_int_config_modules.h
-include/enlightenment/e_int_config_mousebindings.h
-include/enlightenment/e_int_config_paths.h
-include/enlightenment/e_int_config_performance.h
-include/enlightenment/e_int_config_screensaver.h
-include/enlightenment/e_int_config_shelf.h
-include/enlightenment/e_int_config_startup.h
-include/enlightenment/e_int_config_theme.h
-include/enlightenment/e_int_config_theme_import.h
-include/enlightenment/e_int_config_transitions.h
-include/enlightenment/e_int_config_wallpaper.h
-include/enlightenment/e_int_config_wallpaper_gradient.h
-include/enlightenment/e_int_config_wallpaper_import.h
-include/enlightenment/e_int_config_window_display.h
-include/enlightenment/e_int_config_window_manipulation.h
-include/enlightenment/e_int_config_winlist.h
include/enlightenment/e_int_gadcon_config.h
include/enlightenment/e_int_menus.h
include/enlightenment/e_int_shelf_config.h
+include/enlightenment/e_int_toolbar_config.h
include/enlightenment/e_intl.h
+include/enlightenment/e_intl_data.h
include/enlightenment/e_ipc.h
include/enlightenment/e_ipc_codec.h
include/enlightenment/e_ipc_handlers.h
@@ -112,15 +80,19 @@ include/enlightenment/e_maximize.h
include/enlightenment/e_menu.h
include/enlightenment/e_mmx.h
include/enlightenment/e_module.h
+include/enlightenment/e_mouse.h
include/enlightenment/e_moveresize.h
include/enlightenment/e_msg.h
+include/enlightenment/e_msgbus.h
include/enlightenment/e_obj_dialog.h
include/enlightenment/e_object.h
+include/enlightenment/e_order.h
include/enlightenment/e_pan.h
include/enlightenment/e_path.h
include/enlightenment/e_place.h
include/enlightenment/e_pointer.h
include/enlightenment/e_popup.h
+include/enlightenment/e_powersave.h
include/enlightenment/e_prefix.h
include/enlightenment/e_remember.h
include/enlightenment/e_resist.h
@@ -140,6 +112,7 @@ include/enlightenment/e_theme.h
include/enlightenment/e_theme_about.h
include/enlightenment/e_thumb.h
include/enlightenment/e_tlist.h
+include/enlightenment/e_toolbar.h
include/enlightenment/e_user.h
include/enlightenment/e_utils.h
include/enlightenment/e_widget.h
@@ -152,6 +125,7 @@ include/enlightenment/e_widget_csel.h
include/enlightenment/e_widget_cslider.h
include/enlightenment/e_widget_desk_preview.h
include/enlightenment/e_widget_entry.h
+include/enlightenment/e_widget_font_preview.h
include/enlightenment/e_widget_framelist.h
include/enlightenment/e_widget_frametable.h
include/enlightenment/e_widget_fsel.h
@@ -168,58 +142,282 @@ include/enlightenment/e_widget_table.h
include/enlightenment/e_widget_textblock.h
include/enlightenment/e_widget_tlist.h
include/enlightenment/e_win.h
-include/enlightenment/e_winlist.h
include/enlightenment/e_xinerama.h
include/enlightenment/e_zone.h
+lib/enlightenment/modules/battery/e-module-battery.edj
lib/enlightenment/modules/battery/%%E17_ARCH%%/module.a
lib/enlightenment/modules/battery/%%E17_ARCH%%/module.la
lib/enlightenment/modules/battery/%%E17_ARCH%%/module.so
lib/enlightenment/modules/battery/module.desktop
-lib/enlightenment/modules/battery/module.edj
+lib/enlightenment/modules/clock/e-module-clock.edj
lib/enlightenment/modules/clock/%%E17_ARCH%%/module.a
lib/enlightenment/modules/clock/%%E17_ARCH%%/module.la
lib/enlightenment/modules/clock/%%E17_ARCH%%/module.so
lib/enlightenment/modules/clock/module.desktop
-lib/enlightenment/modules/clock/module.edj
+lib/enlightenment/modules/conf/e-module-conf.edj
+lib/enlightenment/modules/conf/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf/module.desktop
+lib/enlightenment/modules/conf_applications/e-module-conf_applications.edj
+lib/enlightenment/modules/conf_applications/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_applications/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_applications/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_applications/module.desktop
+lib/enlightenment/modules/conf_borders/e-module-conf_borders.edj
+lib/enlightenment/modules/conf_borders/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_borders/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_borders/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_borders/module.desktop
+lib/enlightenment/modules/conf_clientlist/e-module-conf_clientlist.edj
+lib/enlightenment/modules/conf_clientlist/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_clientlist/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_clientlist/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_clientlist/module.desktop
+lib/enlightenment/modules/conf_colors/e-module-conf_colors.edj
+lib/enlightenment/modules/conf_colors/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_colors/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_colors/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_colors/module.desktop
+lib/enlightenment/modules/conf_desk/e-module-conf_desk.edj
+lib/enlightenment/modules/conf_desk/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_desk/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_desk/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_desk/module.desktop
+lib/enlightenment/modules/conf_desklock/e-module-conf_desklock.edj
+lib/enlightenment/modules/conf_desklock/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_desklock/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_desklock/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_desklock/module.desktop
+lib/enlightenment/modules/conf_desks/e-module-conf_desks.edj
+lib/enlightenment/modules/conf_desks/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_desks/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_desks/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_desks/module.desktop
+lib/enlightenment/modules/conf_dialogs/e-module-conf_dialogs.edj
+lib/enlightenment/modules/conf_dialogs/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_dialogs/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_dialogs/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_dialogs/module.desktop
+lib/enlightenment/modules/conf_display/e-module-conf_display.edj
+lib/enlightenment/modules/conf_display/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_display/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_display/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_display/module.desktop
+lib/enlightenment/modules/conf_dpms/e-module-conf_dpms.edj
+lib/enlightenment/modules/conf_dpms/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_dpms/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_dpms/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_dpms/module.desktop
+lib/enlightenment/modules/conf_engine/e-module-conf_engine.edj
+lib/enlightenment/modules/conf_engine/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_engine/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_engine/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_engine/module.desktop
+lib/enlightenment/modules/conf_exebuf/e-module-conf_exebuf.edj
+lib/enlightenment/modules/conf_exebuf/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_exebuf/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_exebuf/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_exebuf/module.desktop
+lib/enlightenment/modules/conf_fonts/e-module-conf_fonts.edj
+lib/enlightenment/modules/conf_fonts/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_fonts/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_fonts/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_fonts/module.desktop
+lib/enlightenment/modules/conf_icon_theme/e-module-conf_icon_theme.edj
+lib/enlightenment/modules/conf_icon_theme/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_icon_theme/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_icon_theme/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_icon_theme/module.desktop
+lib/enlightenment/modules/conf_imc/e-module-conf_imc.edj
+lib/enlightenment/modules/conf_imc/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_imc/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_imc/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_imc/module.desktop
+lib/enlightenment/modules/conf_interaction/e-module-conf_interaction.edj
+lib/enlightenment/modules/conf_interaction/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_interaction/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_interaction/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_interaction/module.desktop
+lib/enlightenment/modules/conf_intl/e-module-conf_intl.edj
+lib/enlightenment/modules/conf_intl/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_intl/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_intl/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_intl/module.desktop
+lib/enlightenment/modules/conf_keybindings/e-module-conf_keybindings.edj
+lib/enlightenment/modules/conf_keybindings/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_keybindings/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_keybindings/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_keybindings/module.desktop
+lib/enlightenment/modules/conf_menus/e-module-conf_menus.edj
+lib/enlightenment/modules/conf_menus/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_menus/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_menus/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_menus/module.desktop
+lib/enlightenment/modules/conf_mime/e-module-conf_mime.edj
+lib/enlightenment/modules/conf_mime/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_mime/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_mime/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_mime/module.desktop
+lib/enlightenment/modules/conf_mouse/e-module-conf_mouse.edj
+lib/enlightenment/modules/conf_mouse/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_mouse/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_mouse/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_mouse/module.desktop
+lib/enlightenment/modules/conf_mouse_cursor/e-module-conf_mouse_cursor.edj
+lib/enlightenment/modules/conf_mouse_cursor/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_mouse_cursor/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_mouse_cursor/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_mouse_cursor/module.desktop
+lib/enlightenment/modules/conf_mousebindings/e-module-conf_mousebindings.edj
+lib/enlightenment/modules/conf_mousebindings/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_mousebindings/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_mousebindings/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_mousebindings/module.desktop
+lib/enlightenment/modules/conf_paths/e-module-conf_paths.edj
+lib/enlightenment/modules/conf_paths/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_paths/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_paths/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_paths/module.desktop
+lib/enlightenment/modules/conf_performance/e-module-conf_performance.edj
+lib/enlightenment/modules/conf_performance/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_performance/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_performance/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_performance/module.desktop
+lib/enlightenment/modules/conf_profiles/e-module-conf_profiles.edj
+lib/enlightenment/modules/conf_profiles/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_profiles/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_profiles/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_profiles/module.desktop
+lib/enlightenment/modules/conf_screensaver/e-module-conf_screensaver.edj
+lib/enlightenment/modules/conf_screensaver/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_screensaver/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_screensaver/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_screensaver/module.desktop
+lib/enlightenment/modules/conf_shelves/e-module-conf_shelves.edj
+lib/enlightenment/modules/conf_shelves/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_shelves/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_shelves/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_shelves/module.desktop
+lib/enlightenment/modules/conf_startup/e-module-conf_startup.edj
+lib/enlightenment/modules/conf_startup/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_startup/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_startup/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_startup/module.desktop
+lib/enlightenment/modules/conf_theme/e-module-conf_theme.edj
+lib/enlightenment/modules/conf_theme/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_theme/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_theme/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_theme/module.desktop
+lib/enlightenment/modules/conf_transitions/e-module-conf_transitions.edj
+lib/enlightenment/modules/conf_transitions/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_transitions/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_transitions/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_transitions/module.desktop
+lib/enlightenment/modules/conf_wallpaper/e-module-conf_wallpaper.edj
+lib/enlightenment/modules/conf_wallpaper/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_wallpaper/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_wallpaper/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_wallpaper/module.desktop
+lib/enlightenment/modules/conf_window_display/e-module-conf_window_display.edj
+lib/enlightenment/modules/conf_window_display/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_window_display/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_window_display/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_window_display/module.desktop
+lib/enlightenment/modules/conf_window_focus/e-module-conf_window_focus.edj
+lib/enlightenment/modules/conf_window_focus/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_window_focus/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_window_focus/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_window_focus/module.desktop
+lib/enlightenment/modules/conf_window_manipulation/e-module-conf_winmanip.edj
+lib/enlightenment/modules/conf_window_manipulation/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_window_manipulation/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_window_manipulation/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_window_manipulation/module.desktop
+lib/enlightenment/modules/conf_winlist/e-module-conf_winlist.edj
+lib/enlightenment/modules/conf_winlist/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/conf_winlist/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_winlist/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_winlist/module.desktop
+lib/enlightenment/modules/cpufreq/e-module-cpufreq.edj
lib/enlightenment/modules/cpufreq/%%E17_ARCH%%/freqset
lib/enlightenment/modules/cpufreq/%%E17_ARCH%%/module.a
lib/enlightenment/modules/cpufreq/%%E17_ARCH%%/module.la
lib/enlightenment/modules/cpufreq/%%E17_ARCH%%/module.so
lib/enlightenment/modules/cpufreq/module.desktop
-lib/enlightenment/modules/cpufreq/module.edj
+lib/enlightenment/modules/dropshadow/e-module-dropshadow.edj
lib/enlightenment/modules/dropshadow/%%E17_ARCH%%/module.a
lib/enlightenment/modules/dropshadow/%%E17_ARCH%%/module.la
lib/enlightenment/modules/dropshadow/%%E17_ARCH%%/module.so
lib/enlightenment/modules/dropshadow/module.desktop
-lib/enlightenment/modules/dropshadow/module.edj
+lib/enlightenment/modules/exebuf/e-module-exebuf.edj
+lib/enlightenment/modules/exebuf/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/exebuf/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/exebuf/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/exebuf/module.desktop
+lib/enlightenment/modules/fileman/e-module-fileman.edj
+lib/enlightenment/modules/fileman/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/fileman/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/fileman/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/fileman/module.desktop
+lib/enlightenment/modules/ibar/e-module-ibar.edj
lib/enlightenment/modules/ibar/%%E17_ARCH%%/module.a
lib/enlightenment/modules/ibar/%%E17_ARCH%%/module.la
lib/enlightenment/modules/ibar/%%E17_ARCH%%/module.so
lib/enlightenment/modules/ibar/module.desktop
-lib/enlightenment/modules/ibar/module.edj
+lib/enlightenment/modules/ibox/e-module-ibox.edj
lib/enlightenment/modules/ibox/%%E17_ARCH%%/module.a
lib/enlightenment/modules/ibox/%%E17_ARCH%%/module.la
lib/enlightenment/modules/ibox/%%E17_ARCH%%/module.so
lib/enlightenment/modules/ibox/module.desktop
-lib/enlightenment/modules/ibox/module.edj
+lib/enlightenment/modules/layout/e-module-layout.edj
+lib/enlightenment/modules/layout/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/layout/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/layout/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/layout/module.desktop
+lib/enlightenment/modules/msgbus_lang/e-module-msgbus_lang.edj
+lib/enlightenment/modules/msgbus_lang/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/msgbus_lang/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/msgbus_lang/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/msgbus_lang/module.desktop
+lib/enlightenment/modules/pager/e-module-pager.edj
lib/enlightenment/modules/pager/%%E17_ARCH%%/module.a
lib/enlightenment/modules/pager/%%E17_ARCH%%/module.la
lib/enlightenment/modules/pager/%%E17_ARCH%%/module.so
lib/enlightenment/modules/pager/module.desktop
-lib/enlightenment/modules/pager/module.edj
+lib/enlightenment/modules/start/e-module-start.edj
lib/enlightenment/modules/start/%%E17_ARCH%%/module.a
lib/enlightenment/modules/start/%%E17_ARCH%%/module.la
lib/enlightenment/modules/start/%%E17_ARCH%%/module.so
lib/enlightenment/modules/start/module.desktop
-lib/enlightenment/modules/start/module.edj
+lib/enlightenment/modules/temperature/e-module-temperature.edj
lib/enlightenment/modules/temperature/%%E17_ARCH%%/module.a
lib/enlightenment/modules/temperature/%%E17_ARCH%%/module.la
lib/enlightenment/modules/temperature/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/temperature/%%E17_ARCH%%/tempget
lib/enlightenment/modules/temperature/module.desktop
-lib/enlightenment/modules/temperature/module.edj
-lib/enlightenment/preload/e_precache.so
-lib/enlightenment/preload/e_precache.la
+lib/enlightenment/modules/winlist/e-module-winlist.edj
+lib/enlightenment/modules/winlist/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/winlist/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/winlist/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/winlist/module.desktop
+lib/enlightenment/modules/wizard/e-module-wizard.edj
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_000.a
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_000.la
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_000.so
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_010.a
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_010.la
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_010.so
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_020.a
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_020.la
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_020.so
+lib/enlightenment/modules/wizard/module.desktop
lib/enlightenment/preload/e_precache.a
+lib/enlightenment/preload/e_precache.la
+lib/enlightenment/preload/e_precache.so
%%DATADIR%%/AUTHORS
%%DATADIR%%/COPYING
%%DATADIR%%/data/backgrounds/Blue_Sky_Tree.edj
@@ -255,7 +453,8 @@ lib/enlightenment/preload/e_precache.a
%%DATADIR%%/data/input_methods/iiimf.imc
%%DATADIR%%/data/input_methods/scim.imc
%%DATADIR%%/data/input_methods/uim.imc
-%%DATADIR%%/data/other/applications.tar.gz
+%%DATADIR%%/data/other/desktop_files.tar.gz
+%%DATADIR%%/data/other/desktop_order.tar.gz
%%DATADIR%%/data/other/efm_favorites.tar.gz
%%DATADIR%%/data/other/icon_example.tar.gz
%%DATADIR%%/data/themes/default.edj
@@ -264,16 +463,26 @@ lib/enlightenment/preload/e_precache.a
%%DATADIR%%/doc/documentation.html
%%DATADIR%%/doc/enlightenment.png
share/locale/bg/LC_MESSAGES/enlightenment.mo
+share/locale/ca/LC_MESSAGES/enlightenment.mo
share/locale/de/LC_MESSAGES/enlightenment.mo
share/locale/eo/LC_MESSAGES/enlightenment.mo
+share/locale/es/LC_MESSAGES/enlightenment.mo
+share/locale/fi/LC_MESSAGES/enlightenment.mo
share/locale/fr/LC_MESSAGES/enlightenment.mo
+share/locale/fr_CH/LC_MESSAGES/enlightenment.mo
share/locale/hu/LC_MESSAGES/enlightenment.mo
share/locale/it/LC_MESSAGES/enlightenment.mo
share/locale/ja/LC_MESSAGES/enlightenment.mo
+share/locale/ko/LC_MESSAGES/enlightenment.mo
+share/locale/pt_BR/LC_MESSAGES/enlightenment.mo
share/locale/ru/LC_MESSAGES/enlightenment.mo
share/locale/sl/LC_MESSAGES/enlightenment.mo
+share/locale/zh_CN/LC_MESSAGES/enlightenment.mo
+share/locale/zh_TW/LC_MESSAGES/enlightenment.mo
share/xsessions/enlightenment.desktop
@dirrmtry share/xsessions
+@dirrmtry share/locale/fr_CH/LC_MESSAGES
+@dirrmtry share/locale/fr_CH
@dirrm %%DATADIR%%/doc
@dirrm %%DATADIR%%/data/themes
@dirrm %%DATADIR%%/data/other
@@ -285,26 +494,112 @@ share/xsessions/enlightenment.desktop
@dirrm %%DATADIR%%/data/backgrounds
@dirrm %%DATADIR%%/data
@dirrm %%DATADIR%%
+@dirrm lib/enlightenment/preload
+@dirrm lib/enlightenment/modules/wizard/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/wizard
+@dirrm lib/enlightenment/modules/winlist/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/winlist
@dirrm lib/enlightenment/modules/temperature/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/temperature
@dirrm lib/enlightenment/modules/start/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/start
@dirrm lib/enlightenment/modules/pager/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/pager
+@dirrm lib/enlightenment/modules/msgbus_lang/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/msgbus_lang
+@dirrm lib/enlightenment/modules/layout/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/layout
@dirrm lib/enlightenment/modules/ibox/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/ibox
@dirrm lib/enlightenment/modules/ibar/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/ibar
+@dirrm lib/enlightenment/modules/fileman/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/fileman
+@dirrm lib/enlightenment/modules/exebuf/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/exebuf
@dirrm lib/enlightenment/modules/dropshadow/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/dropshadow
@dirrm lib/enlightenment/modules/cpufreq/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/cpufreq
+@dirrm lib/enlightenment/modules/conf_winlist/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_winlist
+@dirrm lib/enlightenment/modules/conf_window_manipulation/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_window_manipulation
+@dirrm lib/enlightenment/modules/conf_window_focus/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_window_focus
+@dirrm lib/enlightenment/modules/conf_window_display/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_window_display
+@dirrm lib/enlightenment/modules/conf_wallpaper/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_wallpaper
+@dirrm lib/enlightenment/modules/conf_transitions/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_transitions
+@dirrm lib/enlightenment/modules/conf_theme/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_theme
+@dirrm lib/enlightenment/modules/conf_startup/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_startup
+@dirrm lib/enlightenment/modules/conf_shelves/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_shelves
+@dirrm lib/enlightenment/modules/conf_screensaver/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_screensaver
+@dirrm lib/enlightenment/modules/conf_profiles/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_profiles
+@dirrm lib/enlightenment/modules/conf_performance/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_performance
+@dirrm lib/enlightenment/modules/conf_paths/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_paths
+@dirrm lib/enlightenment/modules/conf_mousebindings/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_mousebindings
+@dirrm lib/enlightenment/modules/conf_mouse_cursor/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_mouse_cursor
+@dirrm lib/enlightenment/modules/conf_mouse/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_mouse
+@dirrm lib/enlightenment/modules/conf_mime/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_mime
+@dirrm lib/enlightenment/modules/conf_menus/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_menus
+@dirrm lib/enlightenment/modules/conf_keybindings/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_keybindings
+@dirrm lib/enlightenment/modules/conf_intl/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_intl
+@dirrm lib/enlightenment/modules/conf_interaction/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_interaction
+@dirrm lib/enlightenment/modules/conf_imc/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_imc
+@dirrm lib/enlightenment/modules/conf_icon_theme/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_icon_theme
+@dirrm lib/enlightenment/modules/conf_fonts/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_fonts
+@dirrm lib/enlightenment/modules/conf_exebuf/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_exebuf
+@dirrm lib/enlightenment/modules/conf_engine/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_engine
+@dirrm lib/enlightenment/modules/conf_dpms/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_dpms
+@dirrm lib/enlightenment/modules/conf_display/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_display
+@dirrm lib/enlightenment/modules/conf_dialogs/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_dialogs
+@dirrm lib/enlightenment/modules/conf_desks/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_desks
+@dirrm lib/enlightenment/modules/conf_desklock/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_desklock
+@dirrm lib/enlightenment/modules/conf_desk/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_desk
+@dirrm lib/enlightenment/modules/conf_colors/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_colors
+@dirrm lib/enlightenment/modules/conf_clientlist/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_clientlist
+@dirrm lib/enlightenment/modules/conf_borders/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_borders
+@dirrm lib/enlightenment/modules/conf_applications/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_applications
+@dirrm lib/enlightenment/modules/conf/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf
@dirrm lib/enlightenment/modules/clock/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/clock
@dirrm lib/enlightenment/modules/battery/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/battery
@dirrm lib/enlightenment/modules
-@dirrm lib/enlightenment/preload
@dirrm lib/enlightenment
@dirrm include/enlightenment
-@dirrm etc/enlightenment
+@dirrmtry %%ETCDIR%%
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 1dc69ad6a68b..ad3a4fe906a0 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -7,6 +7,7 @@
PORTNAME= enlightenment
PORTVERSION= 0.16.8.12
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,8 +16,7 @@ DISTNAME= e16-${PORTVERSION}-0.01
MAINTAINER= vanilla@FreeBSD.org
COMMENT= A very artistic X window manager
-LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2 \
- Xft.2:${PORTSDIR}/x11-fonts/libXft
+LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft
DATADIR= ${PREFIX}/share/e16
@@ -24,6 +24,7 @@ USE_X_PREFIX= yes
USE_XORG= xbitmaps
USE_ICONV= yes
USE_GMAKE= yes
+USE_EFL= imlib2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-fsstd --disable-esdtest --disable-dependency-tracking \
--disable-rpath
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index dd9c44c5d679..46c53f0226d3 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fluxbox
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -55,7 +56,7 @@ PLIST_SUB+= DOCPDF:="@comment "
.endif
.if !defined(WITHOUT_IMLIB2)
-LIB_DEPENDS+= Imlib2.4:${PORTSDIR}/graphics/imlib2
+USE_EFL+= imlib2
CONFIGURE_ARGS+= --enable-imlib2
.else
CONFIGURE_ARGS+= --disable-imlib2
diff --git a/x11-wm/fluxspace/Makefile b/x11-wm/fluxspace/Makefile
index 34e040f32beb..f33790591794 100644
--- a/x11-wm/fluxspace/Makefile
+++ b/x11-wm/fluxspace/Makefile
@@ -7,15 +7,14 @@
PORTNAME= fluxspace
PORTVERSION= 0.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A window manager and workspace enhancer and integrator
-BUILD_DEPENDS= imlib2-config:${PORTSDIR}/graphics/imlib2 \
- swig:${PORTSDIR}/devel/swig13
+BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13
BROKEN= Checksum mismatch
@@ -23,6 +22,7 @@ USE_XLIB= yes
USE_PYTHON= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
+USE_EFL= imlib2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
USE_LDCONFIG= yes
diff --git a/x11-wm/kahakai/Makefile b/x11-wm/kahakai/Makefile
index 3cfe2003d8e0..822a061a61f2 100644
--- a/x11-wm/kahakai/Makefile
+++ b/x11-wm/kahakai/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kahakai
PORTVERSION= 0.6.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,8 +17,7 @@ COMMENT= Kahakai window manager
BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 \
${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost
-LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2 \
- Xft.2:${PORTSDIR}/x11-fonts/libXft
+LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft
RUN_DEPENDS= \
${X11BASE}/lib/X11/fonts/artwiz-fonts:${PORTSDIR}/x11-fonts/artwiz-fonts
@@ -34,6 +33,7 @@ GNU_CONFIGURE= yes
USE_PYTHON= yes
USE_X_PREFIX= yes
USE_GCC= 3.4
+USE_EFL= imlib2
MAN1= kahakai.1
diff --git a/x11-wm/phluid/Makefile b/x11-wm/phluid/Makefile
index 4da060145c22..d4d6f4f75042 100644
--- a/x11-wm/phluid/Makefile
+++ b/x11-wm/phluid/Makefile
@@ -7,7 +7,7 @@
PORTNAME= phluid
PORTVERSION= 0.0.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= phluid
@@ -15,10 +15,9 @@ MASTER_SITE_SUBDIR= phluid
MAINTAINER= ports@FreeBSD.org
COMMENT= A window manager that emphasizes efficiency, speed, and beauty
-LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2
-
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_EFL= imlib2
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lm"
diff --git a/x11-wm/skippy/Makefile b/x11-wm/skippy/Makefile
index b86acf9abd7e..6c9c07bb5d5e 100644
--- a/x11-wm/skippy/Makefile
+++ b/x11-wm/skippy/Makefile
@@ -7,19 +7,19 @@
PORTNAME= skippy
PORTVERSION= 0.5.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-wm
MASTER_SITES= http://thegraveyard.org/files/
MAINTAINER= ports@FreeBSD.org
COMMENT= A full-screen X11 task-switcher like Apple's Expose
-LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2 \
- Xft.2:${PORTSDIR}/x11-fonts/libXft
+LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft
USE_XLIB= yes
USE_BZIP2= yes
USE_GNOME= pkgconfig
+USE_EFL= imlib2
PLIST_FILES= bin/skippy \
%%DATADIR%%/skippyrc-default
PLIST_DIRS= %%DATADIR%%
diff --git a/x11-wm/waimea/Makefile b/x11-wm/waimea/Makefile
index d41ebe97b984..4061481c1a01 100644
--- a/x11-wm/waimea/Makefile
+++ b/x11-wm/waimea/Makefile
@@ -7,7 +7,7 @@
PORTNAME= waimea
PORTVERSION= 0.4.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= waimea
@@ -32,7 +32,7 @@ OPTIONS= PIXMAP "Build with pixmap textures support" on \
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_PIXMAP)
-LIB_DEPENDS+= Imlib2.4:${PORTSDIR}/graphics/imlib2
+USE_EFL+= imlib2
.endif
.if defined(WITH_DITHER)