aboutsummaryrefslogtreecommitdiff
path: root/x11
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
parent621c804e48a9fdddd6a00d78585fa8cb20c8460e (diff)
downloadports-9a2e4c8b780fc607dc4b4adabefb354c84401a96.tar.gz
ports-9a2e4c8b780fc607dc4b4adabefb354c84401a96.zip
Notes
Diffstat (limited to 'x11')
-rw-r--r--x11/3ddesktop/Makefile6
-rw-r--r--x11/Makefile7
-rw-r--r--x11/e17-module-calendar/Makefile11
-rw-r--r--x11/e17-module-calendar/distinfo6
-rw-r--r--x11/e17-module-calendar/pkg-plist34
-rw-r--r--x11/e17-module-cpu/Makefile4
-rw-r--r--x11/e17-module-cpu/distinfo6
-rw-r--r--x11/e17-module-cpu/pkg-plist24
-rw-r--r--x11/e17-module-deskshow/Makefile4
-rw-r--r--x11/e17-module-deskshow/distinfo6
-rw-r--r--x11/e17-module-deskshow/pkg-plist3
-rw-r--r--x11/e17-module-devian/Makefile4
-rw-r--r--x11/e17-module-engage/Makefile2
-rw-r--r--x11/e17-module-eveil/Makefile4
-rw-r--r--x11/e17-module-flame/Makefile4
-rw-r--r--x11/e17-module-flame/distinfo6
-rw-r--r--x11/e17-module-flame/pkg-plist19
-rw-r--r--x11/e17-module-language/Makefile13
-rw-r--r--x11/e17-module-language/distinfo6
-rw-r--r--x11/e17-module-language/pkg-plist21
-rw-r--r--x11/e17-module-mail/Makefile12
-rw-r--r--x11/e17-module-mail/distinfo6
-rw-r--r--x11/e17-module-mail/pkg-plist11
-rw-r--r--x11/e17-module-mem/Makefile4
-rw-r--r--x11/e17-module-mem/distinfo6
-rw-r--r--x11/e17-module-mem/pkg-plist28
-rw-r--r--x11/e17-module-mixer/Makefile4
-rw-r--r--x11/e17-module-mixer/distinfo6
-rw-r--r--x11/e17-module-mixer/pkg-plist14
-rw-r--r--x11/e17-module-moon/Makefile4
-rw-r--r--x11/e17-module-moon/distinfo6
-rw-r--r--x11/e17-module-moon/pkg-plist22
-rw-r--r--x11/e17-module-rain/Makefile4
-rw-r--r--x11/e17-module-rain/distinfo6
-rw-r--r--x11/e17-module-rain/pkg-plist27
-rw-r--r--x11/e17-module-screenshot/Makefile35
-rw-r--r--x11/e17-module-screenshot/distinfo6
-rw-r--r--x11/e17-module-screenshot/pkg-plist11
-rw-r--r--x11/e17-module-slideshow/Makefile4
-rw-r--r--x11/e17-module-slideshow/distinfo6
-rw-r--r--x11/e17-module-slideshow/pkg-plist28
-rw-r--r--x11/e17-module-snow/Makefile4
-rw-r--r--x11/e17-module-snow/distinfo6
-rw-r--r--x11/e17-module-snow/pkg-plist27
-rw-r--r--x11/e17-module-uptime/Makefile4
-rw-r--r--x11/e17-module-uptime/distinfo6
-rw-r--r--x11/e17-module-uptime/pkg-plist37
-rw-r--r--x11/e17-module-weather/Makefile4
-rw-r--r--x11/e17-module-weather/distinfo6
-rw-r--r--x11/e17-module-weather/pkg-plist85
-rw-r--r--x11/e17-module-winselector/Makefile4
-rw-r--r--x11/e17-module-winselector/distinfo6
-rw-r--r--x11/e17-module-winselector/pkg-plist3
-rw-r--r--x11/ecore-desktop/Makefile56
-rw-r--r--x11/ecore-desktop/distinfo3
-rw-r--r--x11/ecore-desktop/pkg-descr (renamed from x11/ecore/pkg-descr)0
-rw-r--r--x11/ecore-desktop/pkg-plist6
-rw-r--r--x11/ecore-imf/Makefile55
-rw-r--r--x11/ecore-imf/distinfo3
-rw-r--r--x11/ecore-imf/pkg-descr5
-rw-r--r--x11/ecore-imf/pkg-plist6
-rw-r--r--x11/ecore-imf_evas/Makefile58
-rw-r--r--x11/ecore-imf_evas/distinfo3
-rw-r--r--x11/ecore-imf_evas/pkg-descr5
-rw-r--r--x11/ecore-imf_evas/pkg-plist6
-rw-r--r--x11/ecore-x11/Makefile115
-rw-r--r--x11/ecore-x11/distinfo3
-rw-r--r--x11/ecore-x11/pkg-descr5
-rw-r--r--x11/ecore-x11/pkg-plist8
-rw-r--r--x11/ecore/Makefile100
-rw-r--r--x11/ecore/distinfo3
-rw-r--r--x11/ecore/pkg-plist63
-rw-r--r--x11/efreet/Makefile27
-rw-r--r--x11/efreet/distinfo3
-rw-r--r--x11/efreet/pkg-descr10
-rw-r--r--x11/efreet/pkg-plist37
-rw-r--r--x11/elicit/Makefile9
-rw-r--r--x11/elicit/distinfo6
-rw-r--r--x11/emprint/Makefile22
-rw-r--r--x11/emprint/distinfo3
-rw-r--r--x11/emprint/pkg-descr4
-rw-r--r--x11/emprint/pkg-plist4
-rw-r--r--x11/enity/Makefile4
-rw-r--r--x11/enity/distinfo6
-rw-r--r--x11/enterminus/Makefile5
-rw-r--r--x11/enterminus/distinfo6
-rw-r--r--x11/eterm/Makefile6
-rw-r--r--x11/examine/Makefile5
-rw-r--r--x11/examine/distinfo6
-rw-r--r--x11/fbdesk/Makefile2
-rw-r--r--x11/idesk/Makefile3
-rw-r--r--x11/ipager/Makefile5
-rw-r--r--x11/wmmsg/Makefile3
93 files changed, 893 insertions, 418 deletions
diff --git a/x11/3ddesktop/Makefile b/x11/3ddesktop/Makefile
index 199e58308c16..87c9c3ee6d17 100644
--- a/x11/3ddesktop/Makefile
+++ b/x11/3ddesktop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= 3ddesktop
PORTVERSION= 0.2.9
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= desk3d
@@ -15,11 +15,11 @@ MASTER_SITE_SUBDIR= desk3d
MAINTAINER= ports@FreeBSD.org
COMMENT= 3D Virtual Desktop Switcher
-LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut \
- Imlib2.4:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
USE_GL= yes
USE_GETOPT_LONG= yes
+USE_EFL= imlib2
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/x11/Makefile b/x11/Makefile
index b11df381a5f8..d5ff15822523 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -57,10 +57,15 @@
SUBDIR += e17-module-weather
SUBDIR += e17-module-winselector
SUBDIR += ebuttons
- SUBDIR += ecore
+ SUBDIR += ecore-desktop
+ SUBDIR += ecore-imf
+ SUBDIR += ecore-imf_evas
+ SUBDIR += ecore-x11
SUBDIR += editres
+ SUBDIR += efreet
SUBDIR += electricsheep
SUBDIR += elicit
+ SUBDIR += emprint
SUBDIR += emu
SUBDIR += enity
SUBDIR += enterminus
diff --git a/x11/e17-module-calendar/Makefile b/x11/e17-module-calendar/Makefile
index 72323396da12..724071efdff0 100644
--- a/x11/e17-module-calendar/Makefile
+++ b/x11/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/e17-module-calendar/distinfo b/x11/e17-module-calendar/distinfo
index 492ca7b8e1dc..c78a68a819af 100644
--- a/x11/e17-module-calendar/distinfo
+++ b/x11/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/e17-module-calendar/pkg-plist b/x11/e17-module-calendar/pkg-plist
index e74419126e29..ccaf607ad5bd 100644
--- a/x11/e17-module-calendar/pkg-plist
+++ b/x11/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/e17-module-cpu/Makefile b/x11/e17-module-cpu/Makefile
index f6e16b1af42b..bfb3453c3df8 100644
--- a/x11/e17-module-cpu/Makefile
+++ b/x11/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/e17-module-cpu/distinfo b/x11/e17-module-cpu/distinfo
index eab0e6c2036e..70530f65d7a2 100644
--- a/x11/e17-module-cpu/distinfo
+++ b/x11/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/e17-module-cpu/pkg-plist b/x11/e17-module-cpu/pkg-plist
index 1f5208e5a15b..79b81ddb6f3a 100644
--- a/x11/e17-module-cpu/pkg-plist
+++ b/x11/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/e17-module-deskshow/Makefile b/x11/e17-module-deskshow/Makefile
index dae67ad0b679..8b76593f0255 100644
--- a/x11/e17-module-deskshow/Makefile
+++ b/x11/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/e17-module-deskshow/distinfo b/x11/e17-module-deskshow/distinfo
index 02a446cb2b0d..733891cfa3a2 100644
--- a/x11/e17-module-deskshow/distinfo
+++ b/x11/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/e17-module-deskshow/pkg-plist b/x11/e17-module-deskshow/pkg-plist
index a5528559f717..b63bdae99989 100644
--- a/x11/e17-module-deskshow/pkg-plist
+++ b/x11/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/e17-module-devian/Makefile b/x11/e17-module-devian/Makefile
index a1f97faa7568..dcee14703d12 100644
--- a/x11/e17-module-devian/Makefile
+++ b/x11/e17-module-devian/Makefile
@@ -25,6 +25,8 @@ USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
USE_EFL= edje
-IGNORE= doesn't compile with recent e17
+BROKEN= doesn't compile with recent e17
+DEPRECATED= abandoned by developer
+EXPIRATION_DATE= 2008-03-20
.include <bsd.port.mk>
diff --git a/x11/e17-module-engage/Makefile b/x11/e17-module-engage/Makefile
index 2901f7dbbf26..2c5786c8ec75 100644
--- a/x11/e17-module-engage/Makefile
+++ b/x11/e17-module-engage/Makefile
@@ -32,5 +32,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
PLIST_SUB+= MODULE_ARCH=freebsd${OSREL}-${ARCH}
IGNORE= doesn't compile with recent e17
+DEPRECATED= abandoned by developer
+EXPIRATION_DATE= 2008-03-20
.include <bsd.port.mk>
diff --git a/x11/e17-module-eveil/Makefile b/x11/e17-module-eveil/Makefile
index bfae868c09cc..268240453637 100644
--- a/x11/e17-module-eveil/Makefile
+++ b/x11/e17-module-eveil/Makefile
@@ -33,4 +33,8 @@ CONFIGURE_ARGS= --disable-nls
PLIST_SUB+= NLS="@comment "
.endif
+IGNORE= doesn't compile with recent e17
+DEPRECATED= abandoned by developer
+EXPIRATION_DATE= 2008-03-20
+
.include <bsd.port.mk>
diff --git a/x11/e17-module-flame/Makefile b/x11/e17-module-flame/Makefile
index 278fe318b88c..510f458c9689 100644
--- a/x11/e17-module-flame/Makefile
+++ b/x11/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/e17-module-flame/distinfo b/x11/e17-module-flame/distinfo
index 7b40e0f4f2dc..69ba773e3ed1 100644
--- a/x11/e17-module-flame/distinfo
+++ b/x11/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/e17-module-flame/pkg-plist b/x11/e17-module-flame/pkg-plist
index 6651443c6b32..76d917dd30f9 100644
--- a/x11/e17-module-flame/pkg-plist
+++ b/x11/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/e17-module-language/Makefile b/x11/e17-module-language/Makefile
index 8107c559daaf..5bdd82fadb41 100644
--- a/x11/e17-module-language/Makefile
+++ b/x11/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/e17-module-language/distinfo b/x11/e17-module-language/distinfo
index 72899efb161e..1a265df3bc05 100644
--- a/x11/e17-module-language/distinfo
+++ b/x11/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/e17-module-language/pkg-plist b/x11/e17-module-language/pkg-plist
index b4a26ed34c97..86b38fe3bd9b 100644
--- a/x11/e17-module-language/pkg-plist
+++ b/x11/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/e17-module-mail/Makefile b/x11/e17-module-mail/Makefile
index 2e61a02d11ef..cf89623fea6d 100644
--- a/x11/e17-module-mail/Makefile
+++ b/x11/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/e17-module-mail/distinfo b/x11/e17-module-mail/distinfo
index 2d267b2dcf5d..8c332f9f87e6 100644
--- a/x11/e17-module-mail/distinfo
+++ b/x11/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/e17-module-mail/pkg-plist b/x11/e17-module-mail/pkg-plist
index d32b8e0e82c8..5fe294a96b64 100644
--- a/x11/e17-module-mail/pkg-plist
+++ b/x11/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/e17-module-mem/Makefile b/x11/e17-module-mem/Makefile
index e2c7d3e74d4b..fdfe07354e25 100644
--- a/x11/e17-module-mem/Makefile
+++ b/x11/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/e17-module-mem/distinfo b/x11/e17-module-mem/distinfo
index 50f192030695..185749c2a842 100644
--- a/x11/e17-module-mem/distinfo
+++ b/x11/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/e17-module-mem/pkg-plist b/x11/e17-module-mem/pkg-plist
index e6d9793970a2..592205b8e34d 100644
--- a/x11/e17-module-mem/pkg-plist
+++ b/x11/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/e17-module-mixer/Makefile b/x11/e17-module-mixer/Makefile
index f18221d40a69..c3d53eadcd2e 100644
--- a/x11/e17-module-mixer/Makefile
+++ b/x11/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/e17-module-mixer/distinfo b/x11/e17-module-mixer/distinfo
index a90a4bba763e..73b0c692169a 100644
--- a/x11/e17-module-mixer/distinfo
+++ b/x11/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/e17-module-mixer/pkg-plist b/x11/e17-module-mixer/pkg-plist
index 65daad44b823..23d0ae78ed2d 100644
--- a/x11/e17-module-mixer/pkg-plist
+++ b/x11/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/e17-module-moon/Makefile b/x11/e17-module-moon/Makefile
index 01eee6b51d99..5c5afc33b2b5 100644
--- a/x11/e17-module-moon/Makefile
+++ b/x11/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/e17-module-moon/distinfo b/x11/e17-module-moon/distinfo
index b686069e9d75..985c259b8383 100644
--- a/x11/e17-module-moon/distinfo
+++ b/x11/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/e17-module-moon/pkg-plist b/x11/e17-module-moon/pkg-plist
index 9e45a173c835..fb85cb2abbce 100644
--- a/x11/e17-module-moon/pkg-plist
+++ b/x11/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/e17-module-rain/Makefile b/x11/e17-module-rain/Makefile
index 155c65f629b1..71527be76277 100644
--- a/x11/e17-module-rain/Makefile
+++ b/x11/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/e17-module-rain/distinfo b/x11/e17-module-rain/distinfo
index 15917d0bc525..56101a06a01f 100644
--- a/x11/e17-module-rain/distinfo
+++ b/x11/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/e17-module-rain/pkg-plist b/x11/e17-module-rain/pkg-plist
index 3b4f45a09cfc..cd9fcbdd71fd 100644
--- a/x11/e17-module-rain/pkg-plist
+++ b/x11/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/e17-module-screenshot/Makefile b/x11/e17-module-screenshot/Makefile
index 405edd0fda9f..1639edacaedd 100644
--- a/x11/e17-module-screenshot/Makefile
+++ b/x11/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/e17-module-screenshot/distinfo b/x11/e17-module-screenshot/distinfo
index a5226e0d1280..458f212e6f78 100644
--- a/x11/e17-module-screenshot/distinfo
+++ b/x11/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/e17-module-screenshot/pkg-plist b/x11/e17-module-screenshot/pkg-plist
index bf1d4b69764d..3b1727746708 100644
--- a/x11/e17-module-screenshot/pkg-plist
+++ b/x11/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/e17-module-slideshow/Makefile b/x11/e17-module-slideshow/Makefile
index ad25dcef43df..47f48ca45d6b 100644
--- a/x11/e17-module-slideshow/Makefile
+++ b/x11/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/e17-module-slideshow/distinfo b/x11/e17-module-slideshow/distinfo
index 657acb2a7fd8..ce8938b85acc 100644
--- a/x11/e17-module-slideshow/distinfo
+++ b/x11/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/e17-module-slideshow/pkg-plist b/x11/e17-module-slideshow/pkg-plist
index fb0ceadcb818..60d0b7ec2b4e 100644
--- a/x11/e17-module-slideshow/pkg-plist
+++ b/x11/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/e17-module-snow/Makefile b/x11/e17-module-snow/Makefile
index b79c8a7dd8c2..7d2084cacbc2 100644
--- a/x11/e17-module-snow/Makefile
+++ b/x11/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/e17-module-snow/distinfo b/x11/e17-module-snow/distinfo
index c88a10edbbf2..70f2f1b77341 100644
--- a/x11/e17-module-snow/distinfo
+++ b/x11/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/e17-module-snow/pkg-plist b/x11/e17-module-snow/pkg-plist
index 31ad449eeda5..2f328ce1cb46 100644
--- a/x11/e17-module-snow/pkg-plist
+++ b/x11/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/e17-module-uptime/Makefile b/x11/e17-module-uptime/Makefile
index 41f7cb1d2e4e..5b7b9b457ec0 100644
--- a/x11/e17-module-uptime/Makefile
+++ b/x11/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/e17-module-uptime/distinfo b/x11/e17-module-uptime/distinfo
index a638c4ae756d..45f29f45c564 100644
--- a/x11/e17-module-uptime/distinfo
+++ b/x11/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/e17-module-uptime/pkg-plist b/x11/e17-module-uptime/pkg-plist
index 37f9e851da0e..af2dfdfb44aa 100644
--- a/x11/e17-module-uptime/pkg-plist
+++ b/x11/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/e17-module-weather/Makefile b/x11/e17-module-weather/Makefile
index 376696b84436..c9b84e7eb2b0 100644
--- a/x11/e17-module-weather/Makefile
+++ b/x11/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/e17-module-weather/distinfo b/x11/e17-module-weather/distinfo
index b552ac86e987..e10aeab54741 100644
--- a/x11/e17-module-weather/distinfo
+++ b/x11/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/e17-module-weather/pkg-plist b/x11/e17-module-weather/pkg-plist
index 8c41253f625e..69beaa879d6a 100644
--- a/x11/e17-module-weather/pkg-plist
+++ b/x11/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/e17-module-winselector/Makefile b/x11/e17-module-winselector/Makefile
index 485bf032a019..913233e4d994 100644
--- a/x11/e17-module-winselector/Makefile
+++ b/x11/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/e17-module-winselector/distinfo b/x11/e17-module-winselector/distinfo
index 417522d22d7b..bf1bec42b879 100644
--- a/x11/e17-module-winselector/distinfo
+++ b/x11/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/e17-module-winselector/pkg-plist b/x11/e17-module-winselector/pkg-plist
index 27724a16ee28..61cdf4bfb075 100644
--- a/x11/e17-module-winselector/pkg-plist
+++ b/x11/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/ecore-desktop/Makefile b/x11/ecore-desktop/Makefile
new file mode 100644
index 000000000000..8a24b4e145b8
--- /dev/null
+++ b/x11/ecore-desktop/Makefile
@@ -0,0 +1,56 @@
+# New ports collection makefile for: ecore-desktop
+# Date created: 22 September 2007
+# Whom: Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= desktop
+PORTVERSION= 0.9.9.042
+PORTREVISION= 0
+CATEGORIES= x11
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+ http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX= ecore-
+DISTNAME= ecore-${PORTVERSION}
+
+MAINTAINER= stas@FreeBSD.org
+COMMENT= Enlightenment core abstraction library (desktop module)
+
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GNOME= gnomehack pkgconfig gnometarget
+USE_LDCONFIG= yes
+USE_GETOPT_LONG=yes
+USE_EFL= ecore
+USE_EFL_ECORE= file
+BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_desktop
+INSTALL_WRKSRC= ${BUILD_WRKSRC}
+
+CONFIGURE_ARGS= --disable-ecore-con \
+ --disable-ecore-config \
+ --enable-ecore-desktop \
+ --disable-ecore-directfb \
+ --disable-ecore-evas \
+ --enable-ecore-file \
+ --disable-ecore-ipc \
+ --disable-ecore-job \
+ --disable-ecore-sdl \
+ --disable-ecore-txt \
+ --disable-ecore-x \
+ --disable-ecore-imf \
+ --disable-ecore-imf_evas
+
+post-patch:
+ @${REINPLACE_CMD} -E \
+ -e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore_file/\.libs,${LOCALBASE}/lib,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore_file/libecore_file\.la,-lecore_file,'\
+ ${BUILD_WRKSRC}/Makefile.in
+
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/ecore-desktop.pc \
+ ${PREFIX}/libdata/pkgconfig/
+
+.include <bsd.port.mk>
diff --git a/x11/ecore-desktop/distinfo b/x11/ecore-desktop/distinfo
new file mode 100644
index 000000000000..4672f6a1c167
--- /dev/null
+++ b/x11/ecore-desktop/distinfo
@@ -0,0 +1,3 @@
+MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
+SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
+SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
diff --git a/x11/ecore/pkg-descr b/x11/ecore-desktop/pkg-descr
index 2559668d0e57..2559668d0e57 100644
--- a/x11/ecore/pkg-descr
+++ b/x11/ecore-desktop/pkg-descr
diff --git a/x11/ecore-desktop/pkg-plist b/x11/ecore-desktop/pkg-plist
new file mode 100644
index 000000000000..257a4b52a74b
--- /dev/null
+++ b/x11/ecore-desktop/pkg-plist
@@ -0,0 +1,6 @@
+include/Ecore_Desktop.h
+lib/libecore_desktop.a
+lib/libecore_desktop.la
+lib/libecore_desktop.so
+lib/libecore_desktop.so.9
+libdata/pkgconfig/ecore-desktop.pc
diff --git a/x11/ecore-imf/Makefile b/x11/ecore-imf/Makefile
new file mode 100644
index 000000000000..06781e11477c
--- /dev/null
+++ b/x11/ecore-imf/Makefile
@@ -0,0 +1,55 @@
+# New ports collection makefile for: ecore-imf
+# Date created: 17 September 2007
+# Whom: Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= imf
+PORTVERSION= 0.9.9.042
+PORTREVISION= 0
+CATEGORIES= x11
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+ http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX= ecore-
+DISTNAME= ecore-${PORTVERSION}
+
+MAINTAINER= stas@FreeBSD.org
+COMMENT= Enlightenment core abstraction library (IMF module)
+
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GNOME= gnomehack pkgconfig gnometarget
+USE_LDCONFIG= yes
+USE_GETOPT_LONG=yes
+USE_EFL= ecore
+BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_imf
+INSTALL_WRKSRC= ${BUILD_WRKSRC}
+
+CONFIGURE_ARGS= --enable-ecore-con \
+ --enable-ecore-config \
+ --disable-ecore-desktop \
+ --disable-ecore-directfb \
+ --disable-ecore-evas \
+ --disable-ecore-file \
+ --disable-ecore-ipc \
+ --disable-ecore-job \
+ --disable-ecore-sdl \
+ --disable-ecore-txt \
+ --disable-ecore-x \
+ --enable-ecore-imf \
+ --disable-ecore-imf_evas
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+ @${REINPLACE_CMD} -E \
+ -e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
+ ${BUILD_WRKSRC}/Makefile.in
+
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/ecore-imf.pc \
+ ${PREFIX}/libdata/pkgconfig/
+
+.include <bsd.port.post.mk>
diff --git a/x11/ecore-imf/distinfo b/x11/ecore-imf/distinfo
new file mode 100644
index 000000000000..4672f6a1c167
--- /dev/null
+++ b/x11/ecore-imf/distinfo
@@ -0,0 +1,3 @@
+MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
+SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
+SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
diff --git a/x11/ecore-imf/pkg-descr b/x11/ecore-imf/pkg-descr
new file mode 100644
index 000000000000..2559668d0e57
--- /dev/null
+++ b/x11/ecore-imf/pkg-descr
@@ -0,0 +1,5 @@
+A core event abstracter layer and X abstraction layer that makes doing
+selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
+fast, optimised, and convenient.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Ecore/
diff --git a/x11/ecore-imf/pkg-plist b/x11/ecore-imf/pkg-plist
new file mode 100644
index 000000000000..2f0ba4d3e68e
--- /dev/null
+++ b/x11/ecore-imf/pkg-plist
@@ -0,0 +1,6 @@
+include/Ecore_IMF.h
+lib/libecore_imf.a
+lib/libecore_imf.la
+lib/libecore_imf.so
+lib/libecore_imf.so.9
+libdata/pkgconfig/ecore-imf.pc
diff --git a/x11/ecore-imf_evas/Makefile b/x11/ecore-imf_evas/Makefile
new file mode 100644
index 000000000000..9b8da10f7b04
--- /dev/null
+++ b/x11/ecore-imf_evas/Makefile
@@ -0,0 +1,58 @@
+# New ports collection makefile for: ecore-emf_evas
+# Date created: 17 September 2007
+# Whom: Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= imf_evas
+PORTVERSION= 0.9.9.042
+PORTREVISION= 0
+CATEGORIES= x11
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+ http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX= ecore-
+DISTNAME= ecore-${PORTVERSION}
+
+MAINTAINER= stas@FreeBSD.org
+COMMENT= Enlightenment core abstraction library (config module)
+
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GNOME= gnomehack pkgconfig gnometarget
+USE_LDCONFIG= yes
+USE_GETOPT_LONG=yes
+USE_EFL= ecore evas
+USE_EFL_ECORE= imf
+BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_imf_evas
+INSTALL_WRKSRC= ${BUILD_WRKSRC}
+
+CONFIGURE_ARGS= --enable-ecore-con \
+ --enable-ecore-config \
+ --disable-ecore-desktop \
+ --disable-ecore-directfb \
+ --disable-ecore-evas \
+ --disable-ecore-file \
+ --enable-ecore-ipc \
+ --disable-ecore-job \
+ --disable-ecore-sdl \
+ --disable-ecore-txt \
+ --disable-ecore-x \
+ --enable-ecore-imf \
+ --enable-ecore-imf_evas
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+ @${REINPLACE_CMD} -E \
+ -e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore_imf/\.libs,${LOCALBASE}/lib,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore_imf/libecore_imf\.la,-lecore_imf,'\
+ ${BUILD_WRKSRC}/Makefile.in
+
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/ecore-imf-evas.pc \
+ ${PREFIX}/libdata/pkgconfig/
+
+.include <bsd.port.post.mk>
diff --git a/x11/ecore-imf_evas/distinfo b/x11/ecore-imf_evas/distinfo
new file mode 100644
index 000000000000..4672f6a1c167
--- /dev/null
+++ b/x11/ecore-imf_evas/distinfo
@@ -0,0 +1,3 @@
+MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
+SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
+SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
diff --git a/x11/ecore-imf_evas/pkg-descr b/x11/ecore-imf_evas/pkg-descr
new file mode 100644
index 000000000000..2559668d0e57
--- /dev/null
+++ b/x11/ecore-imf_evas/pkg-descr
@@ -0,0 +1,5 @@
+A core event abstracter layer and X abstraction layer that makes doing
+selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
+fast, optimised, and convenient.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Ecore/
diff --git a/x11/ecore-imf_evas/pkg-plist b/x11/ecore-imf_evas/pkg-plist
new file mode 100644
index 000000000000..05465e4c7e01
--- /dev/null
+++ b/x11/ecore-imf_evas/pkg-plist
@@ -0,0 +1,6 @@
+include/Ecore_IMF_Evas.h
+lib/libecore_imf_evas.a
+lib/libecore_imf_evas.la
+lib/libecore_imf_evas.so
+lib/libecore_imf_evas.so.9
+libdata/pkgconfig/ecore-imf-evas.pc
diff --git a/x11/ecore-x11/Makefile b/x11/ecore-x11/Makefile
new file mode 100644
index 000000000000..5b6c43d60f7e
--- /dev/null
+++ b/x11/ecore-x11/Makefile
@@ -0,0 +1,115 @@
+# New ports collection makefile for: ecore-x11
+# Date created: 17 September 2007
+# Whom: Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= x11
+PORTVERSION= 0.9.9.042
+PORTREVISION= 0
+CATEGORIES= x11
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+ http://download.enlightenment.org/snapshots/2008-01-25/
+PKGNAMEPREFIX= ecore-
+DISTNAME= ecore-${PORTVERSION}
+
+MAINTAINER= stas@FreeBSD.org
+COMMENT= Enlightenment core abstraction library (x11 module)
+
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GNOME= gnomehack pkgconfig gnometarget
+USE_LDCONFIG= yes
+USE_GETOPT_LONG=yes
+USE_EFL= ecore
+USE_EFL_ECORE= txt
+BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_x
+INSTALL_WRKSRC= ${BUILD_WRKSRC}
+XEXTDIR= ${LOCALBASE}/include/X11/extensions
+
+CONFIGURE_ARGS= --disable-ecore-con \
+ --disable-ecore-config \
+ --disable-ecore-desktop \
+ --disable-ecore-directfb \
+ --disable-ecore-evas \
+ --disable-ecore-file \
+ --disable-ecore-ipc \
+ --disable-ecore-job \
+ --disable-ecore-sdl \
+ --disable-ecore-txt \
+ --enable-ecore-x \
+ --disable-ecore-imf \
+ --disable-ecore-imf_evas
+
+OPTIONS= XDAMAGE "Enable Xdamage support (requires X11)" on \
+ XDPMS "Enable Xdpms support (requires X11)" on \
+ XFIXES "Enable Xfixes support (requires X11)" on \
+ XINERAMA "Enable Xinerama support (requires X11)" on \
+ XPRINT "Enable Xprint support (requires X11)" on \
+ XRANDR "Enable Xrandr support (requires X11)" on \
+ XRENDER "Enable Xrender support (requires X11)" on \
+ XSS "Enable Xscrnsaver support (requires X11)" on \
+ XCURSOR "Enable Xcursor support (requires X11)" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_XDAMAGE) || exists(${XEXTDIR}/Xdamage.h)
+USE_XORG+= xdamage
+WITH_X11= yes
+.endif
+
+.if !defined(WITHOUT_XDPMS) || exists(${XEXTDIR}/dpms.h)
+USE_XORG+= xextproto
+WITH_X11= yes
+.endif
+
+.if !defined(WITHOUT_XFIXES) || exists(${XEXTDIR}/Xfixes.h)
+USE_XORG+= xfixes
+WITH_X11= yes
+.endif
+
+.if !defined(WITHOUT_XINERAMA) || exists(${XEXTDIR}/Xinerama.h)
+USE_XORG+= xineramaproto
+WITH_X11= yes
+.endif
+
+.if !defined(WITHOUT_XPRINT) || exists(${XEXTDIR}/Print.h)
+USE_XORG+= printproto
+WITH_X11= yes
+.endif
+
+.if !defined(WITHOUT_XRANDR) || exists(${XEXTDIR}/Xrandr.h)
+USE_XORG+= xrandr
+WITH_X11= yes
+.endif
+
+.if !defined(WITHOUT_XRENDER) || exists(${XEXTDIR}/Xrender.h)
+USE_XORG+= xrender
+WITH_X11= yes
+.endif
+
+.if !defined(WITHOUT_XSS) || exists(${XEXTDIR}/scrnsaver.h)
+USE_XORG+= xscrnsaver
+WITH_X11= yes
+.endif
+
+.if !defined(WITHOUT_XCURSOR) \
+ || exists(${LOCALBASE}/include/X11/Xcursor/Xcursor.h)
+USE_XORG+= xcursor
+WITH_X11= yes
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} -E \
+ -e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore_txt/\.libs,${LOCALBASE}/lib,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore_txt/libecore_txt\.la,-lecore_txt,'\
+ ${BUILD_WRKSRC}/Makefile.in
+
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/ecore-x.pc \
+ ${PREFIX}/libdata/pkgconfig/
+
+.include <bsd.port.post.mk>
diff --git a/x11/ecore-x11/distinfo b/x11/ecore-x11/distinfo
new file mode 100644
index 000000000000..4672f6a1c167
--- /dev/null
+++ b/x11/ecore-x11/distinfo
@@ -0,0 +1,3 @@
+MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
+SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
+SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
diff --git a/x11/ecore-x11/pkg-descr b/x11/ecore-x11/pkg-descr
new file mode 100644
index 000000000000..2559668d0e57
--- /dev/null
+++ b/x11/ecore-x11/pkg-descr
@@ -0,0 +1,5 @@
+A core event abstracter layer and X abstraction layer that makes doing
+selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
+fast, optimised, and convenient.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Ecore/
diff --git a/x11/ecore-x11/pkg-plist b/x11/ecore-x11/pkg-plist
new file mode 100644
index 000000000000..acc2454607d3
--- /dev/null
+++ b/x11/ecore-x11/pkg-plist
@@ -0,0 +1,8 @@
+include/Ecore_X.h
+include/Ecore_X_Atoms.h
+include/Ecore_X_Cursor.h
+lib/libecore_x.a
+lib/libecore_x.la
+lib/libecore_x.so
+lib/libecore_x.so.9
+libdata/pkgconfig/ecore-x.pc
diff --git a/x11/ecore/Makefile b/x11/ecore/Makefile
deleted file mode 100644
index cbf530616cce..000000000000
--- a/x11/ecore/Makefile
+++ /dev/null
@@ -1,100 +0,0 @@
-# New ports collection makefile for: ecore
-# Date created: 16 March 2001
-# Whom: Jeremy Norris <ishmael27@home.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME= ecore
-PORTVERSION= 20070223
-PORTREVISION= 2
-PORTEPOCH= 1
-CATEGORIES= x11
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
-
-MAINTAINER= stas@FreeBSD.org
-COMMENT= A core event abstraction library
-
-GNU_CONFIGURE= yes
-USE_BZIP2= yes
-USE_ICONV= yes
-USE_GNOME= gnomehack pkgconfig gnometarget
-USE_EFL= evas
-USE_LDCONFIG= yes
-USE_GETOPT_LONG=yes
-
-CONFIGURE_ARGS= --disable-ecore-dfb
-
-OPTIONS= DBUS "Enable DBUS support" on \
- CURL "Enable Curl support" on \
- X11 "Enable X11 support" on \
- EVAS "Enable evas support" on \
- EET "Enable EET configs support" on
-# OPENSSL "Enable OpenSSL support" on \
-# DIRECTFB "Enable DirectFB support" off \
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_X11)
-CONFIGURE_ARGS+= --enable-ecore-x
-USE_XLIB= yes
-PLIST_SUB+= X11=""
-.else
-CONFIGURE_ARGS+= --disable-ecore-x
-PLIST_SUB+= X11="@comment "
-.endif
-
-.if !defined(WITHOUT_EVAS)
-CONFIGURE_ARGS+= --enable-ecore-evas
-USE_EFL+= evas
-PLIST_SUB+= EVAS=""
-.else
-CONFIGURE_ARGS+= --disable-ecore-evas
-PLIST_SUB+= EVAS="@comment "
-.endif
-
-.if !defined(WITHOUT_CURL)
-CONFIGURE_ARGS+= --enable-curl
-LIB_DEPENDS+= curl.4:${PORTSDIR}/ftp/curl
-PLIST_SUB+= CURL=""
-.else
-CONFIGURE_ARGS+= --disable-curl
-PLIST_SUB+= CURL="@comment "
-.endif
-
-#.if !defined(WITHOUT_OPENSSL)
-#CONFIGURE_ARGS+= --enable-openssl
-#PLIST_SUB+= OPENSSL=""
-#USE_OPENSSL= yes
-#.else
-#CONFIGURE_ARGS+= --disable-openssl
-#PLIST_SUB+= OPENSSL="@comment "
-#.endif
-
-.if defined(WITH_DBUS)
-CONFIGURE_ARGS+= --enable-ecore-dbus
-PLIST_SUB+= DBUS=""
-.else
-CONFIGURE_ARGS+= --disable-ecore-dbus
-PLIST_SUB+= DBUS="@comment "
-.endif
-
-#.if defined(WITH_DIRECTFB)
-#CONFIGURE_ARGS+= --enable-ecore-dfb
-#PLIST_SUB+= DIRECTFB=""
-#LIB_DEPENDS+= directfb-0.9.16:${PORTSDIR}/devel/directfb
-#.else
-#CONFIGURE_ARGS+= --disable-ecore-dfb
-#PLIST_SUB+= DIRECTFB="@comment "
-#.endif
-
-.if !defined(WITHOUT_EET)
-CONFIGURE_ARGS+= --enable-ecore-config
-USE_EFL+= eet
-PLIST_SUB+= EET=""
-.else
-CONFIGURE_ARGS+= --disable-ecore-config
-PLIST_SUB+= EET="@comment "
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/x11/ecore/distinfo b/x11/ecore/distinfo
deleted file mode 100644
index 3bfabbeb47d1..000000000000
--- a/x11/ecore/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (ecore-20070223.tar.bz2) = 7e96f780b7d72da8ff73b34d9bb0643a
-SHA256 (ecore-20070223.tar.bz2) = 32f62ea6d92a594cc1dc17203c38404fe75b5d006fc4374c47a3076f53884d26
-SIZE (ecore-20070223.tar.bz2) = 3652857
diff --git a/x11/ecore/pkg-plist b/x11/ecore/pkg-plist
deleted file mode 100644
index a4a3385f209b..000000000000
--- a/x11/ecore/pkg-plist
+++ /dev/null
@@ -1,63 +0,0 @@
-bin/ecore-config
-%%EET%%bin/ecore_config
-include/Ecore.h
-include/Ecore_Con.h
-%%EET%%include/Ecore_Config.h
-%%DBUS%%include/Ecore_DBus.h
-include/Ecore_Data.h
-include/Ecore_Desktop.h
-%%EVAS%%include/Ecore_Evas.h
-include/Ecore_File.h
-include/Ecore_Ipc.h
-include/Ecore_Job.h
-include/Ecore_Str.h
-include/Ecore_Txt.h
-%%X11%%include/Ecore_X.h
-%%X11%%include/Ecore_X_Atoms.h
-%%X11%%include/Ecore_X_Cursor.h
-lib/libecore.a
-lib/libecore.la
-lib/libecore.so
-lib/libecore.so.1
-lib/libecore_con.a
-lib/libecore_con.la
-lib/libecore_con.so
-lib/libecore_con.so.1
-%%EET%%lib/libecore_config.a
-%%EET%%lib/libecore_config.la
-%%EET%%lib/libecore_config.so
-%%EET%%lib/libecore_config.so.1
-%%DBUS%%lib/libecore_dbus.a
-%%DBUS%%lib/libecore_dbus.la
-%%DBUS%%lib/libecore_dbus.so
-%%DBUS%%lib/libecore_dbus.so.1
-lib/libecore_desktop.a
-lib/libecore_desktop.la
-lib/libecore_desktop.so
-lib/libecore_desktop.so.1
-%%EVAS%%lib/libecore_evas.a
-%%EVAS%%lib/libecore_evas.la
-%%EVAS%%lib/libecore_evas.so
-%%EVAS%%lib/libecore_evas.so.1
-lib/libecore_file.a
-lib/libecore_file.la
-lib/libecore_file.so
-lib/libecore_file.so.1
-lib/libecore_ipc.a
-lib/libecore_ipc.la
-lib/libecore_ipc.so
-lib/libecore_ipc.so.1
-lib/libecore_job.a
-lib/libecore_job.la
-lib/libecore_job.so
-lib/libecore_job.so.1
-lib/libecore_txt.a
-lib/libecore_txt.la
-lib/libecore_txt.so
-lib/libecore_txt.so.1
-%%X11%%lib/libecore_x.a
-%%X11%%lib/libecore_x.la
-%%X11%%lib/libecore_x.so
-%%X11%%lib/libecore_x.so.1
-libdata/pkgconfig/ecore.pc
-share/aclocal/ecore.m4
diff --git a/x11/efreet/Makefile b/x11/efreet/Makefile
new file mode 100644
index 000000000000..a62b9bd2d73e
--- /dev/null
+++ b/x11/efreet/Makefile
@@ -0,0 +1,27 @@
+# New ports collection makefile for: efreet
+# Date created: 28 September 2007
+# Whom: Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= efreet
+PORTVERSION= 0.0.3.042
+CATEGORIES= x11
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+ http://download.enlightenment.org/snapshots/2008-01-25/
+
+MAINTAINER= stas@FreeBSD.org
+COMMENT= Freedesktop.org EFL compatiblity layer
+
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GNOME= gnomehack gnometarget pkgconfig
+USE_EFL= ecore
+USE_EFL_ECORE= file
+USE_LDCONFIG= yes
+
+post-patch:
+ @${REINPLACE_CMD} -E -e 's,-g -O0,,g' ${WRKSRC}/src/lib/Makefile.in
+
+.include <bsd.port.mk>
diff --git a/x11/efreet/distinfo b/x11/efreet/distinfo
new file mode 100644
index 000000000000..ca14c8d1222b
--- /dev/null
+++ b/x11/efreet/distinfo
@@ -0,0 +1,3 @@
+MD5 (efreet-0.0.3.042.tar.bz2) = d6ff6e116a839ce81821359a1cc2924a
+SHA256 (efreet-0.0.3.042.tar.bz2) = 07f5830f68ebc29df76a73dc44a16f258b1dccaf999b96cf6aa580dda7d42e47
+SIZE (efreet-0.0.3.042.tar.bz2) = 272194
diff --git a/x11/efreet/pkg-descr b/x11/efreet/pkg-descr
new file mode 100644
index 000000000000..099f48017260
--- /dev/null
+++ b/x11/efreet/pkg-descr
@@ -0,0 +1,10 @@
+Efreet is an implementation of several specifications from freedesktop.org
+intended for use in Enlightenment DR17 (e17) and other applications using
+the Enlightenment Foundation Libraries (EFL). Currently, the following
+specifications are included:
+ o Base Directory
+ o Desktop Entry
+ o Icon Theme
+ o Menu
+
+WWW: http://www.enlightenment.org/
diff --git a/x11/efreet/pkg-plist b/x11/efreet/pkg-plist
new file mode 100644
index 000000000000..92ac4799ca01
--- /dev/null
+++ b/x11/efreet/pkg-plist
@@ -0,0 +1,37 @@
+bin/efreet_alloc
+bin/efreet_cache_test
+bin/efreet_menu_alloc
+bin/efreet_spec_test
+bin/efreet_test
+include/efreet/Efreet.h
+include/efreet/Efreet_Mime.h
+include/efreet/efreet_base.h
+include/efreet/efreet_desktop.h
+include/efreet/efreet_icon.h
+include/efreet/efreet_ini.h
+include/efreet/efreet_menu.h
+include/efreet/efreet_utils.h
+lib/libefreet.a
+lib/libefreet.la
+lib/libefreet.so
+lib/libefreet.so.0
+lib/libefreet_mime.a
+lib/libefreet_mime.la
+lib/libefreet_mime.so
+lib/libefreet_mime.so.0
+libdata/pkgconfig/efreet-mime.pc
+libdata/pkgconfig/efreet.pc
+%%DATADIR%%/test/entry
+%%DATADIR%%/test/entry.png
+%%DATADIR%%/test/long.ini
+%%DATADIR%%/test/preferences.menu
+%%DATADIR%%/test/sub/test.desktop
+%%DATADIR%%/test/test.desktop
+%%DATADIR%%/test/test.ini
+%%DATADIR%%/test/test.menu
+%%DATADIR%%/test/test_menu_slash_bad.menu
+%%DATADIR%%/test/test_type.desktop
+@dirrm %%DATADIR%%/test/sub
+@dirrm %%DATADIR%%/test
+@dirrm %%DATADIR%%
+@dirrm include/efreet
diff --git a/x11/elicit/Makefile b/x11/elicit/Makefile
index 4b8ca6638738..92f8024effd7 100644
--- a/x11/elicit/Makefile
+++ b/x11/elicit/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= elicit
-PORTVERSION= 20070223
-PORTREVISION= 1
+PORTVERSION= 20080223
+PORTREVISION= 0
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
@@ -19,8 +19,9 @@ GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
-USE_EFL= ecore edb eet edje evas imlib2
-USE_EFL_ESMART= trans_x11
+USE_EFL= ecore eet edje evas imlib2
+USE_EFL_ESMART= draggies container
+USE_EFL_ECORE= evas file config
.include <bsd.port.pre.mk>
.if ${ARCH} == "ia64"
diff --git a/x11/elicit/distinfo b/x11/elicit/distinfo
index b540de0e04cf..0ee5e4e51cdf 100644
--- a/x11/elicit/distinfo
+++ b/x11/elicit/distinfo
@@ -1,3 +1,3 @@
-MD5 (elicit-20070223.tar.bz2) = dbb76ba14f55983308096cb2b5af7525
-SHA256 (elicit-20070223.tar.bz2) = e2745d2b55012998d6b942338fe1d8f1afcd3f1afc645ed578ef001a817779c5
-SIZE (elicit-20070223.tar.bz2) = 460846
+MD5 (elicit-20080223.tar.bz2) = ee6e22c97be98b05b4f66f4ae23765ec
+SHA256 (elicit-20080223.tar.bz2) = 9f61a672b4d08eadb14daa5e5c8f199ec883cd7af126cca60f3d0242a7fc8ef3
+SIZE (elicit-20080223.tar.bz2) = 463346
diff --git a/x11/emprint/Makefile b/x11/emprint/Makefile
new file mode 100644
index 000000000000..e58744bf0b8d
--- /dev/null
+++ b/x11/emprint/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: efreet
+# Date created: 28 September 2007
+# Whom: Stanislav Sedov <stas@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= emprint
+PORTVERSION= 20080223
+CATEGORIES= x11
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
+
+MAINTAINER= stas@FreeBSD.org
+COMMENT= Utility for taking screenshots for E17
+
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GNOME= gnomehack gnometarget pkgconfig
+USE_EFL= ecore evas edje imlib2
+USE_EFL_ECORE= file x11 evas
+
+.include <bsd.port.mk>
diff --git a/x11/emprint/distinfo b/x11/emprint/distinfo
new file mode 100644
index 000000000000..98eb8710cd66
--- /dev/null
+++ b/x11/emprint/distinfo
@@ -0,0 +1,3 @@
+MD5 (emprint-20080223.tar.bz2) = 380daace1a8b290f427661f58f084f18
+SHA256 (emprint-20080223.tar.bz2) = bc32d9cf11be8ae0eb8760fb3756d6c694fb3f97ea1cc5a534f5f247ac3dfa60
+SIZE (emprint-20080223.tar.bz2) = 217507
diff --git a/x11/emprint/pkg-descr b/x11/emprint/pkg-descr
new file mode 100644
index 000000000000..8778c32001da
--- /dev/null
+++ b/x11/emprint/pkg-descr
@@ -0,0 +1,4 @@
+Emprint is a utility for taking screenshots of the entire screen, a specific
+window, or a specific region.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11/emprint/pkg-plist b/x11/emprint/pkg-plist
new file mode 100644
index 000000000000..2cfe8acf698b
--- /dev/null
+++ b/x11/emprint/pkg-plist
@@ -0,0 +1,4 @@
+bin/emprint
+%%DATADIR%%/images/rect.png
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%
diff --git a/x11/enity/Makefile b/x11/enity/Makefile
index 644c7d07f164..1553ba8199df 100644
--- a/x11/enity/Makefile
+++ b/x11/enity/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= enity
-PORTVERSION= 20070223
-PORTREVISION= 2
+PORTVERSION= 20080223
+PORTREVISION= 0
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11/enity/distinfo b/x11/enity/distinfo
index 576959f023c8..c483604017a9 100644
--- a/x11/enity/distinfo
+++ b/x11/enity/distinfo
@@ -1,3 +1,3 @@
-MD5 (enity-20070223.tar.bz2) = a17a38719fb8e118dda824b13afa56a9
-SHA256 (enity-20070223.tar.bz2) = a2a147cee3fa682a09c42207b420856d0be3f092495dc7d17926794aed273c76
-SIZE (enity-20070223.tar.bz2) = 231111
+MD5 (enity-20080223.tar.bz2) = c2fb4e7e0b8fd576a827377ad3f73d20
+SHA256 (enity-20080223.tar.bz2) = 5f68effe8cb8e3edc6970283eaae1148c77141db55fc01c30f694844434c6cbc
+SIZE (enity-20080223.tar.bz2) = 233367
diff --git a/x11/enterminus/Makefile b/x11/enterminus/Makefile
index 97829af1a7a8..f1db7b3fba1d 100644
--- a/x11/enterminus/Makefile
+++ b/x11/enterminus/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= enterminus
-PORTVERSION= 20070223
-PORTREVISION= 1
+PORTVERSION= 20080223
+PORTREVISION= 0
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
@@ -19,6 +19,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack pkgconfig gnometarget
USE_EFL= evas ecore
+USE_EFL_ECORE= evas job
GNU_CONFIGURE= yes
.include <bsd.port.mk>
diff --git a/x11/enterminus/distinfo b/x11/enterminus/distinfo
index c80c688406f5..e3143a6b3177 100644
--- a/x11/enterminus/distinfo
+++ b/x11/enterminus/distinfo
@@ -1,3 +1,3 @@
-MD5 (enterminus-20070223.tar.bz2) = d896c9273317a302692f5c6f0a864933
-SHA256 (enterminus-20070223.tar.bz2) = 061614ee1ba76b4def1cff86cb46118e3536a52848748384179cedb104d71c23
-SIZE (enterminus-20070223.tar.bz2) = 269142
+MD5 (enterminus-20080223.tar.bz2) = a36363be8042b66540e4bccbc2a4f543
+SHA256 (enterminus-20080223.tar.bz2) = 7a8ae2a2c14afe9d2de880bd25149c8a9816273c4e8451014fd2fce800e4fe1b
+SIZE (enterminus-20080223.tar.bz2) = 275665
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index ef0c52d8db27..94ab8305b9ef 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eterm
PORTVERSION= 0.9.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES+= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,8 +17,7 @@ MAINTAINER?= olgeni@FreeBSD.org
COMMENT?= X11 terminal emulator based on rxvt/xterm
BUILD_DEPENDS= man2html:${PORTSDIR}/textproc/man2html
-LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2 \
- ast.2:${PORTSDIR}/devel/libast
+LIB_DEPENDS= ast.2:${PORTSDIR}/devel/libast
USE_AUTOTOOLS= libtool:15
USE_LDCONFIG= yes
@@ -31,6 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
OPTIONS= MMX "With MMX instruction set" off
USE_XLIB= yes
USE_ICONV= yes
+USE_EFL= imlib2
MAN1= Eterm.1
diff --git a/x11/examine/Makefile b/x11/examine/Makefile
index d3c195da1644..b25ef941da5d 100644
--- a/x11/examine/Makefile
+++ b/x11/examine/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= examine
-PORTVERSION= 20070223
-PORTREVISION= 1
+PORTVERSION= 20080223
+PORTREVISION= 0
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
@@ -20,6 +20,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
USE_EFL= ecore ewl
+USE_EFL_ECORE= ipc config
PLIST_FILES= bin/examine bin/exsh
diff --git a/x11/examine/distinfo b/x11/examine/distinfo
index 2ff0cb40d240..9267173d4b72 100644
--- a/x11/examine/distinfo
+++ b/x11/examine/distinfo
@@ -1,3 +1,3 @@
-MD5 (examine-20070223.tar.bz2) = ba8357186142e80fda2c8c9a8ed4924f
-SHA256 (examine-20070223.tar.bz2) = e403fd35c538c41c3420e7e25376082a8087bd5dec2131fed96cd87cfba494dc
-SIZE (examine-20070223.tar.bz2) = 1260363
+MD5 (examine-20080223.tar.bz2) = f8d1d9311eba105edc605dcbfc140038
+SHA256 (examine-20080223.tar.bz2) = 22cd4deb28c803f388df3d99acdb967b0a90e52363bac09bfbe69c1a63a4ea66
+SIZE (examine-20080223.tar.bz2) = 1264243
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index 037c3d2951b3..56dd20959248 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fbdesk
PORTVERSION= 1.4.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://fluxbox.sourceforge.net/download/ \
${MASTER_SITE_GENTOO} \
@@ -27,6 +28,7 @@ GNU_CONFIGURE= yes
PORTDOCS= ChangeLog INSTALL README
PLIST_FILES= bin/fbdesk
+USE_EFL= imlib2
.include <bsd.port.pre.mk>
diff --git a/x11/idesk/Makefile b/x11/idesk/Makefile
index 7476b543f525..044717f8dd92 100644
--- a/x11/idesk/Makefile
+++ b/x11/idesk/Makefile
@@ -15,11 +15,10 @@ MASTER_SITE_SUBDIR= ${PORTNAME}/
MAINTAINER= acm@FreeBSD.org
COMMENT= Place launch icons and background directly on your desktop
-BUILD_DEPENDS= imlib2-config:${PORTSDIR}/graphics/imlib2
-
USE_XLIB= yes
USE_BZIP2= yes
USE_GMAKE= yes
+USE_EFL= imlib2
GNU_CONFIGURE= yes
USE_AUTOTOOLS= autoconf:261
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11/ipager/Makefile b/x11/ipager/Makefile
index fdf803226311..0eae108ed68a 100644
--- a/x11/ipager/Makefile
+++ b/x11/ipager/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ipager
PORTVERSION= 1.1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://useperl.ru/ipager/src/
DISTNAME= ipager-${PORTVERSION}
@@ -15,9 +15,8 @@ DISTNAME= ipager-${PORTVERSION}
MAINTAINER= vlad@vlad.uz.ua
COMMENT= X11 pager program
-LIB_DEPENDS+= Imlib2.4:${PORTSDIR}/graphics/imlib2
-
USE_SCONS= yes
+USE_EFL= imlib2
PLIST_FILES= bin/ipager \
%%DATADIR%%/themes/atlantis.conf \
diff --git a/x11/wmmsg/Makefile b/x11/wmmsg/Makefile
index be6e7ed7246a..3c22e69dcbe1 100644
--- a/x11/wmmsg/Makefile
+++ b/x11/wmmsg/Makefile
@@ -14,14 +14,13 @@ MASTER_SITES= http://mirror.israel.net/pub/FreeBSD/distfiles/
MAINTAINER= t.kempka@web.de
COMMENT= Dockapp that notifies you on ICQ, AIM and IRC events
-LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2
-
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_GNOME= gtk12
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_XPM= yes
+USE_EFL= imlib2
GNU_CONFIGURE= yes
MAN1= wmmsg.1