aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstas <stas@FreeBSD.org>2007-03-11 16:51:14 +0800
committerstas <stas@FreeBSD.org>2007-03-11 16:51:14 +0800
commita2724272755bd3d479b57d4112c7d6ce2f21807e (patch)
tree2cc1da2fbddb7a27923bab24c8be5051f1063291
parent3bfd3a9293fced94b9f8604b6ac6352531f57eec (diff)
downloadfreebsd-ports-gnome-a2724272755bd3d479b57d4112c7d6ce2f21807e.tar.gz
freebsd-ports-gnome-a2724272755bd3d479b57d4112c7d6ce2f21807e.tar.zst
freebsd-ports-gnome-a2724272755bd3d479b57d4112c7d6ce2f21807e.zip
- Update e17 ports to 20070223 snapshot
- Bump portrevisions on all imlib2-dependend ports as the library soversion was bumped [1] - Disable fade-in effects in x11-fm/evidence permanently, since evas doesn't support it anymore. [2] The patch was tested in the tinderbox. Approved by: portmgr (marcus) [1], Anders Troback <freebsd@troback.com> (maintainer) [2]
-rw-r--r--audio/emphasis/Makefile4
-rw-r--r--audio/emphasis/distinfo6
-rw-r--r--audio/euphoria/Makefile4
-rw-r--r--audio/euphoria/distinfo6
-rw-r--r--databases/edb/Makefile4
-rw-r--r--databases/edb/distinfo6
-rw-r--r--deskutils/adesklets/Makefile4
-rw-r--r--deskutils/estickies/Makefile4
-rw-r--r--deskutils/estickies/distinfo6
-rw-r--r--deskutils/kompose/Makefile4
-rw-r--r--deskutils/pypanel/Makefile3
-rw-r--r--devel/eet/Makefile4
-rw-r--r--devel/eet/distinfo6
-rw-r--r--devel/eet/pkg-plist2
-rw-r--r--devel/engrave/Makefile4
-rw-r--r--devel/engrave/distinfo6
-rw-r--r--devel/engrave/pkg-plist1
-rw-r--r--devel/evfs/Makefile6
-rw-r--r--devel/evfs/distinfo6
-rw-r--r--devel/libast/Makefile3
-rw-r--r--editors/texmacs/Makefile3
-rw-r--r--graphics/edje/Makefile4
-rw-r--r--graphics/edje/distinfo6
-rw-r--r--graphics/edje/pkg-plist158
-rw-r--r--graphics/edje_viewer/Makefile4
-rw-r--r--graphics/edje_viewer/distinfo6
-rw-r--r--graphics/entice/Makefile4
-rw-r--r--graphics/entice/distinfo6
-rw-r--r--graphics/epeg/Makefile4
-rw-r--r--graphics/epeg/distinfo6
-rw-r--r--graphics/epsilon/Makefile6
-rw-r--r--graphics/epsilon/distinfo6
-rw-r--r--graphics/esmart/Makefile6
-rw-r--r--graphics/esmart/distinfo6
-rw-r--r--graphics/evas/Makefile4
-rw-r--r--graphics/evas/distinfo6
-rw-r--r--graphics/evas/files/patch-src_bin_evas_directfb_window.c11
-rw-r--r--graphics/evas/pkg-plist29
-rw-r--r--graphics/exhibit/Makefile4
-rw-r--r--graphics/exhibit/distinfo6
-rw-r--r--graphics/geist/Makefile4
-rw-r--r--graphics/giblib/Makefile4
-rw-r--r--graphics/hsetroot/Makefile4
-rw-r--r--graphics/imlib2/Makefile6
-rw-r--r--graphics/imlib2/distinfo6
-rw-r--r--graphics/imlib2/files/patch-configure561
-rw-r--r--graphics/imlib2/files/patch-imlib2.pc.in9
-rw-r--r--graphics/imlib2/files/patch-src_modules_loaders_loader_argb.c29
-rw-r--r--graphics/imlib2/files/patch-src_modules_loaders_loader_jpeg.c15
-rw-r--r--graphics/imlib2/files/patch-src_modules_loaders_loader_lbm.c48
-rw-r--r--graphics/imlib2/files/patch-src_modules_loaders_loader_png.c16
-rw-r--r--graphics/imlib2/files/patch-src_modules_loaders_loader_pnm.c11
-rw-r--r--graphics/imlib2/files/patch-src_modules_loaders_loader_tga.c75
-rw-r--r--graphics/imlib2/files/patch-src_modules_loaders_loader_tiff.c29
-rw-r--r--graphics/imlib2/pkg-plist2
-rw-r--r--graphics/imlib2_loaders/Makefile9
-rw-r--r--graphics/imlib2_loaders/distinfo6
-rw-r--r--graphics/kipi-plugins-kde4/Makefile4
-rw-r--r--graphics/kipi-plugins/Makefile4
-rw-r--r--graphics/libcaca/Makefile4
-rw-r--r--graphics/p5-Image-Imlib2/Makefile3
-rw-r--r--graphics/p5-Imlib2/Makefile4
-rw-r--r--graphics/qcomicbook/Makefile3
-rw-r--r--graphics/ruby-imlib2/Makefile5
-rw-r--r--graphics/telak/Makefile4
-rw-r--r--graphics/zphoto/Makefile4
-rw-r--r--lang/embryo/Makefile4
-rw-r--r--lang/embryo/distinfo6
-rw-r--r--lang/embryo/pkg-plist7
-rw-r--r--multimedia/camserv/Makefile4
-rw-r--r--multimedia/eclair/Makefile4
-rw-r--r--multimedia/eclair/distinfo6
-rw-r--r--multimedia/emotion/Makefile6
-rw-r--r--multimedia/emotion/distinfo6
-rw-r--r--multimedia/emotion/files/patch-configure30
-rw-r--r--multimedia/ffmpeg-devel/Makefile4
-rw-r--r--multimedia/ffmpeg/Makefile4
-rw-r--r--sysutils/empower/Makefile4
-rw-r--r--sysutils/empower/distinfo6
-rw-r--r--sysutils/extrackt/Makefile4
-rw-r--r--sysutils/extrackt/distinfo6
-rw-r--r--textproc/exml/Makefile4
-rw-r--r--textproc/exml/distinfo6
-rw-r--r--x11-fm/entropyfm/Makefile4
-rw-r--r--x11-fm/entropyfm/distinfo6
-rw-r--r--x11-fm/entropyfm/pkg-plist12
-rw-r--r--x11-fm/evidence/Makefile4
-rw-r--r--x11-toolkits/enhance/Makefile4
-rw-r--r--x11-toolkits/enhance/distinfo6
-rw-r--r--x11-toolkits/etk/Makefile4
-rw-r--r--x11-toolkits/etk/distinfo6
-rw-r--r--x11-toolkits/etk/pkg-plist19
-rw-r--r--x11-toolkits/ewl/Makefile4
-rw-r--r--x11-toolkits/ewl/distinfo6
-rw-r--r--x11-toolkits/ewl/pkg-plist79
-rw-r--r--x11-wm/e16/Makefile3
-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-plist1
-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-flame/Makefile4
-rw-r--r--x11-wm/e17-module-flame/distinfo6
-rw-r--r--x11-wm/e17-module-flame/pkg-plist1
-rw-r--r--x11-wm/e17-module-language/Makefile4
-rw-r--r--x11-wm/e17-module-language/distinfo6
-rw-r--r--x11-wm/e17-module-mail/Makefile4
-rw-r--r--x11-wm/e17-module-mail/distinfo6
-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-mixer/Makefile12
-rw-r--r--x11-wm/e17-module-mixer/distinfo6
-rw-r--r--x11-wm/e17-module-mixer/pkg-plist5
-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-rain/Makefile4
-rw-r--r--x11-wm/e17-module-rain/distinfo6
-rw-r--r--x11-wm/e17-module-rain/pkg-plist1
-rw-r--r--x11-wm/e17-module-screenshot/Makefile4
-rw-r--r--x11-wm/e17-module-screenshot/distinfo6
-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-snow/Makefile4
-rw-r--r--x11-wm/e17-module-snow/distinfo6
-rw-r--r--x11-wm/e17-module-snow/pkg-plist1
-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-weather/Makefile4
-rw-r--r--x11-wm/e17-module-weather/distinfo6
-rw-r--r--x11-wm/e17-module-weather/pkg-plist64
-rw-r--r--x11-wm/e17-module-winselector/Makefile4
-rw-r--r--x11-wm/e17-module-winselector/distinfo6
-rw-r--r--x11-wm/e17-utils/Makefile4
-rw-r--r--x11-wm/e17-utils/distinfo6
-rw-r--r--x11-wm/e17-utils/pkg-descr2
-rw-r--r--x11-wm/e17-utils/pkg-plist18
-rw-r--r--x11-wm/enlightenment-devel/Makefile4
-rw-r--r--x11-wm/enlightenment-devel/bsd.efl.mk4
-rw-r--r--x11-wm/enlightenment-devel/distinfo6
-rw-r--r--x11-wm/enlightenment-devel/pkg-plist48
-rw-r--r--x11-wm/enlightenment/Makefile3
-rw-r--r--x11-wm/epplets/Makefile3
-rw-r--r--x11-wm/fluxbox-devel/Makefile4
-rw-r--r--x11-wm/kahakai/Makefile4
-rw-r--r--x11-wm/phluid/Makefile4
-rw-r--r--x11-wm/skippy/Makefile4
-rw-r--r--x11-wm/waimea/Makefile4
-rw-r--r--x11/3ddesktop/Makefile4
-rw-r--r--x11/e17-module-cpu/Makefile4
-rw-r--r--x11/e17-module-cpu/distinfo6
-rw-r--r--x11/e17-module-cpu/pkg-plist1
-rw-r--r--x11/e17-module-deskshow/Makefile4
-rw-r--r--x11/e17-module-deskshow/distinfo6
-rw-r--r--x11/e17-module-flame/Makefile4
-rw-r--r--x11/e17-module-flame/distinfo6
-rw-r--r--x11/e17-module-flame/pkg-plist1
-rw-r--r--x11/e17-module-language/Makefile4
-rw-r--r--x11/e17-module-language/distinfo6
-rw-r--r--x11/e17-module-mail/Makefile4
-rw-r--r--x11/e17-module-mail/distinfo6
-rw-r--r--x11/e17-module-mem/Makefile4
-rw-r--r--x11/e17-module-mem/distinfo6
-rw-r--r--x11/e17-module-mixer/Makefile12
-rw-r--r--x11/e17-module-mixer/distinfo6
-rw-r--r--x11/e17-module-mixer/pkg-plist5
-rw-r--r--x11/e17-module-moon/Makefile4
-rw-r--r--x11/e17-module-moon/distinfo6
-rw-r--r--x11/e17-module-rain/Makefile4
-rw-r--r--x11/e17-module-rain/distinfo6
-rw-r--r--x11/e17-module-rain/pkg-plist1
-rw-r--r--x11/e17-module-screenshot/Makefile4
-rw-r--r--x11/e17-module-screenshot/distinfo6
-rw-r--r--x11/e17-module-slideshow/Makefile4
-rw-r--r--x11/e17-module-slideshow/distinfo6
-rw-r--r--x11/e17-module-snow/Makefile4
-rw-r--r--x11/e17-module-snow/distinfo6
-rw-r--r--x11/e17-module-snow/pkg-plist1
-rw-r--r--x11/e17-module-uptime/Makefile4
-rw-r--r--x11/e17-module-uptime/distinfo6
-rw-r--r--x11/e17-module-weather/Makefile4
-rw-r--r--x11/e17-module-weather/distinfo6
-rw-r--r--x11/e17-module-weather/pkg-plist64
-rw-r--r--x11/e17-module-winselector/Makefile4
-rw-r--r--x11/e17-module-winselector/distinfo6
-rw-r--r--x11/ecore/Makefile8
-rw-r--r--x11/ecore/distinfo6
-rw-r--r--x11/ecore/pkg-plist28
-rw-r--r--x11/elicit/Makefile4
-rw-r--r--x11/elicit/distinfo6
-rw-r--r--x11/enity/Makefile4
-rw-r--r--x11/enity/distinfo6
-rw-r--r--x11/enity/files/patch-src_bin_enity.c20
-rw-r--r--x11/enterminus/Makefile4
-rw-r--r--x11/enterminus/distinfo6
-rw-r--r--x11/eterm/Makefile3
-rw-r--r--x11/examine/Makefile7
-rw-r--r--x11/examine/distinfo6
-rw-r--r--x11/fbdesk/Makefile3
-rw-r--r--x11/ipager/Makefile4
-rw-r--r--x11/wmmsg/Makefile4
200 files changed, 533 insertions, 1681 deletions
diff --git a/audio/emphasis/Makefile b/audio/emphasis/Makefile
index 8f0a132a52cf..a6048ecef793 100644
--- a/audio/emphasis/Makefile
+++ b/audio/emphasis/Makefile
@@ -7,9 +7,9 @@
#
PORTNAME= emphasis
-PORTVERSION= 20060926
+PORTVERSION= 20070223
CATEGORIES= audio
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= A simple MPD (Music Player Daemon) client written in C/Etk
diff --git a/audio/emphasis/distinfo b/audio/emphasis/distinfo
index d840d1d2d967..a57d045f4dc2 100644
--- a/audio/emphasis/distinfo
+++ b/audio/emphasis/distinfo
@@ -1,3 +1,3 @@
-MD5 (emphasis-20060926.tar.bz2) = ecc15f57ef069cc8e94866aee42d7a84
-SHA256 (emphasis-20060926.tar.bz2) = e7718857fa2f0e8b7cad7937603d75759f271d6539462c67cf3eb8264b0adbd4
-SIZE (emphasis-20060926.tar.bz2) = 332890
+MD5 (emphasis-20070223.tar.bz2) = 0a3835c8b63c5ebd4185078c6e7d2eb0
+SHA256 (emphasis-20070223.tar.bz2) = e17e2564a02b19142599a8d9c4b66dcae5c10de6ba17fb1f2f767cec68bc7950
+SIZE (emphasis-20070223.tar.bz2) = 327039
diff --git a/audio/euphoria/Makefile b/audio/euphoria/Makefile
index 2652be89a382..06dd1b41bb62 100644
--- a/audio/euphoria/Makefile
+++ b/audio/euphoria/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= euphoria
-PORTVERSION= 20061008
+PORTVERSION= 20070223
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= audio
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= XMMS2 GUI frontend written with Enlightenment e17 libraries
diff --git a/audio/euphoria/distinfo b/audio/euphoria/distinfo
index 1eeeb0e0faa5..80d927a905a7 100644
--- a/audio/euphoria/distinfo
+++ b/audio/euphoria/distinfo
@@ -1,3 +1,3 @@
-MD5 (euphoria-20061008.tar.bz2) = f147191da3ea4ab28fb64dc1a28a22c5
-SHA256 (euphoria-20061008.tar.bz2) = 22c463c1706e0038e5436495b60a307adde6835f57a863583c86c32f6ddbd089
-SIZE (euphoria-20061008.tar.bz2) = 1607870
+MD5 (euphoria-20070223.tar.bz2) = 108d3a303bc2f0c222032b04110e17b7
+SHA256 (euphoria-20070223.tar.bz2) = dbe6c2f49b096223e6724b1a9783027c732d1d062d919c3301ffd4f3e32fcdcc
+SIZE (euphoria-20070223.tar.bz2) = 1605434
diff --git a/databases/edb/Makefile b/databases/edb/Makefile
index cc36beadd84a..928b49c95ff0 100644
--- a/databases/edb/Makefile
+++ b/databases/edb/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= edb
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= databases
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= Enlightenment Database Library
diff --git a/databases/edb/distinfo b/databases/edb/distinfo
index 0d3dfe3e3b36..fbcd3c55a1a5 100644
--- a/databases/edb/distinfo
+++ b/databases/edb/distinfo
@@ -1,3 +1,3 @@
-MD5 (edb-20060926.tar.bz2) = e017b04cec7a0d98938de9210d48d010
-SHA256 (edb-20060926.tar.bz2) = 28bd18dea67bf613c512c4f19957dc7ed253aa1dfff2baf7d827113f93a65860
-SIZE (edb-20060926.tar.bz2) = 474149
+MD5 (edb-20070223.tar.bz2) = 4b2afa98712b7818e7d310e4b138f9f8
+SHA256 (edb-20070223.tar.bz2) = bac58243d9c82c89180a8ca19c7f088e09f6880e1c98c65344a70a7d42d415e4
+SIZE (edb-20070223.tar.bz2) = 473643
diff --git a/deskutils/adesklets/Makefile b/deskutils/adesklets/Makefile
index 05bd550435f9..4e7627dd3581 100644
--- a/deskutils/adesklets/Makefile
+++ b/deskutils/adesklets/Makefile
@@ -7,7 +7,7 @@
PORTNAME= adesklets
PORTVERSION= 0.6.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= novel@FreeBSD.org
COMMENT= An interactive Imlib2 console for the X Window system
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2
RUN_DEPENDS= gsed:${PORTSDIR}/textproc/gsed
GNU_CONFIGURE= yes
diff --git a/deskutils/estickies/Makefile b/deskutils/estickies/Makefile
index 1ffdcef58b05..0284947afe85 100644
--- a/deskutils/estickies/Makefile
+++ b/deskutils/estickies/Makefile
@@ -7,9 +7,9 @@
#
PORTNAME= estickies
-PORTVERSION= 20060926
+PORTVERSION= 20070223
CATEGORIES= deskutils
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= A sticky notes application that uses Etk
diff --git a/deskutils/estickies/distinfo b/deskutils/estickies/distinfo
index 32b041ca8e14..a39a41618de4 100644
--- a/deskutils/estickies/distinfo
+++ b/deskutils/estickies/distinfo
@@ -1,3 +1,3 @@
-MD5 (estickies-20060926.tar.bz2) = cfad1d00d46c8a6213895bfed1c47394
-SHA256 (estickies-20060926.tar.bz2) = a5e6a644e8241728a6c384be7fc809538f39e3f519513aea2cbdb48d78a58200
-SIZE (estickies-20060926.tar.bz2) = 303607
+MD5 (estickies-20070223.tar.bz2) = deb4b3288542ae416849fef2aa97af61
+SHA256 (estickies-20070223.tar.bz2) = 402416378385a6dc90ed9ec38bbaee71dc8efa5dfaef362ed761834319889841
+SIZE (estickies-20070223.tar.bz2) = 302650
diff --git a/deskutils/kompose/Makefile b/deskutils/kompose/Makefile
index 3c8cbaa6035a..9453f6b223ac 100644
--- a/deskutils/kompose/Makefile
+++ b/deskutils/kompose/Makefile
@@ -7,14 +7,14 @@
PORTNAME= kompose
PORTVERSION= 0.5.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= deskutils kde
MASTER_SITES= http://download.berlios.de/kompose/
MAINTAINER= lauri@kde.org
COMMENT= Full-screen task manager similar to Expose(tm)
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2
EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
diff --git a/deskutils/pypanel/Makefile b/deskutils/pypanel/Makefile
index 01e193a77846..53840f2aa3db 100644
--- a/deskutils/pypanel/Makefile
+++ b/deskutils/pypanel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pypanel
PORTVERSION= 2.4
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= pypanel
@@ -17,7 +18,7 @@ COMMENT= Desktop panel written in Python
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
Xft.2:${PORTSDIR}/x11-fonts/libXft \
- Imlib2.3:${PORTSDIR}/graphics/imlib2
+ Imlib2.4:${PORTSDIR}/graphics/imlib2
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Xlib/X.py:${PORTSDIR}/x11-toolkits/py-xlib
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Xlib/X.py:${PORTSDIR}/x11-toolkits/py-xlib
diff --git a/devel/eet/Makefile b/devel/eet/Makefile
index 1a2b9c29b4dc..cc99460ad506 100644
--- a/devel/eet/Makefile
+++ b/devel/eet/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= eet
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= devel
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= Enlightenment Data Handling Library
diff --git a/devel/eet/distinfo b/devel/eet/distinfo
index e6262894d918..2f2d36f810e4 100644
--- a/devel/eet/distinfo
+++ b/devel/eet/distinfo
@@ -1,3 +1,3 @@
-MD5 (eet-20060926.tar.bz2) = 5d4e3aa7239ee2dd86b0be5977fe22c0
-SHA256 (eet-20060926.tar.bz2) = 2304db1a59b02242d60746a0f9846ec44e986c9f9223f2dddeb3dcc167177e85
-SIZE (eet-20060926.tar.bz2) = 1281777
+MD5 (eet-20070223.tar.bz2) = c8c83f8704d9caea8604456c1e154d0c
+SHA256 (eet-20070223.tar.bz2) = 6b3da808d3a3b9858fa196bd46d8e035f9ea965fb68c02436ca711e160621bf9
+SIZE (eet-20070223.tar.bz2) = 1279064
diff --git a/devel/eet/pkg-plist b/devel/eet/pkg-plist
index 756dfa5aa503..4f3b2a864ec0 100644
--- a/devel/eet/pkg-plist
+++ b/devel/eet/pkg-plist
@@ -1,6 +1,4 @@
-bin/eet
bin/eet-config
-bin/eet_bench
include/Eet.h
lib/libeet.a
lib/libeet.la
diff --git a/devel/engrave/Makefile b/devel/engrave/Makefile
index 9b41a2afe7dd..28cb13741227 100644
--- a/devel/engrave/Makefile
+++ b/devel/engrave/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= engrave
-PORTVERSION= 20060926
+PORTVERSION= 20070223
CATEGORIES= devel
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= A library for editing the contents of an edje .eet file
diff --git a/devel/engrave/distinfo b/devel/engrave/distinfo
index 3fc8a2d65526..8272f9d6c19f 100644
--- a/devel/engrave/distinfo
+++ b/devel/engrave/distinfo
@@ -1,3 +1,3 @@
-MD5 (engrave-20060926.tar.bz2) = 8ed0a54ec6786d63dad3d0ae0950122d
-SHA256 (engrave-20060926.tar.bz2) = fca45ed87e7003cca8a96df69cc786e35e5b54efecd64e8efb6489bc9e941e52
-SIZE (engrave-20060926.tar.bz2) = 250455
+MD5 (engrave-20070223.tar.bz2) = a447eb6fe13f68c3f0300390fa3bf255
+SHA256 (engrave-20070223.tar.bz2) = 1d7c1e3daec69e7ff449b38e0f9d04fa0a0112056bf94828b0f69788735c0c9f
+SIZE (engrave-20070223.tar.bz2) = 252725
diff --git a/devel/engrave/pkg-plist b/devel/engrave/pkg-plist
index 59660e61a6a8..9f8ba905f3ec 100644
--- a/devel/engrave/pkg-plist
+++ b/devel/engrave/pkg-plist
@@ -16,6 +16,7 @@ include/engrave/engrave_parse.h
include/engrave/engrave_part.h
include/engrave/engrave_part_state.h
include/engrave/engrave_program.h
+include/engrave/engrave_spectrum.h
include/engrave/engrave_style.h
lib/libengrave.a
lib/libengrave.la
diff --git a/devel/evfs/Makefile b/devel/evfs/Makefile
index dc86eb2737b3..60ba2c0d51dd 100644
--- a/devel/evfs/Makefile
+++ b/devel/evfs/Makefile
@@ -7,10 +7,10 @@
#
PORTNAME= evfs
-PORTVERSION= 20060926
-PORTREVISION= 1
+PORTVERSION= 20070223
+PORTREVISION= 0
CATEGORIES= devel
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= An extensible virtual file system library
diff --git a/devel/evfs/distinfo b/devel/evfs/distinfo
index 9bf74ff60704..4faf956f1961 100644
--- a/devel/evfs/distinfo
+++ b/devel/evfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (evfs-20060926.tar.bz2) = 99081406ea4aa6b90d9a84a6aa6a69c2
-SHA256 (evfs-20060926.tar.bz2) = c02a794fe09fe2275090fa5ebd21bb9399ef99a5b5585dd20b57a0ebb1ba84a2
-SIZE (evfs-20060926.tar.bz2) = 306055
+MD5 (evfs-20070223.tar.bz2) = 3e8435d41ce695b709260bc949fae5f4
+SHA256 (evfs-20070223.tar.bz2) = d7bdabebcdf67d346df26d7ed38cf104fe3cd933eb3a4b418f261f676ee04518
+SIZE (evfs-20070223.tar.bz2) = 305383
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index fdd0f61a2171..a1c4ffa60acc 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libast
PORTVERSION= 0.7
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://critical.ch/distfiles/ \
http://www.eterm.org/download/
@@ -15,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A library of assorted spiffy things
LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \
- Imlib2.3:${PORTSDIR}/graphics/imlib2
+ Imlib2.4:${PORTSDIR}/graphics/imlib2
USE_AUTOTOOLS= libtool:15
USE_X_PREFIX= yes
diff --git a/editors/texmacs/Makefile b/editors/texmacs/Makefile
index c85837b6c6d9..c4518d8eeb1a 100644
--- a/editors/texmacs/Makefile
+++ b/editors/texmacs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= texmacs
PORTVERSION= 1.0.6.9
+PORTREVISION= 1
CATEGORIES= editors print
MASTER_SITES= http://www.texmacs.org/Download/ftp/%SUBDIR%/ \
ftp://ftp.texmacs.org/pub/TeXmacs/%SUBDIR%/ \
@@ -42,7 +43,7 @@ MAN1= texmacs.1 fig2ps.1
MANCOMPRESSED= yes
.if !defined(WITHOUT_IMLIB2)
-LIB_DEPENDS+= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS+= Imlib2.4:${PORTSDIR}/graphics/imlib2
CONFIGURE_ARGS+= --with-imlib2
.endif
diff --git a/graphics/edje/Makefile b/graphics/edje/Makefile
index 30574d1b01e4..df65a5d36950 100644
--- a/graphics/edje/Makefile
+++ b/graphics/edje/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= edje
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= graphics
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= Edje is a complex graphical design and layout engine
diff --git a/graphics/edje/distinfo b/graphics/edje/distinfo
index b48081b17aca..89a1f9451636 100644
--- a/graphics/edje/distinfo
+++ b/graphics/edje/distinfo
@@ -1,3 +1,3 @@
-MD5 (edje-20060926.tar.bz2) = ce4874d6b3324dd39abf196841f1d0c0
-SHA256 (edje-20060926.tar.bz2) = d9bc56e6d578abe90c55006e5802e6e69106ee431ceaac6f435fc9fd290d8f0a
-SIZE (edje-20060926.tar.bz2) = 3027081
+MD5 (edje-20070223.tar.bz2) = 58cb7589902f03ea6b56bbddb1114f48
+SHA256 (edje-20070223.tar.bz2) = cb5005e8b2e5b7cf88dea639d406cdec9c2ff21bf2c2b8285283073810b51caf
+SIZE (edje-20070223.tar.bz2) = 1356646
diff --git a/graphics/edje/pkg-plist b/graphics/edje/pkg-plist
index 86d560c46a66..22a69c5a7e36 100644
--- a/graphics/edje/pkg-plist
+++ b/graphics/edje/pkg-plist
@@ -1,171 +1,13 @@
-bin/edje
bin/edje-config
bin/edje_cc
bin/edje_decc
-bin/edje_ls
bin/edje_recc
-bin/edje_test
-bin/edje_thumb
include/Edje.h
lib/libedje.a
lib/libedje.la
lib/libedje.so
lib/libedje.so.5
libdata/pkgconfig/edje.pc
-%%DATADIR%%/data/e_logo.sh
-%%DATADIR%%/data/images/bg.png
-%%DATADIR%%/data/images/e.png
-%%DATADIR%%/data/images/e001.png
-%%DATADIR%%/data/images/e002.png
-%%DATADIR%%/data/images/e003.png
-%%DATADIR%%/data/images/e004.png
-%%DATADIR%%/data/images/e005.png
-%%DATADIR%%/data/images/e006.png
-%%DATADIR%%/data/images/e007.png
-%%DATADIR%%/data/images/e008.png
-%%DATADIR%%/data/images/e009.png
-%%DATADIR%%/data/images/e010.png
-%%DATADIR%%/data/images/e011.png
-%%DATADIR%%/data/images/e012.png
-%%DATADIR%%/data/images/e013.png
-%%DATADIR%%/data/images/e014.png
-%%DATADIR%%/data/images/e015.png
-%%DATADIR%%/data/images/e016.png
-%%DATADIR%%/data/images/e017.png
-%%DATADIR%%/data/images/e018.png
-%%DATADIR%%/data/images/e019.png
-%%DATADIR%%/data/images/e020.png
-%%DATADIR%%/data/images/e021.png
-%%DATADIR%%/data/images/e022.png
-%%DATADIR%%/data/images/e023.png
-%%DATADIR%%/data/images/e024.png
-%%DATADIR%%/data/images/e025.png
-%%DATADIR%%/data/images/e026.png
-%%DATADIR%%/data/images/e027.png
-%%DATADIR%%/data/images/e028.png
-%%DATADIR%%/data/images/e029.png
-%%DATADIR%%/data/images/e030.png
-%%DATADIR%%/data/images/e031.png
-%%DATADIR%%/data/images/e032.png
-%%DATADIR%%/data/images/e033.png
-%%DATADIR%%/data/images/e034.png
-%%DATADIR%%/data/images/e035.png
-%%DATADIR%%/data/images/e036.png
-%%DATADIR%%/data/images/e037.png
-%%DATADIR%%/data/images/e038.png
-%%DATADIR%%/data/images/e039.png
-%%DATADIR%%/data/images/e040.png
-%%DATADIR%%/data/images/e041.png
-%%DATADIR%%/data/images/e042.png
-%%DATADIR%%/data/images/e043.png
-%%DATADIR%%/data/images/e044.png
-%%DATADIR%%/data/images/e045.png
-%%DATADIR%%/data/images/e046.png
-%%DATADIR%%/data/images/e047.png
-%%DATADIR%%/data/images/e048.png
-%%DATADIR%%/data/images/e049.png
-%%DATADIR%%/data/images/e050.png
-%%DATADIR%%/data/images/e051.png
-%%DATADIR%%/data/images/e052.png
-%%DATADIR%%/data/images/e053.png
-%%DATADIR%%/data/images/e054.png
-%%DATADIR%%/data/images/e055.png
-%%DATADIR%%/data/images/e056.png
-%%DATADIR%%/data/images/e057.png
-%%DATADIR%%/data/images/e058.png
-%%DATADIR%%/data/images/e059.png
-%%DATADIR%%/data/images/e060.png
-%%DATADIR%%/data/images/e061.png
-%%DATADIR%%/data/images/e062.png
-%%DATADIR%%/data/images/e063.png
-%%DATADIR%%/data/images/e064.png
-%%DATADIR%%/data/images/e065.png
-%%DATADIR%%/data/images/e066.png
-%%DATADIR%%/data/images/e067.png
-%%DATADIR%%/data/images/e068.png
-%%DATADIR%%/data/images/e069.png
-%%DATADIR%%/data/images/e070.png
-%%DATADIR%%/data/images/e071.png
-%%DATADIR%%/data/images/e072.png
-%%DATADIR%%/data/images/e073.png
-%%DATADIR%%/data/images/e074.png
-%%DATADIR%%/data/images/e075.png
-%%DATADIR%%/data/images/e076.png
-%%DATADIR%%/data/images/e077.png
-%%DATADIR%%/data/images/e078.png
-%%DATADIR%%/data/images/e079.png
-%%DATADIR%%/data/images/e080.png
-%%DATADIR%%/data/images/e081.png
-%%DATADIR%%/data/images/e082.png
-%%DATADIR%%/data/images/e083.png
-%%DATADIR%%/data/images/e084.png
-%%DATADIR%%/data/images/e085.png
-%%DATADIR%%/data/images/e086.png
-%%DATADIR%%/data/images/e087.png
-%%DATADIR%%/data/images/e088.png
-%%DATADIR%%/data/images/e089.png
-%%DATADIR%%/data/images/e090.png
-%%DATADIR%%/data/images/e091.png
-%%DATADIR%%/data/images/e092.png
-%%DATADIR%%/data/images/e093.png
-%%DATADIR%%/data/images/e094.png
-%%DATADIR%%/data/images/e095.png
-%%DATADIR%%/data/images/e096.png
-%%DATADIR%%/data/images/e097.png
-%%DATADIR%%/data/images/e098.png
-%%DATADIR%%/data/images/e099.png
-%%DATADIR%%/data/images/e100.png
-%%DATADIR%%/data/images/e101.png
-%%DATADIR%%/data/images/e102.png
-%%DATADIR%%/data/images/e103.png
-%%DATADIR%%/data/images/e104.png
-%%DATADIR%%/data/images/e105.png
-%%DATADIR%%/data/images/e106.png
-%%DATADIR%%/data/images/e107.png
-%%DATADIR%%/data/images/e108.png
-%%DATADIR%%/data/images/e109.png
-%%DATADIR%%/data/images/e110.png
-%%DATADIR%%/data/images/e111.png
-%%DATADIR%%/data/images/e112.png
-%%DATADIR%%/data/images/e113.png
-%%DATADIR%%/data/images/e114.png
-%%DATADIR%%/data/images/e115.png
-%%DATADIR%%/data/images/e116.png
-%%DATADIR%%/data/images/e117.png
-%%DATADIR%%/data/images/e118.png
-%%DATADIR%%/data/images/e119.png
-%%DATADIR%%/data/images/e120.png
-%%DATADIR%%/data/src/e_logo.edc
-%%DATADIR%%/data/src/test.edc
-%%DATADIR%%/data/template/README
-%%DATADIR%%/data/template/build_theme.sh
-%%DATADIR%%/data/template/default.edc
-%%DATADIR%%/data/template/embryo/global.edc
-%%DATADIR%%/data/template/fonts/Vera.ttf
-%%DATADIR%%/data/template/fonts/fonts.edc
-%%DATADIR%%/data/template/hashes/hashes.edc
-%%DATADIR%%/data/template/images/images.edc
-%%DATADIR%%/data/template/macros/mymacro.edc
-%%DATADIR%%/data/template/parts/bg.edc
-%%DATADIR%%/data/template/programs/bg.edc
-%%DATADIR%%/data/test/fonts/Vera.ttf
-%%DATADIR%%/data/test/fonts/VeraBI.ttf
-%%DATADIR%%/data/test/fonts/VeraBd.ttf
-%%DATADIR%%/data/test/fonts/VeraIt.ttf
-%%DATADIR%%/data/test/fonts/VeraMoBI.ttf
-%%DATADIR%%/data/test/fonts/VeraMoBd.ttf
-%%DATADIR%%/data/test/fonts/VeraMoIt.ttf
-%%DATADIR%%/data/test/fonts/VeraMono.ttf
-%%DATADIR%%/data/test/fonts/VeraSe.ttf
-%%DATADIR%%/data/test/fonts/VeraSeBd.ttf
-%%DATADIR%%/data/test/fonts/fonts.alias
-%%DATADIR%%/data/test/fonts/fonts.dir
-%%DATADIR%%/data/test/images/bg.png
-%%DATADIR%%/data/test/images/border.png
-%%DATADIR%%/data/test/images/item_normal.png
-%%DATADIR%%/data/test/images/item_selected.png
-%%DATADIR%%/data/test/images/item_title.png
-%%DATADIR%%/data/test/images/shadow.png
%%DATADIR%%/include/edje.inc
@dirrmtry %%DATADIR%%/include
@dirrmtry %%DATADIR%%/data/test/images
diff --git a/graphics/edje_viewer/Makefile b/graphics/edje_viewer/Makefile
index e2cf803cba14..98e489f2fd80 100644
--- a/graphics/edje_viewer/Makefile
+++ b/graphics/edje_viewer/Makefile
@@ -7,9 +7,9 @@
#
PORTNAME= edje_viewer
-PORTVERSION= 20060926
+PORTVERSION= 20070223
CATEGORIES= graphics
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= A simple viewer for .edj files
diff --git a/graphics/edje_viewer/distinfo b/graphics/edje_viewer/distinfo
index 3c5d6b21ee28..348b2f9fa6a2 100644
--- a/graphics/edje_viewer/distinfo
+++ b/graphics/edje_viewer/distinfo
@@ -1,3 +1,3 @@
-MD5 (edje_viewer-20060926.tar.bz2) = d4a3bdb00af5b5c847178695aa8ccb04
-SHA256 (edje_viewer-20060926.tar.bz2) = 0fe339ac3e9c4a70fdb6d942a718abb2fe362abae3e1765978128cc99da4d671
-SIZE (edje_viewer-20060926.tar.bz2) = 263533
+MD5 (edje_viewer-20070223.tar.bz2) = ca78913cccab72cc667d77f4be95ff04
+SHA256 (edje_viewer-20070223.tar.bz2) = c9fd85b81a19ad9ac20f6f5a6554837d2255efde8cbac2c5030742f8ffa0d049
+SIZE (edje_viewer-20070223.tar.bz2) = 262613
diff --git a/graphics/entice/Makefile b/graphics/entice/Makefile
index ba37a3d3ca83..abc9a846d657 100644
--- a/graphics/entice/Makefile
+++ b/graphics/entice/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= entice
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= graphics
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= An image viewer written using libraries for Enlightenment 0.17
diff --git a/graphics/entice/distinfo b/graphics/entice/distinfo
index ad0e2758c440..63517e7e19d8 100644
--- a/graphics/entice/distinfo
+++ b/graphics/entice/distinfo
@@ -1,3 +1,3 @@
-MD5 (entice-20060926.tar.bz2) = d2d786a9fd8bc26af51ff2a8d1aadb3d
-SHA256 (entice-20060926.tar.bz2) = c291eabf3ab361d486186055ee4aaac352a06f2197423fade5c853f4b675faf0
-SIZE (entice-20060926.tar.bz2) = 794085
+MD5 (entice-20070223.tar.bz2) = 3f0ba702de5679830ab09f00779e3331
+SHA256 (entice-20070223.tar.bz2) = d55495af7d2b66a3404184b84ec42e3d63c168416f40a9f7a564c9cd39c269f6
+SIZE (entice-20070223.tar.bz2) = 792196
diff --git a/graphics/epeg/Makefile b/graphics/epeg/Makefile
index e021e8e08746..f1058d66ac07 100644
--- a/graphics/epeg/Makefile
+++ b/graphics/epeg/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= epeg
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= graphics
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= An IMMENSELY FAST JPEG thumbnailer library API
diff --git a/graphics/epeg/distinfo b/graphics/epeg/distinfo
index 6feef53a100a..079569c41b92 100644
--- a/graphics/epeg/distinfo
+++ b/graphics/epeg/distinfo
@@ -1,3 +1,3 @@
-MD5 (epeg-20060926.tar.bz2) = 33ee80c85c6859084c1164e8575e4b4a
-SHA256 (epeg-20060926.tar.bz2) = cb3ae987ce05865a65ab0c3f8a14784578f14b8d43987e226ad73507b142b1ec
-SIZE (epeg-20060926.tar.bz2) = 1263246
+MD5 (epeg-20070223.tar.bz2) = adbb92d557cda3bbe1478f8c89ee71df
+SHA256 (epeg-20070223.tar.bz2) = b7b9eca6144ab9ab399134f2ca97fdef93933bd03f469cca562b0354bb2909a9
+SIZE (epeg-20070223.tar.bz2) = 1262325
diff --git a/graphics/epsilon/Makefile b/graphics/epsilon/Makefile
index 16d819181c56..a7298bfbc00a 100644
--- a/graphics/epsilon/Makefile
+++ b/graphics/epsilon/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= epsilon
-PORTVERSION= 20060926
-PORTREVISION= 1
+PORTVERSION= 20070223
+PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= graphics
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= A small, display independent, and quick thumbnailing library
diff --git a/graphics/epsilon/distinfo b/graphics/epsilon/distinfo
index 041dce9314c8..f701015354c4 100644
--- a/graphics/epsilon/distinfo
+++ b/graphics/epsilon/distinfo
@@ -1,3 +1,3 @@
-MD5 (epsilon-20060926.tar.bz2) = 796f188c4de29d43eb67625029659abe
-SHA256 (epsilon-20060926.tar.bz2) = 0efd02f9b1dfba97bebb1f44eeedd047a849289ef3f080378b3b53a299c07465
-SIZE (epsilon-20060926.tar.bz2) = 288795
+MD5 (epsilon-20070223.tar.bz2) = 6e7574727b3581c23f07b55fff215972
+SHA256 (epsilon-20070223.tar.bz2) = 6209539781617c59205266b121346db247c6c2af80a0f2036d78aa38d859896c
+SIZE (epsilon-20070223.tar.bz2) = 286825
diff --git a/graphics/esmart/Makefile b/graphics/esmart/Makefile
index be6dadbb830b..ef5223c939c4 100644
--- a/graphics/esmart/Makefile
+++ b/graphics/esmart/Makefile
@@ -6,17 +6,15 @@
#
PORTNAME= esmart
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= graphics
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= Evas smart objects development libraries
-LIB_DEPENDS= epsilon.0:${PORTSDIR}/graphics/epsilon
-
GNU_CONFIGURE= yes
USE_AUTOTOOLS= libltdl:15
USE_BZIP2= yes
diff --git a/graphics/esmart/distinfo b/graphics/esmart/distinfo
index 02e39e4587d6..9b61df6dbba1 100644
--- a/graphics/esmart/distinfo
+++ b/graphics/esmart/distinfo
@@ -1,3 +1,3 @@
-MD5 (esmart-20060926.tar.bz2) = dd492859552858c7e21b7a89525503e7
-SHA256 (esmart-20060926.tar.bz2) = a23d92cadc5df8795b6a93caaf08080c16e4918573a9d45690b5ea093a6d3a5d
-SIZE (esmart-20060926.tar.bz2) = 294546
+MD5 (esmart-20070223.tar.bz2) = a1cb39975fc802d76add1c7689eecae9
+SHA256 (esmart-20070223.tar.bz2) = 4fb398fc2b5b7cf1ee6ffbe2c6c4f16c597ec7a8a16b0c3fd21810880195c40f
+SIZE (esmart-20070223.tar.bz2) = 291879
diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile
index 912395599616..69116d90c095 100644
--- a/graphics/evas/Makefile
+++ b/graphics/evas/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= evas
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= graphics
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= A hardware-accelerated canvas API for X-Windows
diff --git a/graphics/evas/distinfo b/graphics/evas/distinfo
index 6ac8c2bbc653..b310ded67a6f 100644
--- a/graphics/evas/distinfo
+++ b/graphics/evas/distinfo
@@ -1,3 +1,3 @@
-MD5 (evas-20060926.tar.bz2) = 4cf57ca17141e52679ead8bb61e9772e
-SHA256 (evas-20060926.tar.bz2) = 029cd028b6925c4b6b99bc79247dc1fb73bd24e7747761f0126f7eb041dfe6e5
-SIZE (evas-20060926.tar.bz2) = 4343022
+MD5 (evas-20070223.tar.bz2) = 11baa88bdda77d846db0c7d090d9ec75
+SHA256 (evas-20070223.tar.bz2) = 0bd21a807092af4c5e21132cd41a2159d08b0e099dcf947fec094fdecc3d07dc
+SIZE (evas-20070223.tar.bz2) = 3683644
diff --git a/graphics/evas/files/patch-src_bin_evas_directfb_window.c b/graphics/evas/files/patch-src_bin_evas_directfb_window.c
deleted file mode 100644
index b3c9e11854f0..000000000000
--- a/graphics/evas/files/patch-src_bin_evas_directfb_window.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bin/evas_directfb_window.c.orig Wed Sep 27 00:21:47 2006
-+++ src/bin/evas_directfb_window.c Wed Sep 27 00:22:37 2006
-@@ -35,7 +35,7 @@
- #include <time.h>
-
- #include <directfb/directfb.h>
--#include <directfb/directfb_version.h>
-+#include <directfb-internal/directfb_version.h>
-
- #include "config.h"
- #include "Evas.h"
diff --git a/graphics/evas/pkg-plist b/graphics/evas/pkg-plist
index 8e95e353e86d..358a874ef42a 100644
--- a/graphics/evas/pkg-plist
+++ b/graphics/evas/pkg-plist
@@ -1,12 +1,4 @@
bin/evas-config
-%%BUFFER%%bin/evas_buffer_test
-%%DIRECTFB%%bin/evas_directfb_test
-%%DIRECTFB%%bin/evas_directfb_window
-%%WITH_GL%%bin/evas_gl_x11_test
-%%SOFTX11%%bin/evas_software_x11_perf_load
-%%SOFTX11%%bin/evas_software_x11_perf_test
-%%SOFTX11%%bin/evas_software_x11_test
-%%XRENDER%%bin/evas_xrender_x11_test
include/Evas.h
%%BUFFER%%include/Evas_Engine_Buffer.h
%%DIRECTFB%%include/Evas_Engine_DirectFB.h
@@ -75,27 +67,6 @@ lib/libevas.la
lib/libevas.so
lib/libevas.so.1
libdata/pkgconfig/evas.pc
-%%DATADIR%%/Vera.ttf
-%%DATADIR%%/VeraBI.ttf
-%%DATADIR%%/VeraBd.ttf
-%%DATADIR%%/VeraIt.ttf
-%%DATADIR%%/VeraMoBI.ttf
-%%DATADIR%%/VeraMoBd.ttf
-%%DATADIR%%/VeraMoIt.ttf
-%%DATADIR%%/VeraMono.ttf
-%%DATADIR%%/VeraSe.ttf
-%%DATADIR%%/VeraSeBd.ttf
-%%DATADIR%%/backdrop.png
-%%DATADIR%%/e_logo.png
-%%DATADIR%%/evas_logo.png
-%%DATADIR%%/fonts.alias
-%%DATADIR%%/fonts.dir
-%%DATADIR%%/panel.png
-%%DATADIR%%/panel_shadow.png
-%%DATADIR%%/panel_top.png
-%%DATADIR%%/t1.png
-%%DATADIR%%/t2.png
-%%DATADIR%%/test_pattern.png
@dirrm %%DATADIR%%
%%TIFF%%@dirrm lib/evas/modules/savers/tiff/%%E17_ARCH%%
%%TIFF%%@dirrm lib/evas/modules/savers/tiff
diff --git a/graphics/exhibit/Makefile b/graphics/exhibit/Makefile
index b9eedadbf1c7..dda886cad730 100644
--- a/graphics/exhibit/Makefile
+++ b/graphics/exhibit/Makefile
@@ -7,9 +7,9 @@
#
PORTNAME= exhibit
-PORTVERSION= 20060926
+PORTVERSION= 20070223
CATEGORIES= graphics
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= An ETK-based image viewer
diff --git a/graphics/exhibit/distinfo b/graphics/exhibit/distinfo
index 4fce8851f7c2..046f3138f8ea 100644
--- a/graphics/exhibit/distinfo
+++ b/graphics/exhibit/distinfo
@@ -1,3 +1,3 @@
-MD5 (exhibit-20060926.tar.bz2) = 0057914c0640932fff612435177e0d44
-SHA256 (exhibit-20060926.tar.bz2) = 6ed79409af59b396b8a9765cae91f6940fadbdc5a1849aafd662a87d79a5b041
-SIZE (exhibit-20060926.tar.bz2) = 276307
+MD5 (exhibit-20070223.tar.bz2) = e64b74615c31437b3cebc50677b11048
+SHA256 (exhibit-20070223.tar.bz2) = 9096329f4fdfd32d140d54eafd71c8c42cceb8774cc3b348d17c60f9595d1867
+SIZE (exhibit-20070223.tar.bz2) = 275461
diff --git a/graphics/geist/Makefile b/graphics/geist/Makefile
index 5abfc650ca07..1648de0d136d 100644
--- a/graphics/geist/Makefile
+++ b/graphics/geist/Makefile
@@ -7,14 +7,14 @@
PORTNAME= geist
PORTVERSION= 0.0.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://linuxbrit.co.uk/downloads/
MAINTAINER= danfe@FreeBSD.org
COMMENT= An object-based image creation/layout application
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2 \
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2 \
xml2.5:${PORTSDIR}/textproc/libxml2
XML_CONFIG?= ${LOCALBASE}/bin/xml2-config
diff --git a/graphics/giblib/Makefile b/graphics/giblib/Makefile
index 1af07f2a1fcb..095f911ef96d 100644
--- a/graphics/giblib/Makefile
+++ b/graphics/giblib/Makefile
@@ -7,14 +7,14 @@
PORTNAME= giblib
PORTVERSION= 1.2.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics devel
MASTER_SITES= http://linuxbrit.co.uk/downloads/
MAINTAINER= andrew.nau.ua@gmail.com
COMMENT= A utility library that includes a wrapper for imlib2
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2
USE_AUTOTOOLS= libtool:15
USE_X_PREFIX= yes
diff --git a/graphics/hsetroot/Makefile b/graphics/hsetroot/Makefile
index 8628f9026aad..f51de018c697 100644
--- a/graphics/hsetroot/Makefile
+++ b/graphics/hsetroot/Makefile
@@ -7,14 +7,14 @@
PORTNAME= hsetroot
PORTVERSION= 1.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://thegraveyard.org/files/
MAINTAINER= ports@FreeBSD.org
COMMENT= Utility to compose wallpapers for X
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2
PLIST_FILES= bin/hsetroot
USE_X_PREFIX= YES
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index ce95cd0bc9fe..26fa92e73d1f 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= imlib2
-PORTVERSION= 20060926
-PORTREVISION= 2
+PORTVERSION= 20070223
+PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= graphics
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= The next generation graphic library for enlightenment package
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index 2bf8dcfdc996..2b610209b6cb 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1,3 +1,3 @@
-MD5 (imlib2-20060926.tar.bz2) = 506262e1d17b1e402ade868010ddf465
-SHA256 (imlib2-20060926.tar.bz2) = 137f78b1de8c3c834ff836974ac05b14feb8707ee7af5458553a2b330396a86e
-SIZE (imlib2-20060926.tar.bz2) = 841866
+MD5 (imlib2-20070223.tar.bz2) = 4da363aaaa1cd6b96bff741ac62cac29
+SHA256 (imlib2-20070223.tar.bz2) = f35e8ec8f291accb931ccc0470708898fc725f82a1de7d80f300f715f6995c53
+SIZE (imlib2-20070223.tar.bz2) = 845387
diff --git a/graphics/imlib2/files/patch-configure b/graphics/imlib2/files/patch-configure
deleted file mode 100644
index dfd4c5038d45..000000000000
--- a/graphics/imlib2/files/patch-configure
+++ /dev/null
@@ -1,561 +0,0 @@
---- configure.orig Fri Feb 9 11:03:42 2007
-+++ configure Fri Feb 9 11:05:44 2007
-@@ -21387,175 +20666,7 @@
- freetype_cflags=`$FREETYPE_CONFIG --cflags`
- freetype_libs=`$FREETYPE_CONFIG --libs`
-
--if test "${ac_cv_header_X11_X_h+set}" = set; then
-- { echo "$as_me:$LINENO: checking for X11/X.h" >&5
--echo $ECHO_N "checking for X11/X.h... $ECHO_C" >&6; }
--if test "${ac_cv_header_X11_X_h+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_X_h" >&5
--echo "${ECHO_T}$ac_cv_header_X11_X_h" >&6; }
--else
-- # Is the header compilable?
--{ echo "$as_me:$LINENO: checking X11/X.h usability" >&5
--echo $ECHO_N "checking X11/X.h usability... $ECHO_C" >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--#include <X11/X.h>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_header_compiler=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_header_compiler=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
--
--# Is the header present?
--{ echo "$as_me:$LINENO: checking X11/X.h presence" >&5
--echo $ECHO_N "checking X11/X.h presence... $ECHO_C" >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <X11/X.h>
--_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-- ac_header_preproc=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_header_preproc=no
--fi
--
--rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
--
--# So? What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-- yes:no: )
-- { echo "$as_me:$LINENO: WARNING: X11/X.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: X11/X.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: X11/X.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: X11/X.h: proceeding with the compiler's result" >&2;}
-- ac_header_preproc=yes
-- ;;
-- no:yes:* )
-- { echo "$as_me:$LINENO: WARNING: X11/X.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: X11/X.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: X11/X.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: X11/X.h: check for missing prerequisite headers?" >&2;}
-- { echo "$as_me:$LINENO: WARNING: X11/X.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: X11/X.h: see the Autoconf documentation" >&2;}
-- { echo "$as_me:$LINENO: WARNING: X11/X.h: section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: X11/X.h: section \"Present But Cannot Be Compiled\"" >&2;}
-- { echo "$as_me:$LINENO: WARNING: X11/X.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: X11/X.h: proceeding with the preprocessor's result" >&2;}
-- { echo "$as_me:$LINENO: WARNING: X11/X.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: X11/X.h: in the future, the compiler will take precedence" >&2;}
--
-- ;;
--esac
--{ echo "$as_me:$LINENO: checking for X11/X.h" >&5
--echo $ECHO_N "checking for X11/X.h... $ECHO_C" >&6; }
--if test "${ac_cv_header_X11_X_h+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_cv_header_X11_X_h=$ac_header_preproc
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_X_h" >&5
--echo "${ECHO_T}$ac_cv_header_X11_X_h" >&6; }
--
--fi
--if test $ac_cv_header_X11_X_h = yes; then
-- have_x="yes"
--else
-- have_x="no"
--fi
--
--
--
--if test "x$have_x" = "xno"; then
-- # If --without-x was passed, this will be "disabled" instead of "no" --
-- # so always treat "no" as an error
-- { { echo "$as_me:$LINENO: error: no X support found. Use --x-includes and --x-libraries to specify the X
--path on your system, or --without-x to disable X support." >&5
--echo "$as_me: error: no X support found. Use --x-includes and --x-libraries to specify the X
--path on your system, or --without-x to disable X support." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--
--if test "x$have_x" = "xyes"; then
-- { echo "$as_me:$LINENO: checking for X" >&5
-+{ echo "$as_me:$LINENO: checking for X" >&5
- echo $ECHO_N "checking for X... $ECHO_C" >&6; }
-
-
-@@ -21677,17 +20788,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
- # We can compile using X headers with no special include directory.
- ac_x_includes=
- else
-@@ -21710,7 +20814,7 @@
- # See if we find them without any special options.
- # Don't add to $LIBS permanently.
- ac_save_LIBS=$LIBS
-- LIBS="-lXt $LIBS"
-+ LIBS="-lX11 $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -21739,27 +20843,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
- LIBS=$ac_save_LIBS
- # We can link X programs with no special library path.
- ac_x_libraries=
-@@ -21772,7 +20860,7 @@
- do
- # Don't even attempt the hair of trying to link an X program!
- for ac_extension in a so sl; do
-- if test -r "$ac_dir/libXt.$ac_extension"; then
-+ if test -r "$ac_dir/libX11.$ac_extension"; then
- ac_x_libraries=$ac_dir
- break 2
- fi
-@@ -21780,7 +20868,7 @@
- done
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi # $ac_x_libraries = no
-
-@@ -21817,7 +20905,153 @@
- echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }
- fi
-
--if test "$no_x" = yes; then
-+if test "x$have_x" != "xdisabled"; then
-+ if test "${ac_cv_header_X11_X_h+set}" = set; then
-+ { echo "$as_me:$LINENO: checking for X11/X.h" >&5
-+echo $ECHO_N "checking for X11/X.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_X_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_X_h" >&5
-+echo "${ECHO_T}$ac_cv_header_X11_X_h" >&6; }
-+else
-+ # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking X11/X.h usability" >&5
-+echo $ECHO_N "checking X11/X.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <X11/X.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_compiler=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking X11/X.h presence" >&5
-+echo $ECHO_N "checking X11/X.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <X11/X.h>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: X11/X.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: X11/X.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: X11/X.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: X11/X.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: X11/X.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: X11/X.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: X11/X.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: X11/X.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: X11/X.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: X11/X.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: X11/X.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: X11/X.h: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: X11/X.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: X11/X.h: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: X11/X.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: X11/X.h: in the future, the compiler will take precedence" >&2;}
-+
-+ ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for X11/X.h" >&5
-+echo $ECHO_N "checking for X11/X.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_X_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_header_X11_X_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_X_h" >&5
-+echo "${ECHO_T}$ac_cv_header_X11_X_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_X11_X_h = yes; then
-+ have_x="yes"
-+else
-+ have_x="no"
-+fi
-+
-+
-+fi
-+
-+if test "x$have_x" = "xno"; then
-+ # If --without-x was passed, this will be "disabled" instead of "no" --
-+ # so always treat "no" as an error
-+ { { echo "$as_me:$LINENO: error: no X support found. Use --x-includes and --x-libraries to specify the X
-+path on your system, or --without-x to disable X support." >&5
-+echo "$as_me: error: no X support found. Use --x-includes and --x-libraries to specify the X
-+path on your system, or --without-x to disable X support." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+if test "x$have_x" = "xyes"; then
-+ if test "$no_x" = yes; then
- # Not all programs may use this symbol, but it does not hurt to define it.
-
- cat >>confdefs.h <<\_ACEOF
-@@ -21835,12 +21069,12 @@
- X_LIBS="$X_LIBS -L$x_libraries"
- # For Solaris; some versions of Sun CC require a space after -R and
- # others require no space. Words are not sufficient . . . .
-- case `(uname -sr) 2>/dev/null` in
-- "SunOS 5"*)
-- { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-+ { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
- echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
-- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-- cat >conftest.$ac_ext <<_ACEOF
-+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-+ ac_xsave_c_werror_flag=$ac_c_werror_flag
-+ ac_c_werror_flag=yes
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21864,48 +21098,24 @@
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_R_nospace=yes
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+ X_LIBS="$X_LIBS -R$x_libraries"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_R_nospace=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-- if test $ac_R_nospace = yes; then
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-- X_LIBS="$X_LIBS -R$x_libraries"
-- else
- LIBS="$ac_xsave_LIBS -R $x_libraries"
-- cat >conftest.$ac_ext <<_ACEOF
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21933,48 +21143,30 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_R_space=yes
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ X_LIBS="$X_LIBS -R $x_libraries"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_R_space=no
-+ { echo "$as_me:$LINENO: result: neither works" >&5
-+echo "${ECHO_T}neither works" >&6; }
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-- if test $ac_R_space = yes; then
-- { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-- X_LIBS="$X_LIBS -R $x_libraries"
-- else
-- { echo "$as_me:$LINENO: result: neither works" >&5
--echo "${ECHO_T}neither works" >&6; }
-- fi
-- fi
-- LIBS=$ac_xsave_LIBS
-- esac
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+ ac_c_werror_flag=$ac_xsave_c_werror_flag
-+ LIBS=$ac_xsave_LIBS
- fi
-
- # Check for system-dependent libraries X programs must link with.
diff --git a/graphics/imlib2/files/patch-imlib2.pc.in b/graphics/imlib2/files/patch-imlib2.pc.in
new file mode 100644
index 000000000000..e32e118568ad
--- /dev/null
+++ b/graphics/imlib2/files/patch-imlib2.pc.in
@@ -0,0 +1,9 @@
+--- imlib2.pc.in.orig Mon Feb 26 02:38:45 2007
++++ imlib2.pc.in Mon Feb 26 02:38:57 2007
+@@ -8,5 +8,5 @@
+ Requires: @requirements@
+ Version: @VERSION@
+ Libs: -L${libdir} -lImlib2
+-Cflags: -I${includedir}
++Cflags: -I${includedir} @my_includes@
+
diff --git a/graphics/imlib2/files/patch-src_modules_loaders_loader_argb.c b/graphics/imlib2/files/patch-src_modules_loaders_loader_argb.c
deleted file mode 100644
index 7d3d0925140a..000000000000
--- a/graphics/imlib2/files/patch-src_modules_loaders_loader_argb.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/modules/loaders/loader_argb.c.orig Wed Nov 8 19:39:37 2006
-+++ src/modules/loaders/loader_argb.c Wed Nov 8 19:41:38 2006
-@@ -23,7 +23,7 @@
- load(ImlibImage * im, ImlibProgressFunction progress,
- char progress_granularity, char immediate_load)
- {
-- int w, h, alpha;
-+ int w = 0, h = 0, alpha = 0;
- FILE *f;
-
- if (im->data)
-@@ -36,13 +36,16 @@
- {
- char buf[256], buf2[256];
-
-+ bzero(buf, sizeof(buf));
-+ bzero(buf2, sizeof(buf2));
-+
- if (!fgets(buf, 255, f))
- {
- fclose(f);
- return 0;
- }
- sscanf(buf, "%s %i %i %i", buf2, &w, &h, &alpha);
-- if (strcmp(buf2, "ARGB"))
-+ if (strcmp(buf2, "ARGB") || w < 1 || h < 1 || w > 16383 || h > 16383)
- {
- fclose(f);
- return 0;
diff --git a/graphics/imlib2/files/patch-src_modules_loaders_loader_jpeg.c b/graphics/imlib2/files/patch-src_modules_loaders_loader_jpeg.c
deleted file mode 100644
index 9ac40f336bd0..000000000000
--- a/graphics/imlib2/files/patch-src_modules_loaders_loader_jpeg.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/modules/loaders/loader_jpeg.c.orig Wed Nov 8 19:41:41 2006
-+++ src/modules/loaders/loader_jpeg.c Wed Nov 8 19:42:43 2006
-@@ -104,8 +104,11 @@
- im->w = w = cinfo.output_width;
- im->h = h = cinfo.output_height;
-
-- if (cinfo.rec_outbuf_height > 16)
-+ if (cinfo.rec_outbuf_height > 16 \
-+ || w < 1 || h < 1 || w > 16383 || h > 16383)
- {
-+ im->w = 0;
-+ im->h = 0;
- jpeg_destroy_decompress(&cinfo);
- fclose(f);
- return 0;
diff --git a/graphics/imlib2/files/patch-src_modules_loaders_loader_lbm.c b/graphics/imlib2/files/patch-src_modules_loaders_loader_lbm.c
deleted file mode 100644
index ab5fb9aacb0f..000000000000
--- a/graphics/imlib2/files/patch-src_modules_loaders_loader_lbm.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/modules/loaders/loader_lbm.c.orig Wed Nov 8 19:42:46 2006
-+++ src/modules/loaders/loader_lbm.c Wed Nov 8 19:47:10 2006
-@@ -421,7 +421,7 @@
-
- im->w = L2RWORD(ilbm.bmhd.data);
- im->h = L2RWORD(ilbm.bmhd.data + 2);
-- if (im->w <= 0 || im->h <= 0) ok = 0;
-+ if (im->w <= 0 || im->h <= 0 || im->w > 16383 || im->h > 16383) ok = 0;
-
- ilbm.depth = ilbm.bmhd.data[8];
- if (ilbm.depth < 1 || (ilbm.depth > 8 && ilbm.depth != 24 && ilbm.depth != 32)) ok = 0; /* Only 1 to 8, 24, or 32 planes. */
-@@ -453,6 +453,8 @@
- }
- }
- if (!full || !ok) {
-+ im->w = 0;
-+ im->h = 0;
- freeilbm(&ilbm);
- return ok;
- }
-@@ -468,11 +470,14 @@
- plane[0] = NULL;
-
- im->data = malloc(im->w * im->h * sizeof(DATA32));
-- if (im->data) {
-- n = ilbm.depth;
-- if (ilbm.mask == 1) n++;
-
-- plane[0] = malloc(((im->w + 15) / 16) * 2 * n);
-+ n = ilbm.depth;
-+ if (ilbm.mask == 1)
-+ n++;
-+
-+ plane[0] = malloc(((im->w + 15) / 16) * 2 * n);
-+
-+ if (im->data != NULL && plane[0] != NULL) {
- for (i = 1; i < n; i++) plane[i] = plane[i - 1] + ((im->w + 15) / 16) * 2;
-
- z = ((im->w + 15) / 16) * 2 * n;
-@@ -511,6 +516,8 @@
- * the memory for im->data.
- *----------*/
- if (!ok) {
-+ im->w = 0;
-+ im->h = 0;
- if (im->data) free(im->data);
- im->data = NULL;
- }
diff --git a/graphics/imlib2/files/patch-src_modules_loaders_loader_png.c b/graphics/imlib2/files/patch-src_modules_loaders_loader_png.c
deleted file mode 100644
index 0eeb196eb47d..000000000000
--- a/graphics/imlib2/files/patch-src_modules_loaders_loader_png.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/modules/loaders/loader_png.c.orig Wed Nov 8 19:47:13 2006
-+++ src/modules/loaders/loader_png.c Wed Nov 8 19:48:04 2006
-@@ -83,6 +83,13 @@
- png_get_IHDR(png_ptr, info_ptr, (png_uint_32 *) (&w32),
- (png_uint_32 *) (&h32), &bit_depth, &color_type,
- &interlace_type, NULL, NULL);
-+ if (w32 < 1 || h32 < 1 || w32 > 16383 || h32 > 16383) {
-+ png_read_end(png_ptr, info_ptr);
-+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
-+ fclose(f);
-+ return 0;
-+ }
-+
- im->w = (int)w32;
- im->h = (int)h32;
- if (color_type == PNG_COLOR_TYPE_PALETTE)
diff --git a/graphics/imlib2/files/patch-src_modules_loaders_loader_pnm.c b/graphics/imlib2/files/patch-src_modules_loaders_loader_pnm.c
deleted file mode 100644
index 32262a903558..000000000000
--- a/graphics/imlib2/files/patch-src_modules_loaders_loader_pnm.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/modules/loaders/loader_pnm.c.orig Wed Nov 8 19:48:10 2006
-+++ src/modules/loaders/loader_pnm.c Wed Nov 8 19:48:51 2006
-@@ -80,7 +80,7 @@
- int i = 0;
-
- /* read numbers */
-- while (c != EOF && !isspace(c))
-+ while (c != EOF && !isspace(c) && (sizeof(buf) < (i + 1)))
- {
- buf[i++] = c;
- c = fgetc(f);
diff --git a/graphics/imlib2/files/patch-src_modules_loaders_loader_tga.c b/graphics/imlib2/files/patch-src_modules_loaders_loader_tga.c
deleted file mode 100644
index 422f02f8dbff..000000000000
--- a/graphics/imlib2/files/patch-src_modules_loaders_loader_tga.c
+++ /dev/null
@@ -1,75 +0,0 @@
---- src/modules/loaders/loader_tga.c.orig Wed Nov 8 19:48:53 2006
-+++ src/modules/loaders/loader_tga.c Wed Nov 8 19:54:47 2006
-@@ -319,6 +319,7 @@
- {
- unsigned long datasize;
- unsigned char *bufptr;
-+ unsigned char *bufend;
- DATA32 *dataptr;
-
- int y;
-@@ -347,6 +348,9 @@
- /* bufptr is the next byte to be read from the buffer */
- bufptr = filedata;
-
-+ /* bufend is one past the last byte to be read from the buffer */
-+ bufend = filedata + datasize;
-+
- /* dataptr is the next 32-bit pixel to be filled in */
- dataptr = im->data;
-
-@@ -364,7 +368,8 @@
- else
- dataptr = im->data + (y * im->w);
-
-- for (x = 0; x < im->w; x++) /* for each pixel in the row */
-+ /* for each pixel in the row */
-+ for (x = 0; x < im->w && ((bufptr + bpp/8) < bufend); x++)
- {
- switch (bpp)
- {
-@@ -419,7 +424,7 @@
- DATA32 *final_pixel = dataptr + im->w * im->h;
-
- /* loop until we've got all the pixels */
-- while (dataptr < final_pixel)
-+ while (dataptr < final_pixel && ((bufptr + 1 + bpp/8) < bufend))
- {
- int count;
-
-@@ -437,7 +442,7 @@
- green = *bufptr++;
- red = *bufptr++;
- alpha = *bufptr++;
-- for (i = 0; i < count; i++)
-+ for (i = 0; i < count && dataptr < final_pixel; i++)
- {
- WRITE_RGBA(dataptr, red, green, blue, alpha);
- dataptr++;
-@@ -448,7 +453,7 @@
- blue = *bufptr++;
- green = *bufptr++;
- red = *bufptr++;
-- for (i = 0; i < count; i++)
-+ for (i = 0; i < count && dataptr < final_pixel; i++)
- {
- WRITE_RGBA(dataptr, red, green, blue,
- (char)0xff);
-@@ -458,7 +463,7 @@
-
- case 8:
- alpha = *bufptr++;
-- for (i = 0; i < count; i++)
-+ for (i = 0; i < count && dataptr < final_pixel; i++)
- {
- WRITE_RGBA(dataptr, alpha, alpha, alpha,
- (char)0xff);
-@@ -473,7 +478,7 @@
- {
- int i;
-
-- for (i = 0; i < count; i++)
-+ for (i = 0; i < count && dataptr < final_pixel; i++)
- {
- switch (bpp)
- {
diff --git a/graphics/imlib2/files/patch-src_modules_loaders_loader_tiff.c b/graphics/imlib2/files/patch-src_modules_loaders_loader_tiff.c
deleted file mode 100644
index 27ec0d0b290a..000000000000
--- a/graphics/imlib2/files/patch-src_modules_loaders_loader_tiff.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/modules/loaders/loader_tiff.c.orig Tue Sep 26 23:17:49 2006
-+++ src/modules/loaders/loader_tiff.c Wed Nov 8 19:58:57 2006
-@@ -75,7 +75,7 @@
- raster(TIFFRGBAImage_Extra * img, uint32 * rast,
- uint32 x, uint32 y, uint32 w, uint32 h)
- {
-- uint32 image_width, image_height;
-+ int image_width, image_height;
- uint32 *pixel, pixel_value;
- int i, j, dy, rast_offset;
- DATA32 *buffer_pixel, *buffer = img->image->data;
-@@ -202,8 +202,15 @@
- }
-
- rgba_image.image = im;
-- im->w = width = rgba_image.rgba.width;
-- im->h = height = rgba_image.rgba.height;
-+ width = rgba_image.rgba.width;
-+ height = rgba_image.rgba.height;
-+ if (width < 1 || height < 1 || width >= 16384 || height >= 16384) {
-+ TIFFRGBAImageEnd((TIFFRGBAImage *) & rgba_image);
-+ TIFFClose(tif);
-+ return 0;
-+ }
-+ im->w = width;
-+ im->h = height;
- rgba_image.num_pixels = num_pixels = width * height;
- if (rgba_image.rgba.alpha != EXTRASAMPLE_UNSPECIFIED)
- SET_FLAG(im->flags, F_HAS_ALPHA);
diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist
index 9e59bb39bb93..46eeebc0e5de 100644
--- a/graphics/imlib2/pkg-plist
+++ b/graphics/imlib2/pkg-plist
@@ -59,7 +59,7 @@ lib/imlib2/loaders/zlib.so
lib/libImlib2.a
lib/libImlib2.la
lib/libImlib2.so
-lib/libImlib2.so.3
+lib/libImlib2.so.4
libdata/pkgconfig/imlib2.pc
%%DATADIR%%/data/fonts/cinema.ttf
%%DATADIR%%/data/fonts/grunge.ttf
diff --git a/graphics/imlib2_loaders/Makefile b/graphics/imlib2_loaders/Makefile
index dbe0c30cc762..e97b634b9241 100644
--- a/graphics/imlib2_loaders/Makefile
+++ b/graphics/imlib2_loaders/Makefile
@@ -6,22 +6,19 @@
#
PORTNAME= imlib2_loaders
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= graphics
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= Extra image loader plugins for Imlib 2
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2 \
- edb.1:${PORTSDIR}/databases/edb \
- eet.9:${PORTSDIR}/devel/eet
-
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget
+USE_EFL= edb eet imlib2
OPTIONS= EDB "Enable edb loader" on \
EET "Enable eet loader" on \
diff --git a/graphics/imlib2_loaders/distinfo b/graphics/imlib2_loaders/distinfo
index c2dd1711461d..c619d0adf08a 100644
--- a/graphics/imlib2_loaders/distinfo
+++ b/graphics/imlib2_loaders/distinfo
@@ -1,3 +1,3 @@
-MD5 (imlib2_loaders-20060926.tar.bz2) = 452b7661ed24be80ebf1d8755e5bbfa4
-SHA256 (imlib2_loaders-20060926.tar.bz2) = e70e057076013f20dd37645bf55ea0740f0ff5905847be50e57f20216583f192
-SIZE (imlib2_loaders-20060926.tar.bz2) = 242000
+MD5 (imlib2_loaders-20070223.tar.bz2) = 44f88b81042b4cd205505a20058c89f4
+SHA256 (imlib2_loaders-20070223.tar.bz2) = f8476002583e4277840010fef3e56071849ec85b4f5b24e860fabf01e3f69c8d
+SIZE (imlib2_loaders-20070223.tar.bz2) = 240441
diff --git a/graphics/kipi-plugins-kde4/Makefile b/graphics/kipi-plugins-kde4/Makefile
index 895192a9ec91..f1ada3e41215 100644
--- a/graphics/kipi-plugins-kde4/Makefile
+++ b/graphics/kipi-plugins-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kipi-plugins
PORTVERSION= 0.1.3
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -185,7 +185,7 @@ PLIST_SUB+= SIMPLEVIEWEREXPORT:="@comment "
.if !defined(WITHOUT_SLIDESHOW)
PLIST_SUB+= SLIDESHOW:=""
SUBDIRS+= slideshow
-LIB_DEPENDS+= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS+= Imlib2.4:${PORTSDIR}/graphics/imlib2
.else
PLIST_SUB+= SLIDESHOW:="@comment "
.endif
diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
index 895192a9ec91..f1ada3e41215 100644
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kipi-plugins
PORTVERSION= 0.1.3
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -185,7 +185,7 @@ PLIST_SUB+= SIMPLEVIEWEREXPORT:="@comment "
.if !defined(WITHOUT_SLIDESHOW)
PLIST_SUB+= SLIDESHOW:=""
SUBDIRS+= slideshow
-LIB_DEPENDS+= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS+= Imlib2.4:${PORTSDIR}/graphics/imlib2
.else
PLIST_SUB+= SLIDESHOW:="@comment "
.endif
diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile
index 9303088c7026..1b44b22e332f 100644
--- a/graphics/libcaca/Makefile
+++ b/graphics/libcaca/Makefile
@@ -6,7 +6,7 @@
PORTNAME= libcaca
PORTVERSION= 0.9
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://libcaca.zoy.org/files/
@@ -29,7 +29,7 @@ USE_XLIB= yes
.if defined(WITHOUT_IMLIB2)
CONFIGURE_ARGS+= --disable-imlib2
.else
-LIB_DEPENDS+= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS+= Imlib2.4:${PORTSDIR}/graphics/imlib2
.endif
.include <bsd.port.pre.mk>
diff --git a/graphics/p5-Image-Imlib2/Makefile b/graphics/p5-Image-Imlib2/Makefile
index 97e004699f3d..534b8792eb22 100644
--- a/graphics/p5-Image-Imlib2/Makefile
+++ b/graphics/p5-Image-Imlib2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Image-Imlib2
PORTVERSION= 1.13
+PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Image
@@ -15,7 +16,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl interface to the Imlib2 image library
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2
BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
PERL_MODBUILD= yes
diff --git a/graphics/p5-Imlib2/Makefile b/graphics/p5-Imlib2/Makefile
index 97c7809ca315..817e8eaa74b9 100644
--- a/graphics/p5-Imlib2/Makefile
+++ b/graphics/p5-Imlib2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Imlib2
PORTVERSION= 1.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics perl5
MASTER_SITES= http://www.muhri.net/
PKGNAMEPREFIX= p5-
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-Perl-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl bindings for Imlib2
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2
PERL_CONFIGURE= yes
diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile
index b8a9cb7c1fe0..5ca70f28f9c4 100644
--- a/graphics/qcomicbook/Makefile
+++ b/graphics/qcomicbook/Makefile
@@ -7,13 +7,14 @@
PORTNAME= qcomicbook
PORTVERSION= 0.3.4
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://linux.bydg.org/~yogin/
MAINTAINER= ports@FreeBSD.org
COMMENT= QT-based comic book archive viewer
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2
RUN_DEPENDS= unzip:${PORTSDIR}/archivers/unzip \
unrar:${PORTSDIR}/archivers/unrar
diff --git a/graphics/ruby-imlib2/Makefile b/graphics/ruby-imlib2/Makefile
index abb10d5db54d..49cdde3afd79 100644
--- a/graphics/ruby-imlib2/Makefile
+++ b/graphics/ruby-imlib2/Makefile
@@ -7,16 +7,17 @@
PORTNAME= imlib2
PORTVERSION= 0.5.2
+PORTREVISION= 1
CATEGORIES= graphics ruby
MASTER_SITES= http://www.pablotron.org/download/
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-ruby-${PORTVERSION}
DIST_SUBDIR= ruby
-MAINTAINER= ssedov@mbsd.msk.ru
+MAINTAINER= stas@FreeBSD.org
COMMENT= Imlib2 bindings for Ruby
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
diff --git a/graphics/telak/Makefile b/graphics/telak/Makefile
index c00c6f9c0014..0a6ee3b03ee0 100644
--- a/graphics/telak/Makefile
+++ b/graphics/telak/Makefile
@@ -7,7 +7,7 @@
PORTNAME= telak
PORTVERSION= 0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://julien.danjou.info/telak/ \
http://critical.ch/distfiles/ \
@@ -18,7 +18,7 @@ COMMENT= A tool to draw pictures on your root window
LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl \
gcrypt.13:${PORTSDIR}/security/libgcrypt \
- Imlib2.3:${PORTSDIR}/graphics/imlib2
+ Imlib2.4:${PORTSDIR}/graphics/imlib2
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/graphics/zphoto/Makefile b/graphics/zphoto/Makefile
index e2bfdd10a39f..eedd6147882b 100644
--- a/graphics/zphoto/Makefile
+++ b/graphics/zphoto/Makefile
@@ -7,7 +7,7 @@
PORTNAME= zphoto
PORTVERSION= 1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics www
MASTER_SITES= http://namazu.org/~satoru/zphoto/
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,7 +16,7 @@ MAINTAINER= umeno@rr.iij4u.or.jp
COMMENT= Zooming photo album generator
LIB_DEPENDS= ming.4:${PORTSDIR}/graphics/ming \
- Imlib2.3:${PORTSDIR}/graphics/imlib2 \
+ Imlib2.4:${PORTSDIR}/graphics/imlib2 \
popt.0:${PORTSDIR}/devel/popt
.if !defined (WITHOUT_AVIPLAY)
LIB_DEPENDS+= aviplay.0:${PORTSDIR}/multimedia/avifile
diff --git a/lang/embryo/Makefile b/lang/embryo/Makefile
index c5ba2c12889b..b12c085a7731 100644
--- a/lang/embryo/Makefile
+++ b/lang/embryo/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= embryo
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= lang
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= A C like scripting language used in parts of the Enlightenment
diff --git a/lang/embryo/distinfo b/lang/embryo/distinfo
index e801d8c76e8a..56ba1186b9fb 100644
--- a/lang/embryo/distinfo
+++ b/lang/embryo/distinfo
@@ -1,3 +1,3 @@
-MD5 (embryo-20060926.tar.bz2) = 6e17b8f3b46151b012e84710e1ba35c0
-SHA256 (embryo-20060926.tar.bz2) = c96f8c8a4a2b88c330a78708e2c92ba23e1804d86f7683b00f99ca897f1f89e8
-SIZE (embryo-20060926.tar.bz2) = 1383757
+MD5 (embryo-20070223.tar.bz2) = d730a88a0b26a0c4d3788ac6d4612620
+SHA256 (embryo-20070223.tar.bz2) = 69960a1d1c7fbe59bea0c0226c74836730c3a01df4066fd8773199b6c3d0d332
+SIZE (embryo-20070223.tar.bz2) = 1378368
diff --git a/lang/embryo/pkg-plist b/lang/embryo/pkg-plist
index a4c22e0b89be..d76f0d462b16 100644
--- a/lang/embryo/pkg-plist
+++ b/lang/embryo/pkg-plist
@@ -1,4 +1,3 @@
-bin/embryo
bin/embryo-config
bin/embryo_cc
include/Embryo.h
@@ -7,12 +6,6 @@ lib/libembryo.la
lib/libembryo.so
lib/libembryo.so.9
libdata/pkgconfig/embryo.pc
-%%DATADIR%%/examples/example.inc
-%%DATADIR%%/examples/example.sma
-%%DATADIR%%/examples/recurse.inc
-%%DATADIR%%/examples/recurse.sma
-%%DATADIR%%/examples/test.inc
-%%DATADIR%%/examples/test.sma
%%DATADIR%%/include/default.inc
@dirrm %%DATADIR%%/include
@dirrm %%DATADIR%%/examples
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index baad9db113a4..66f17a7a10f4 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -7,7 +7,7 @@
PORTNAME= camserv
PORTVERSION= 0.5.1
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -17,7 +17,7 @@ MAINTAINER= uspoerlein@gmail.com
COMMENT= Camserv is a free program to do streaming video via the web
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- Imlib2.3:${PORTSDIR}/graphics/imlib2 \
+ Imlib2.4:${PORTSDIR}/graphics/imlib2 \
gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
freetype.9:${PORTSDIR}/print/freetype2
diff --git a/multimedia/eclair/Makefile b/multimedia/eclair/Makefile
index c4f62a12d0e6..8d373e16dc4e 100644
--- a/multimedia/eclair/Makefile
+++ b/multimedia/eclair/Makefile
@@ -7,9 +7,9 @@
#
PORTNAME= eclair
-PORTVERSION= 20060926
+PORTVERSION= 20070223
CATEGORIES= multimedia
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= An EFL powered media player
diff --git a/multimedia/eclair/distinfo b/multimedia/eclair/distinfo
index f9e7657641de..3c0cba3d2b3d 100644
--- a/multimedia/eclair/distinfo
+++ b/multimedia/eclair/distinfo
@@ -1,3 +1,3 @@
-MD5 (eclair-20060926.tar.bz2) = 41ae9ab91f36e1fc98230903f64d0848
-SHA256 (eclair-20060926.tar.bz2) = 7b68e45df6ebfd66c009c76c0f522f6a84a6a3c06c103f6cd350cad626f41afc
-SIZE (eclair-20060926.tar.bz2) = 628890
+MD5 (eclair-20070223.tar.bz2) = 5ae249d9c5501fd0dd150cf20082727f
+SHA256 (eclair-20070223.tar.bz2) = 9cf60e23c68118be5f81fdba15bc5ef40c9f97ac0e79d81bf3cb6f30e522b97e
+SIZE (eclair-20070223.tar.bz2) = 635817
diff --git a/multimedia/emotion/Makefile b/multimedia/emotion/Makefile
index 396d30179e3d..5431e658e013 100644
--- a/multimedia/emotion/Makefile
+++ b/multimedia/emotion/Makefile
@@ -7,10 +7,10 @@
#
PORTNAME= emotion
-PORTVERSION= 20060926
-PORTREVISION= 2
+PORTVERSION= 20070223
+PORTREVISION= 0
CATEGORIES= multimedia
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= Video playback wrapper library for e17
diff --git a/multimedia/emotion/distinfo b/multimedia/emotion/distinfo
index b601eba58e91..ea9ad31b793e 100644
--- a/multimedia/emotion/distinfo
+++ b/multimedia/emotion/distinfo
@@ -1,3 +1,3 @@
-MD5 (emotion-20060926.tar.bz2) = 20b25be2a8ae59b704dbb6b3e37100df
-SHA256 (emotion-20060926.tar.bz2) = 4e007b703cb7c2f2d52336e661968d647df9f40dcc54f5694a0e59f51b1c5886
-SIZE (emotion-20060926.tar.bz2) = 1434266
+MD5 (emotion-20070223.tar.bz2) = ef6e89c28b367fa4ed54d853d63694e1
+SHA256 (emotion-20070223.tar.bz2) = 640fc990183682d2f39376dbd65ba9a69b1ebd5a997f379ab7b9cded2d03fb55
+SIZE (emotion-20070223.tar.bz2) = 1433834
diff --git a/multimedia/emotion/files/patch-configure b/multimedia/emotion/files/patch-configure
deleted file mode 100644
index ce8584392d2d..000000000000
--- a/multimedia/emotion/files/patch-configure
+++ /dev/null
@@ -1,30 +0,0 @@
---- configure.orig Wed Sep 27 19:06:08 2006
-+++ configure Wed Sep 27 19:08:36 2006
-@@ -22241,27 +22241,6 @@
- _ACEOF
-
-
--function vser
--{
-- v=$1
-- VSTART=`echo $v | awk -F_ '{printf("%s", $1);}'`
-- V1=`echo $VSTART | awk -F\. '{printf("%s", $1);}'`
-- V2=`echo $VSTART | awk -F\. '{printf("%s", $2);}'`
-- V3=`echo $VSTART | awk -F\. '{printf("%s", $3);}'`
-- V4="0"
-- VEND=`echo $v | awk -F_ '{printf("%s", $2);}'`
-- if test -n "$VEND"; then
-- V4=`echo $VEND | sed s/pre//`
-- fi
-- V3=$(( $V3 * 100 ));
-- V2=$(( $V2 * 10000 ));
-- V1=$(( $V1 * 1000000 ));
-- V=$(( $V4 + $V3 + $V2 + $V1 ));
-- echo $V
--}
--
--
--
- # Check whether --with-eet-prefix was given.
- if test "${with_eet_prefix+set}" = set; then
- withval=$with_eet_prefix; eet_config_prefix="$withval"
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index 33bea58bb75d..1c28d6ff4dd6 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ffmpeg
DISTVERSION= 0.4.9.cvs.${RELEASE_DATE}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= ${MASTER_SITE_LOCAL}
# http://mplayerhq.hu/MPlayer/cvs/
@@ -332,7 +332,7 @@ PLIST_FILES+= lib/vhook/drawtext.so
# enable imlib2
. ifdef(WITH_IMLIB2)
-LIB_DEPENDS+= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS+= Imlib2.4:${PORTSDIR}/graphics/imlib2
PLIST_FILES+= lib/vhook/imlib2.so
. else
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 804896cceeee..462c3845e8ef 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ffmpeg
DISTVERSION= 0.4.9-pre1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= multimedia audio net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ffmpeg
@@ -135,7 +135,7 @@ PLIST_SUB+= DRAWTEXT="@comment "
.endif
## enable imlib2
.if !defined(WITHOUT_VHOOK) && defined(WITH_IMLIB2)
-LIB_DEPENDS+= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS+= Imlib2.4:${PORTSDIR}/graphics/imlib2
PLIST_SUB+= IMLIB2=""
.else
diff --git a/sysutils/empower/Makefile b/sysutils/empower/Makefile
index bd91787a1ca9..c9586bc6df96 100644
--- a/sysutils/empower/Makefile
+++ b/sysutils/empower/Makefile
@@ -7,9 +7,9 @@
#
PORTNAME= empower
-PORTVERSION= 20060926
+PORTVERSION= 20070223
CATEGORIES= sysutils
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= A graphical sudo tool based on the EFL
diff --git a/sysutils/empower/distinfo b/sysutils/empower/distinfo
index 4f3509e578a3..e9d41efe110f 100644
--- a/sysutils/empower/distinfo
+++ b/sysutils/empower/distinfo
@@ -1,3 +1,3 @@
-MD5 (empower-20060926.tar.bz2) = 7f6facf3800cd4617796e7f5ba1728b3
-SHA256 (empower-20060926.tar.bz2) = e413700b54541d543ffdb50d6e9b658c821d763c47e048d955363d41ae821701
-SIZE (empower-20060926.tar.bz2) = 214607
+MD5 (empower-20070223.tar.bz2) = c7f984c38ad632e6507411b76a3237d8
+SHA256 (empower-20070223.tar.bz2) = ed8098e5a5f7cefa0199b939c386aa12e1ed9a638d39c31f7729f3d3ce1a9d6a
+SIZE (empower-20070223.tar.bz2) = 212599
diff --git a/sysutils/extrackt/Makefile b/sysutils/extrackt/Makefile
index ac1a6d5d1530..ddf53a211a1d 100644
--- a/sysutils/extrackt/Makefile
+++ b/sysutils/extrackt/Makefile
@@ -7,9 +7,9 @@
#
PORTNAME= extrackt
-PORTVERSION= 20060926
+PORTVERSION= 20070223
CATEGORIES= sysutils
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= Audio CD ripper and encoder
diff --git a/sysutils/extrackt/distinfo b/sysutils/extrackt/distinfo
index bc3f5153608f..47376b4f041f 100644
--- a/sysutils/extrackt/distinfo
+++ b/sysutils/extrackt/distinfo
@@ -1,3 +1,3 @@
-MD5 (extrackt-20060926.tar.bz2) = 1c737fbf85feec5870c07af8c5b4b32e
-SHA256 (extrackt-20060926.tar.bz2) = 8281ed20c351196153b408ea7ca0748e3098eb959d84049f353d19fbdde5aa1e
-SIZE (extrackt-20060926.tar.bz2) = 351885
+MD5 (extrackt-20070223.tar.bz2) = ee399a85d3c69b7da3826a8a5e3b73cf
+SHA256 (extrackt-20070223.tar.bz2) = 49eacb7f183030a3a30e90ddaaf5a9a9c913c4d3b1e83bfb9701d75792319d8e
+SIZE (extrackt-20070223.tar.bz2) = 353002
diff --git a/textproc/exml/Makefile b/textproc/exml/Makefile
index ed057ef63596..128e286b6297 100644
--- a/textproc/exml/Makefile
+++ b/textproc/exml/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= exml
-PORTVERSION= 20060926
+PORTVERSION= 20070223
CATEGORIES= textproc
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= EXML is an abstracted, generalized interface to libxml
diff --git a/textproc/exml/distinfo b/textproc/exml/distinfo
index 3c58efe2cfca..22c807cc41e6 100644
--- a/textproc/exml/distinfo
+++ b/textproc/exml/distinfo
@@ -1,3 +1,3 @@
-MD5 (exml-20060926.tar.bz2) = bd602db3cd8ce68733a95be6854b4034
-SHA256 (exml-20060926.tar.bz2) = 670908adc3b77df84f9146435127032e38ffc3b91fdde299d19b6094f11b350d
-SIZE (exml-20060926.tar.bz2) = 224804
+MD5 (exml-20070223.tar.bz2) = ccb3c359e536bb58187b2531dc0e7774
+SHA256 (exml-20070223.tar.bz2) = a61fa98761b7060da3708253b6311f2474da26fd08721978d5b6592bdcea4a4b
+SIZE (exml-20070223.tar.bz2) = 224487
diff --git a/x11-fm/entropyfm/Makefile b/x11-fm/entropyfm/Makefile
index 8a163f8f100a..26411d983c0d 100644
--- a/x11-fm/entropyfm/Makefile
+++ b/x11-fm/entropyfm/Makefile
@@ -7,9 +7,9 @@
#
PORTNAME= entropyfm
-PORTVERSION= 20060926
+PORTVERSION= 20070223
CATEGORIES= x11-fm
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
DISTNAME= ${PORTNAME:S,fm$,,}-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
diff --git a/x11-fm/entropyfm/distinfo b/x11-fm/entropyfm/distinfo
index 1c34b9587a4d..0c22ba543813 100644
--- a/x11-fm/entropyfm/distinfo
+++ b/x11-fm/entropyfm/distinfo
@@ -1,3 +1,3 @@
-MD5 (entropy-20060926.tar.bz2) = e15bba87db5b3d92eb56aca4950f9e26
-SHA256 (entropy-20060926.tar.bz2) = 2f5d21d972b4dcc45217983e0ae634d1dd1ebdf1fa7bee174d47c16de4c9670b
-SIZE (entropy-20060926.tar.bz2) = 480435
+MD5 (entropy-20070223.tar.bz2) = 45e35d8fddfe708d960441284b6bc424
+SHA256 (entropy-20070223.tar.bz2) = a73995c99e174e33b938ef9ebc68b58bcc7cd00012d82773ae6448164e2ee9f2
+SIZE (entropy-20070223.tar.bz2) = 479895
diff --git a/x11-fm/entropyfm/pkg-plist b/x11-fm/entropyfm/pkg-plist
index facc906ead50..17539472455f 100644
--- a/x11-fm/entropyfm/pkg-plist
+++ b/x11-fm/entropyfm/pkg-plist
@@ -57,21 +57,12 @@ bin/entropy
%%DATADIR%%/plugins/etk_trackback.a
%%DATADIR%%/plugins/etk_trackback.la
%%DATADIR%%/plugins/etk_trackback.so
-%%DATADIR%%/plugins/ewl_list.a
-%%DATADIR%%/plugins/ewl_list.la
-%%DATADIR%%/plugins/ewl_list.so
-%%DATADIR%%/plugins/ewl_local_icon.a
-%%DATADIR%%/plugins/ewl_local_icon.la
-%%DATADIR%%/plugins/ewl_local_icon.so
%%DATADIR%%/plugins/imlib_thumbnailer.a
%%DATADIR%%/plugins/imlib_thumbnailer.la
%%DATADIR%%/plugins/imlib_thumbnailer.so
%%DATADIR%%/plugins/layout_etk_simple.a
%%DATADIR%%/plugins/layout_etk_simple.la
%%DATADIR%%/plugins/layout_etk_simple.so
-%%DATADIR%%/plugins/layout_ewl_simple.a
-%%DATADIR%%/plugins/layout_ewl_simple.la
-%%DATADIR%%/plugins/layout_ewl_simple.so
%%EXTRACT%%%%DATADIR%%/plugins/metadata_extract.a
%%EXTRACT%%%%DATADIR%%/plugins/metadata_extract.la
%%EXTRACT%%%%DATADIR%%/plugins/metadata_extract.so
@@ -84,9 +75,6 @@ bin/entropy
%%DATADIR%%/plugins/remote_thumbnailer.a
%%DATADIR%%/plugins/remote_thumbnailer.la
%%DATADIR%%/plugins/remote_thumbnailer.so
-%%DATADIR%%/plugins/structure_viewer.a
-%%DATADIR%%/plugins/structure_viewer.la
-%%DATADIR%%/plugins/structure_viewer.so
%%DATADIR%%/plugins/system_thumbnailer.a
%%DATADIR%%/plugins/system_thumbnailer.la
%%DATADIR%%/plugins/system_thumbnailer.so
diff --git a/x11-fm/evidence/Makefile b/x11-fm/evidence/Makefile
index f55fddee503d..8a955105ea99 100644
--- a/x11-fm/evidence/Makefile
+++ b/x11-fm/evidence/Makefile
@@ -7,7 +7,7 @@
PORTNAME= evidence
PORTVERSION= 0.9.8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-fm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,7 +16,7 @@ MAINTAINER= freebsd@troback.com
COMMENT= Enlightened file-manager
BUILD_DEPENDS= pngtopnm:${PORTSDIR}/graphics/netpbm
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2 \
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2 \
evas.1:${PORTSDIR}/graphics/evas \
edje.5:${PORTSDIR}/graphics/edje \
ecore.1:${PORTSDIR}/x11/ecore \
diff --git a/x11-toolkits/enhance/Makefile b/x11-toolkits/enhance/Makefile
index bd71a7c79795..e7144cbf9882 100644
--- a/x11-toolkits/enhance/Makefile
+++ b/x11-toolkits/enhance/Makefile
@@ -7,9 +7,9 @@
#
PORTNAME= enhance
-PORTVERSION= 20060926
+PORTVERSION= 20070223
CATEGORIES= x11-toolkits
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= A library for rapid application development with ETK/Glade
diff --git a/x11-toolkits/enhance/distinfo b/x11-toolkits/enhance/distinfo
index e3e028685952..76e1752bd8fa 100644
--- a/x11-toolkits/enhance/distinfo
+++ b/x11-toolkits/enhance/distinfo
@@ -1,3 +1,3 @@
-MD5 (enhance-20060926.tar.bz2) = de0c203141359e0e98a9378f3696b779
-SHA256 (enhance-20060926.tar.bz2) = 2c2ddc21e3d4c991e0695db896999c1e5257a5b55f60daff2ae78e2f519d8dc4
-SIZE (enhance-20060926.tar.bz2) = 246930
+MD5 (enhance-20070223.tar.bz2) = 225a7fd36dea32b908a4e89de43c58b8
+SHA256 (enhance-20070223.tar.bz2) = 657e8cbe269832f4e42cf08111e4cb164fa37095f41687ae912ddfdaceebf759
+SIZE (enhance-20070223.tar.bz2) = 246303
diff --git a/x11-toolkits/etk/Makefile b/x11-toolkits/etk/Makefile
index 29ed7a285b26..658e35dec118 100644
--- a/x11-toolkits/etk/Makefile
+++ b/x11-toolkits/etk/Makefile
@@ -7,9 +7,9 @@
#
PORTNAME= etk
-PORTVERSION= 20060926
+PORTVERSION= 20070223
CATEGORIES= x11-toolkits
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= A comprehensive toolkit based on the EFL
diff --git a/x11-toolkits/etk/distinfo b/x11-toolkits/etk/distinfo
index d05dab5532ed..59c18bf153f2 100644
--- a/x11-toolkits/etk/distinfo
+++ b/x11-toolkits/etk/distinfo
@@ -1,3 +1,3 @@
-MD5 (etk-20060926.tar.bz2) = a544d60e21714cfbd5267c17f7f8fe77
-SHA256 (etk-20060926.tar.bz2) = d16fbe1632dc9b20ee2102adc57945bef2df795a6c149cb777f9fa8d44bf5e9f
-SIZE (etk-20060926.tar.bz2) = 2171623
+MD5 (etk-20070223.tar.bz2) = 3c318b3a55c85d9e1cdb82492df401d8
+SHA256 (etk-20070223.tar.bz2) = db400ae273bed157edb0178d868de9c2fd01ce4085462eb48b0fb45bdb13e10e
+SIZE (etk-20070223.tar.bz2) = 2329953
diff --git a/x11-toolkits/etk/pkg-plist b/x11-toolkits/etk/pkg-plist
index 721f7e4ab74c..d3a932796a02 100644
--- a/x11-toolkits/etk/pkg-plist
+++ b/x11-toolkits/etk/pkg-plist
@@ -12,7 +12,6 @@ include/etk/etk_button.h
include/etk/etk_cache.h
include/etk/etk_canvas.h
include/etk/etk_check_button.h
-include/etk/etk_clipboard.h
include/etk/etk_colorpicker.h
include/etk/etk_combobox.h
include/etk/etk_config.h
@@ -26,6 +25,7 @@ include/etk/etk_engine.h
include/etk/etk_entry.h
include/etk/etk_event.h
include/etk/etk_filechooser_widget.h
+include/etk/etk_fixed.h
include/etk/etk_frame.h
include/etk/etk_iconbox.h
include/etk/etk_image.h
@@ -49,9 +49,11 @@ include/etk/etk_scrollbar.h
include/etk/etk_scrolled_view.h
include/etk/etk_selection.h
include/etk/etk_separator.h
+include/etk/etk_shadow.h
include/etk/etk_signal.h
include/etk/etk_signal_callback.h
include/etk/etk_slider.h
+include/etk/etk_spinner.h
include/etk/etk_statusbar.h
include/etk/etk_stock.h
include/etk/etk_string.h
@@ -63,7 +65,7 @@ include/etk/etk_toggle_button.h
include/etk/etk_tool_button.h
include/etk/etk_toolbar.h
include/etk/etk_tooltips.h
-include/etk/etk_toplevel_widget.h
+include/etk/etk_toplevel.h
include/etk/etk_tree.h
include/etk/etk_tree_model.h
include/etk/etk_type.h
@@ -75,6 +77,9 @@ include/etk/etk_window.h
lib/etk/engines/ecore_evas.a
lib/etk/engines/ecore_evas.la
lib/etk/engines/ecore_evas.so
+lib/etk/engines/ecore_evas_gl_x11.a
+lib/etk/engines/ecore_evas_gl_x11.la
+lib/etk/engines/ecore_evas_gl_x11.so
lib/etk/engines/ecore_evas_software_x11.a
lib/etk/engines/ecore_evas_software_x11.la
lib/etk/engines/ecore_evas_software_x11.so
@@ -103,10 +108,18 @@ libdata/pkgconfig/etk.pc
%%DATADIR%%/images/panel.png
%%DATADIR%%/images/panel_shadow.png
%%DATADIR%%/images/panel_top.png
+%%DATADIR%%/images/picture1.png
+%%DATADIR%%/images/picture2.png
+%%DATADIR%%/images/picture3.png
+%%DATADIR%%/images/picture4.png
+%%DATADIR%%/images/picture5.png
+%%DATADIR%%/images/picture6.png
+%%DATADIR%%/images/right_arrow.png
%%DATADIR%%/images/test.png
-%%DATADIR%%/pointers/default_pointer.png
%%DATADIR%%/themes/default.edj
+%%DATADIR%%/wm/default.edj
share/locale/fr/LC_MESSAGES/etk.mo
+@dirrm %%DATADIR%%/wm
@dirrm %%DATADIR%%/themes
@dirrm %%DATADIR%%/pointers
@dirrm %%DATADIR%%/images
diff --git a/x11-toolkits/ewl/Makefile b/x11-toolkits/ewl/Makefile
index 89ba1f660298..108c638ea1eb 100644
--- a/x11-toolkits/ewl/Makefile
+++ b/x11-toolkits/ewl/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= ewl
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= x11-toolkits
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= Enlightened Widget Library
diff --git a/x11-toolkits/ewl/distinfo b/x11-toolkits/ewl/distinfo
index ae973e40f546..e2a5d356edbb 100644
--- a/x11-toolkits/ewl/distinfo
+++ b/x11-toolkits/ewl/distinfo
@@ -1,3 +1,3 @@
-MD5 (ewl-20060926.tar.bz2) = ef842f223c93a90ca314052214fffa32
-SHA256 (ewl-20060926.tar.bz2) = 386b010159e16dfee0517ba77e5910414d7cee37ce6016bcffd9f17d2e9ac82e
-SIZE (ewl-20060926.tar.bz2) = 2790917
+MD5 (ewl-20070223.tar.bz2) = 21ad5cf8873fae88ce672e72001649f3
+SHA256 (ewl-20070223.tar.bz2) = 781454e2412e169547772d3e2c777d782d5a6ce26a80a9bd0831d9cbb70ca293
+SIZE (ewl-20070223.tar.bz2) = 3018085
diff --git a/x11-toolkits/ewl/pkg-plist b/x11-toolkits/ewl/pkg-plist
index 3c374bfb91a2..ff4a5eb1fd8e 100644
--- a/x11-toolkits/ewl/pkg-plist
+++ b/x11-toolkits/ewl/pkg-plist
@@ -1,10 +1,13 @@
bin/ewl-config
+bin/ewl_config
bin/ewl_embed_test
bin/ewl_simple_test
bin/ewl_test
+etc/ewl/ewl.cfg
include/ewl/Ewl.h
include/ewl/Ewl_Test.h
include/ewl/ewl_attach.h
+include/ewl/ewl_base.h
include/ewl/ewl_border.h
include/ewl/ewl_box.h
include/ewl/ewl_button.h
@@ -18,6 +21,7 @@ include/ewl/ewl_colorpicker.h
include/ewl/ewl_combo.h
include/ewl/ewl_config.h
include/ewl/ewl_container.h
+include/ewl/ewl_cursor.h
include/ewl/ewl_datepicker.h
include/ewl/ewl_debug.h
include/ewl/ewl_dialog.h
@@ -27,21 +31,22 @@ include/ewl/ewl_engines.h
include/ewl/ewl_entry.h
include/ewl/ewl_enums.h
include/ewl/ewl_events.h
+include/ewl/ewl_expansion.h
include/ewl/ewl_filedialog.h
include/ewl/ewl_filelist.h
include/ewl/ewl_filelist_column.h
include/ewl/ewl_filelist_icon.h
include/ewl/ewl_filelist_list.h
+include/ewl/ewl_filelist_tree.h
include/ewl/ewl_filepicker.h
include/ewl/ewl_floater.h
include/ewl/ewl_freebox.h
include/ewl/ewl_grid.h
+include/ewl/ewl_highlight.h
include/ewl/ewl_histogram.h
include/ewl/ewl_icon.h
include/ewl/ewl_icon_theme.h
-include/ewl/ewl_iconbox.h
include/ewl/ewl_image.h
-include/ewl/ewl_imenu.h
include/ewl/ewl_io_manager.h
include/ewl/ewl_label.h
include/ewl/ewl_list.h
@@ -59,6 +64,7 @@ include/ewl/ewl_object.h
include/ewl/ewl_overlay.h
include/ewl/ewl_paned.h
include/ewl/ewl_password.h
+include/ewl/ewl_popup.h
include/ewl/ewl_progressbar.h
include/ewl/ewl_radiobutton.h
include/ewl/ewl_range.h
@@ -72,9 +78,11 @@ include/ewl/ewl_spacer.h
include/ewl/ewl_spectrum.h
include/ewl/ewl_spinner.h
include/ewl/ewl_statusbar.h
+include/ewl/ewl_stock.h
include/ewl/ewl_table.h
include/ewl/ewl_text.h
include/ewl/ewl_theme.h
+include/ewl/ewl_toolbar.h
include/ewl/ewl_tree.h
include/ewl/ewl_tree2.h
include/ewl/ewl_tree2_view.h
@@ -86,24 +94,35 @@ include/ewl/ewl_window.h
lib/ewl/engines/evas.a
lib/ewl/engines/evas.la
lib/ewl/engines/evas.so
+lib/ewl/engines/evas.so.1
+lib/ewl/engines/evas_buffer.a
+lib/ewl/engines/evas_buffer.la
+lib/ewl/engines/evas_buffer.so
+lib/ewl/engines/evas_buffer.so.1
%%EVAS_GL%%lib/ewl/engines/evas_gl_x11.a
%%EVAS_GL%%lib/ewl/engines/evas_gl_x11.la
%%EVAS_GL%%lib/ewl/engines/evas_gl_x11.so
lib/ewl/engines/evas_software_x11.a
lib/ewl/engines/evas_software_x11.la
lib/ewl/engines/evas_software_x11.so
+lib/ewl/engines/evas_software_x11.so.1
lib/ewl/engines/evas_xrender_x11.a
lib/ewl/engines/evas_xrender_x11.la
lib/ewl/engines/evas_xrender_x11.so
+lib/ewl/engines/evas_xrender_x11.so.1
lib/ewl/engines/x11.a
lib/ewl/engines/x11.la
lib/ewl/engines/x11.so
+lib/ewl/engines/x11.so.1
lib/ewl/plugins/ewl_io_manager_image_plugin.a
lib/ewl/plugins/ewl_io_manager_image_plugin.la
lib/ewl/plugins/ewl_io_manager_image_plugin.so
lib/ewl/plugins/ewl_io_manager_text_plugin.a
lib/ewl/plugins/ewl_io_manager_text_plugin.la
lib/ewl/plugins/ewl_io_manager_text_plugin.so
+lib/ewl/plugins/ewl_io_manager_text_c_plugin.so
+lib/ewl/plugins/ewl_io_manager_text_c_plugin.la
+lib/ewl/plugins/ewl_io_manager_text_c_plugin.a
lib/ewl/tests/ewl_border.a
lib/ewl/tests/ewl_border.la
lib/ewl/tests/ewl_border.so
@@ -137,6 +156,9 @@ lib/ewl/tests/ewl_dialog.so
lib/ewl/tests/ewl_dnd_snoop.a
lib/ewl/tests/ewl_dnd_snoop.la
lib/ewl/tests/ewl_dnd_snoop.so
+lib/ewl/tests/ewl_engine.a
+lib/ewl/tests/ewl_engine.la
+lib/ewl/tests/ewl_engine.so
lib/ewl/tests/ewl_entry.a
lib/ewl/tests/ewl_entry.la
lib/ewl/tests/ewl_entry.so
@@ -152,6 +174,9 @@ lib/ewl/tests/ewl_floater.so
lib/ewl/tests/ewl_freebox.a
lib/ewl/tests/ewl_freebox.la
lib/ewl/tests/ewl_freebox.so
+lib/ewl/tests/ewl_fullscreen.a
+lib/ewl/tests/ewl_fullscreen.la
+lib/ewl/tests/ewl_fullscreen.so
lib/ewl/tests/ewl_grid.a
lib/ewl/tests/ewl_grid.la
lib/ewl/tests/ewl_grid.so
@@ -164,18 +189,12 @@ lib/ewl/tests/ewl_icon.so
lib/ewl/tests/ewl_icon_theme.a
lib/ewl/tests/ewl_icon_theme.la
lib/ewl/tests/ewl_icon_theme.so
-lib/ewl/tests/ewl_iconbox.a
-lib/ewl/tests/ewl_iconbox.la
-lib/ewl/tests/ewl_iconbox.so
lib/ewl/tests/ewl_image.a
lib/ewl/tests/ewl_image.la
lib/ewl/tests/ewl_image.so
lib/ewl/tests/ewl_image_thumbnail.a
lib/ewl/tests/ewl_image_thumbnail.la
lib/ewl/tests/ewl_image_thumbnail.so
-lib/ewl/tests/ewl_imenu.a
-lib/ewl/tests/ewl_imenu.la
-lib/ewl/tests/ewl_imenu.so
lib/ewl/tests/ewl_io_manager.a
lib/ewl/tests/ewl_io_manager.la
lib/ewl/tests/ewl_io_manager.so
@@ -194,6 +213,12 @@ lib/ewl/tests/ewl_menu.so
lib/ewl/tests/ewl_menubar.a
lib/ewl/tests/ewl_menubar.la
lib/ewl/tests/ewl_menubar.so
+lib/ewl/tests/ewl_modal.a
+lib/ewl/tests/ewl_modal.la
+lib/ewl/tests/ewl_modal.so
+lib/ewl/tests/ewl_mvc.a
+lib/ewl/tests/ewl_mvc.la
+lib/ewl/tests/ewl_mvc.so
lib/ewl/tests/ewl_notebook.a
lib/ewl/tests/ewl_notebook.la
lib/ewl/tests/ewl_notebook.so
@@ -203,9 +228,15 @@ lib/ewl/tests/ewl_paned.so
lib/ewl/tests/ewl_password.a
lib/ewl/tests/ewl_password.la
lib/ewl/tests/ewl_password.so
+lib/ewl/tests/ewl_pointer.a
+lib/ewl/tests/ewl_pointer.la
+lib/ewl/tests/ewl_pointer.so
lib/ewl/tests/ewl_progressbar.a
lib/ewl/tests/ewl_progressbar.la
lib/ewl/tests/ewl_progressbar.so
+lib/ewl/tests/ewl_puzzle.a
+lib/ewl/tests/ewl_puzzle.la
+lib/ewl/tests/ewl_puzzle.so
lib/ewl/tests/ewl_scrollbar.a
lib/ewl/tests/ewl_scrollbar.la
lib/ewl/tests/ewl_scrollbar.so
@@ -215,6 +246,9 @@ lib/ewl/tests/ewl_scrollpane.so
lib/ewl/tests/ewl_seeker.a
lib/ewl/tests/ewl_seeker.la
lib/ewl/tests/ewl_seeker.so
+lib/ewl/tests/ewl_shadow.a
+lib/ewl/tests/ewl_shadow.la
+lib/ewl/tests/ewl_shadow.so
lib/ewl/tests/ewl_spinner.a
lib/ewl/tests/ewl_spinner.la
lib/ewl/tests/ewl_spinner.so
@@ -233,6 +267,9 @@ lib/ewl/tests/ewl_text_editor.so
lib/ewl/tests/ewl_theme.a
lib/ewl/tests/ewl_theme.la
lib/ewl/tests/ewl_theme.so
+lib/ewl/tests/ewl_toolbar.a
+lib/ewl/tests/ewl_toolbar.la
+lib/ewl/tests/ewl_toolbar.so
lib/ewl/tests/ewl_tooltip.a
lib/ewl/tests/ewl_tooltip.la
lib/ewl/tests/ewl_tooltip.so
@@ -245,19 +282,10 @@ lib/ewl/tests/ewl_tree2.so
lib/ewl/tests/ewl_widget.a
lib/ewl/tests/ewl_widget.la
lib/ewl/tests/ewl_widget.so
-lib/ewl/tests/fullscreen.a
-lib/ewl/tests/fullscreen.la
-lib/ewl/tests/fullscreen.so
-lib/ewl/tests/modal.a
-lib/ewl/tests/modal.la
-lib/ewl/tests/modal.so
-lib/ewl/tests/puzzle.a
-lib/ewl/tests/puzzle.la
-lib/ewl/tests/puzzle.so
lib/libewl.a
lib/libewl.la
lib/libewl.so
-lib/libewl.so.0
+lib/libewl.so.1
libdata/pkgconfig/ewl.pc
share/aclocal/ewl.m4
%%DATADIR%%/examples/Ewl_Test.h
@@ -272,32 +300,37 @@ share/aclocal/ewl.m4
%%DATADIR%%/examples/ewl_datepicker.c
%%DATADIR%%/examples/ewl_dialog.c
%%DATADIR%%/examples/ewl_dnd_snoop.c
+%%DATADIR%%/examples/ewl_engine.c
%%DATADIR%%/examples/ewl_entry.c
%%DATADIR%%/examples/ewl_filedialog.c
%%DATADIR%%/examples/ewl_filepicker.c
%%DATADIR%%/examples/ewl_floater.c
%%DATADIR%%/examples/ewl_freebox.c
+%%DATADIR%%/examples/ewl_fullscreen.c
%%DATADIR%%/examples/ewl_grid.c
%%DATADIR%%/examples/ewl_histogram.c
%%DATADIR%%/examples/ewl_icon.c
%%DATADIR%%/examples/ewl_icon_theme.c
-%%DATADIR%%/examples/ewl_iconbox.c
%%DATADIR%%/examples/ewl_image.c
%%DATADIR%%/examples/ewl_image_thumbnail.c
-%%DATADIR%%/examples/ewl_imenu.c
%%DATADIR%%/examples/ewl_io_manager.c
%%DATADIR%%/examples/ewl_layer.c
%%DATADIR%%/examples/ewl_list.c
%%DATADIR%%/examples/ewl_media.c
%%DATADIR%%/examples/ewl_menu.c
%%DATADIR%%/examples/ewl_menubar.c
+%%DATADIR%%/examples/ewl_modal.c
+%%DATADIR%%/examples/ewl_mvc.c
%%DATADIR%%/examples/ewl_notebook.c
%%DATADIR%%/examples/ewl_paned.c
%%DATADIR%%/examples/ewl_password.c
+%%DATADIR%%/examples/ewl_pointer.c
%%DATADIR%%/examples/ewl_progressbar.c
+%%DATADIR%%/examples/ewl_puzzle.c
%%DATADIR%%/examples/ewl_scrollbar.c
%%DATADIR%%/examples/ewl_scrollpane.c
%%DATADIR%%/examples/ewl_seeker.c
+%%DATADIR%%/examples/ewl_shadow.c
%%DATADIR%%/examples/ewl_spinner.c
%%DATADIR%%/examples/ewl_statusbar.c
%%DATADIR%%/examples/ewl_table.c
@@ -305,14 +338,12 @@ share/aclocal/ewl.m4
%%DATADIR%%/examples/ewl_text.c
%%DATADIR%%/examples/ewl_text_editor.c
%%DATADIR%%/examples/ewl_theme.c
+%%DATADIR%%/examples/ewl_toolbar.c
%%DATADIR%%/examples/ewl_tooltip.c
%%DATADIR%%/examples/ewl_tree.c
%%DATADIR%%/examples/ewl_tree2.c
%%DATADIR%%/examples/ewl_widget.c
-%%DATADIR%%/examples/fullscreen.c
%%DATADIR%%/examples/main.c
-%%DATADIR%%/examples/modal.c
-%%DATADIR%%/examples/puzzle.c
%%DATADIR%%/images/Draw.png
%%DATADIR%%/images/End.png
%%DATADIR%%/images/NewBCard.png
@@ -320,6 +351,7 @@ share/aclocal/ewl.m4
%%DATADIR%%/images/Package.png
%%DATADIR%%/images/World.png
%%DATADIR%%/images/banner-top.png
+%%DATADIR%%/images/bg.edj
%%DATADIR%%/images/e-logo-0.png
%%DATADIR%%/images/e-logo-1.png
%%DATADIR%%/images/e-logo-10.png
@@ -366,3 +398,4 @@ share/aclocal/ewl.m4
@dirrm lib/ewl/engines
@dirrm lib/ewl
@dirrm include/ewl
+@dirrm etc/ewl
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index d2bd25665599..abd7318d144b 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -7,6 +7,7 @@
PORTNAME= enlightenment
PORTVERSION= 0.16.8.2
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,7 +16,7 @@ DISTNAME= e16-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
COMMENT= A very artistic X window manager
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2
DATADIR= ${PREFIX}/share/e16
diff --git a/x11-wm/e17-module-cpu/Makefile b/x11-wm/e17-module-cpu/Makefile
index 015ecef1a6cb..8ab175e48743 100644
--- a/x11-wm/e17-module-cpu/Makefile
+++ b/x11-wm/e17-module-cpu/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= cpu
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/x11-wm/e17-module-cpu/distinfo b/x11-wm/e17-module-cpu/distinfo
index 7a0ddda8eeeb..eab0e6c2036e 100644
--- a/x11-wm/e17-module-cpu/distinfo
+++ b/x11-wm/e17-module-cpu/distinfo
@@ -1,3 +1,3 @@
-MD5 (cpu-20060926.tar.bz2) = 1cd0a1463cb4e30bcc1bcb65416ed54b
-SHA256 (cpu-20060926.tar.bz2) = a66b516bfb10e0b9094bbc4bc6fdc3c34946cf0873142e7eb151a952e704ab0d
-SIZE (cpu-20060926.tar.bz2) = 261091
+MD5 (cpu-20070223.tar.bz2) = 30e514b12b1962bdccc25efe7fdb01b6
+SHA256 (cpu-20070223.tar.bz2) = a4ff1df53f919f0b101eaf335038a88e6d8712a1648528982e411a3805d75b96
+SIZE (cpu-20070223.tar.bz2) = 261528
diff --git a/x11-wm/e17-module-cpu/pkg-plist b/x11-wm/e17-module-cpu/pkg-plist
index 42144630fef3..1f5208e5a15b 100644
--- a/x11-wm/e17-module-cpu/pkg-plist
+++ b/x11-wm/e17-module-cpu/pkg-plist
@@ -4,7 +4,6 @@ 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/module_icon.png
@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 3bd1342191c7..8a50532eec2d 100644
--- a/x11-wm/e17-module-deskshow/Makefile
+++ b/x11-wm/e17-module-deskshow/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= deskshow
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/x11-wm/e17-module-deskshow/distinfo b/x11-wm/e17-module-deskshow/distinfo
index 7bf5af25b44c..02a446cb2b0d 100644
--- a/x11-wm/e17-module-deskshow/distinfo
+++ b/x11-wm/e17-module-deskshow/distinfo
@@ -1,3 +1,3 @@
-MD5 (deskshow-20060926.tar.bz2) = ca9f52acca54fb00923bc83344b38349
-SHA256 (deskshow-20060926.tar.bz2) = a689ee52663c4180b8d506a83d35b713fe9f328273627d03c6def55635b6230b
-SIZE (deskshow-20060926.tar.bz2) = 279254
+MD5 (deskshow-20070223.tar.bz2) = a18ff84163447ea899cc21ff71718f0c
+SHA256 (deskshow-20070223.tar.bz2) = 98b1b9138fa75d43a8e4a2c9c461007bf3129d5aa934798241e12c22b12bdfb5
+SIZE (deskshow-20070223.tar.bz2) = 281233
diff --git a/x11-wm/e17-module-flame/Makefile b/x11-wm/e17-module-flame/Makefile
index f41380ec4e8f..5e7b1fc09a4a 100644
--- a/x11-wm/e17-module-flame/Makefile
+++ b/x11-wm/e17-module-flame/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= flame
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/x11-wm/e17-module-flame/distinfo b/x11-wm/e17-module-flame/distinfo
index e2b2a353bafc..7b40e0f4f2dc 100644
--- a/x11-wm/e17-module-flame/distinfo
+++ b/x11-wm/e17-module-flame/distinfo
@@ -1,3 +1,3 @@
-MD5 (flame-20060926.tar.bz2) = e7ebdd2606517342e0a35ebfbb996c62
-SHA256 (flame-20060926.tar.bz2) = 3aa971dcbd72023ad14a491d0a338f337a5d1509f1e47e5c0cff9cbfefff6fe5
-SIZE (flame-20060926.tar.bz2) = 250902
+MD5 (flame-20070223.tar.bz2) = 4fbb97b86add29eef207cda3dd802468
+SHA256 (flame-20070223.tar.bz2) = 18f81de98337826d04716278fe12efc7f0043cfe05f391b21e93ef9777be8738
+SIZE (flame-20070223.tar.bz2) = 278915
diff --git a/x11-wm/e17-module-flame/pkg-plist b/x11-wm/e17-module-flame/pkg-plist
index 716fee610674..81497b3558fb 100644
--- a/x11-wm/e17-module-flame/pkg-plist
+++ b/x11-wm/e17-module-flame/pkg-plist
@@ -3,7 +3,6 @@ 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
-lib/enlightenment/modules/flame/module_icon.png
%%NLS%%share/locale/eo/LC_MESSAGES/flame.mo
%%NLS%%share/locale/fi/LC_MESSAGES/flame.mo
%%NLS%%share/locale/it/LC_MESSAGES/flame.mo
diff --git a/x11-wm/e17-module-language/Makefile b/x11-wm/e17-module-language/Makefile
index 25ddecefa9d3..a1b6bf26521d 100644
--- a/x11-wm/e17-module-language/Makefile
+++ b/x11-wm/e17-module-language/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= language
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/x11-wm/e17-module-language/distinfo b/x11-wm/e17-module-language/distinfo
index 385ea90a9d6f..72899efb161e 100644
--- a/x11-wm/e17-module-language/distinfo
+++ b/x11-wm/e17-module-language/distinfo
@@ -1,3 +1,3 @@
-MD5 (language-20060926.tar.bz2) = 701d7dddddfa4ed4fcc0a11422cd5fb0
-SHA256 (language-20060926.tar.bz2) = f7ff47aa19a5015046bea49d6ac999bd9b8eba513856242f86614efc2d9d77fb
-SIZE (language-20060926.tar.bz2) = 422313
+MD5 (language-20070223.tar.bz2) = 7c915bfbb7bd52e9d0943488c0212a1d
+SHA256 (language-20070223.tar.bz2) = f80623d4ab1b6b259d21d546493fde30892aaf59b5c165dd017a7ab4a0608334
+SIZE (language-20070223.tar.bz2) = 456281
diff --git a/x11-wm/e17-module-mail/Makefile b/x11-wm/e17-module-mail/Makefile
index d002958813c8..b98454bdd4af 100644
--- a/x11-wm/e17-module-mail/Makefile
+++ b/x11-wm/e17-module-mail/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= mail
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/x11-wm/e17-module-mail/distinfo b/x11-wm/e17-module-mail/distinfo
index ef41257f2c56..2d267b2dcf5d 100644
--- a/x11-wm/e17-module-mail/distinfo
+++ b/x11-wm/e17-module-mail/distinfo
@@ -1,3 +1,3 @@
-MD5 (mail-20060926.tar.bz2) = d63660b2e38d82a212684420024458bb
-SHA256 (mail-20060926.tar.bz2) = b526a1d4d3cbb5b0e54d22b9cc87b4462d0bda6ba9a06450f7e8a1d95885d898
-SIZE (mail-20060926.tar.bz2) = 309337
+MD5 (mail-20070223.tar.bz2) = c300a031aa7e68ad4f45305e3a4bacbd
+SHA256 (mail-20070223.tar.bz2) = b3ef91549cc061904d8aea7e9a9ac44066fcdfe951bfb6da214afc11ea055207
+SIZE (mail-20070223.tar.bz2) = 344411
diff --git a/x11-wm/e17-module-mem/Makefile b/x11-wm/e17-module-mem/Makefile
index 623362f4038e..f09773a6980b 100644
--- a/x11-wm/e17-module-mem/Makefile
+++ b/x11-wm/e17-module-mem/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= mem
-PORTVERSION= 20060926
+PORTVERSION= 20070223
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}
diff --git a/x11-wm/e17-module-mem/distinfo b/x11-wm/e17-module-mem/distinfo
index cf64d06cdfc1..50f192030695 100644
--- a/x11-wm/e17-module-mem/distinfo
+++ b/x11-wm/e17-module-mem/distinfo
@@ -1,3 +1,3 @@
-MD5 (mem-20060926.tar.bz2) = 8cb953cc229a1864336ea6e4e547aef1
-SHA256 (mem-20060926.tar.bz2) = eed0876ef948eeabf15c67bfdb8e08d6ba9b6a5479b1ffd60cd29adb69793c49
-SIZE (mem-20060926.tar.bz2) = 389496
+MD5 (mem-20070223.tar.bz2) = 806aae2b3cc2e748a9b26bd8363265ab
+SHA256 (mem-20070223.tar.bz2) = 7d311e2f1efff3e54f33541d338a4ef63a4256e7969f1d7993d84d5a94bceae3
+SIZE (mem-20070223.tar.bz2) = 426211
diff --git a/x11-wm/e17-module-mixer/Makefile b/x11-wm/e17-module-mixer/Makefile
index c979be1591a9..a4ff2f184ec5 100644
--- a/x11-wm/e17-module-mixer/Makefile
+++ b/x11-wm/e17-module-mixer/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= mixer
-PORTVERSION= 20060926
+PORTVERSION= 20070223
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
@@ -24,6 +24,14 @@ USE_GNOME= gnometarget pkgconfig
USE_EFL= edje
GNU_CONFIGURE= yes
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
.include <bsd.port.pre.mk>
.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
.include <bsd.port.post.mk>
diff --git a/x11-wm/e17-module-mixer/distinfo b/x11-wm/e17-module-mixer/distinfo
index 058aebf14405..a90a4bba763e 100644
--- a/x11-wm/e17-module-mixer/distinfo
+++ b/x11-wm/e17-module-mixer/distinfo
@@ -1,3 +1,3 @@
-MD5 (mixer-20060926.tar.bz2) = 3652211f1b7fe321440de97d8801f5d0
-SHA256 (mixer-20060926.tar.bz2) = 0bbacb948166eb5324c602ffd741d1597aea07c69e51c2061d84fcb6638d2a1d
-SIZE (mixer-20060926.tar.bz2) = 289454
+MD5 (mixer-20070223.tar.bz2) = cc6f42aa6e610276e24c6751d4dd74c5
+SHA256 (mixer-20070223.tar.bz2) = c59985082b4cadcb9feccf1bc30f436fd1908f32d2f87bf53a9a47eaab6942c6
+SIZE (mixer-20070223.tar.bz2) = 338312
diff --git a/x11-wm/e17-module-mixer/pkg-plist b/x11-wm/e17-module-mixer/pkg-plist
index 7b5d44decf2c..65daad44b823 100644
--- a/x11-wm/e17-module-mixer/pkg-plist
+++ b/x11-wm/e17-module-mixer/pkg-plist
@@ -2,7 +2,10 @@ 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/module.eap
+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
@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 f442da8955c6..f1a7b0b84955 100644
--- a/x11-wm/e17-module-moon/Makefile
+++ b/x11-wm/e17-module-moon/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= moon
-PORTVERSION= 20060926
+PORTVERSION= 20070223
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}
diff --git a/x11-wm/e17-module-moon/distinfo b/x11-wm/e17-module-moon/distinfo
index 872df226239c..b686069e9d75 100644
--- a/x11-wm/e17-module-moon/distinfo
+++ b/x11-wm/e17-module-moon/distinfo
@@ -1,3 +1,3 @@
-MD5 (moon-20060926.tar.bz2) = f967701d2f031631d3b0a63b58df76c3
-SHA256 (moon-20060926.tar.bz2) = 3319d37fcd7fdfe0bf65aeb5d9016e3660e730263a97d18538e397ea5e2d50c0
-SIZE (moon-20060926.tar.bz2) = 672466
+MD5 (moon-20070223.tar.bz2) = a110d53bc5a05297e93a3a1eb05c9c11
+SHA256 (moon-20070223.tar.bz2) = 4e387eabe35435c61da7fd84a33cad8f8f3db31092c44bdf65834273f5f4a775
+SIZE (moon-20070223.tar.bz2) = 699637
diff --git a/x11-wm/e17-module-rain/Makefile b/x11-wm/e17-module-rain/Makefile
index 77f5f19018dc..daa433e7d545 100644
--- a/x11-wm/e17-module-rain/Makefile
+++ b/x11-wm/e17-module-rain/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= rain
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/x11-wm/e17-module-rain/distinfo b/x11-wm/e17-module-rain/distinfo
index 1df8e3b07846..15917d0bc525 100644
--- a/x11-wm/e17-module-rain/distinfo
+++ b/x11-wm/e17-module-rain/distinfo
@@ -1,3 +1,3 @@
-MD5 (rain-20060926.tar.bz2) = 4505ab2f405c09191fb3dace3160ef88
-SHA256 (rain-20060926.tar.bz2) = 5f7b172c99518b1bee0d9a79c150e25cdbf289e1506bedf72bbe0f2c0eee212f
-SIZE (rain-20060926.tar.bz2) = 315366
+MD5 (rain-20070223.tar.bz2) = 18fa7a1fdf1cd51098620a0514436d34
+SHA256 (rain-20070223.tar.bz2) = f132a1118622fd718b32ca5c28e415b5af3edc51d87642b58885ea723a344806
+SIZE (rain-20070223.tar.bz2) = 347010
diff --git a/x11-wm/e17-module-rain/pkg-plist b/x11-wm/e17-module-rain/pkg-plist
index fad84f556792..f9c08552a331 100644
--- a/x11-wm/e17-module-rain/pkg-plist
+++ b/x11-wm/e17-module-rain/pkg-plist
@@ -7,7 +7,6 @@ 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
-lib/enlightenment/modules/rain/module_icon.png
%%NLS%%share/locale/eo/LC_MESSAGES/rain.mo
%%NLS%%share/locale/fi/LC_MESSAGES/rain.mo
%%NLS%%share/locale/fr/LC_MESSAGES/rain.mo
diff --git a/x11-wm/e17-module-screenshot/Makefile b/x11-wm/e17-module-screenshot/Makefile
index 42347fec4de2..2e6ddd67d8c7 100644
--- a/x11-wm/e17-module-screenshot/Makefile
+++ b/x11-wm/e17-module-screenshot/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= screenshot
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/x11-wm/e17-module-screenshot/distinfo b/x11-wm/e17-module-screenshot/distinfo
index fc042b17e8d8..a5226e0d1280 100644
--- a/x11-wm/e17-module-screenshot/distinfo
+++ b/x11-wm/e17-module-screenshot/distinfo
@@ -1,3 +1,3 @@
-MD5 (screenshot-20060926.tar.bz2) = 59d9780357c3f41676474800d274d6b9
-SHA256 (screenshot-20060926.tar.bz2) = fc5f809d6af7da0a65033e28a27f91db424e716c46574f449a3300ba8a73277f
-SIZE (screenshot-20060926.tar.bz2) = 373270
+MD5 (screenshot-20070223.tar.bz2) = d351d0fb604bf87c5eaf80c0a8089c96
+SHA256 (screenshot-20070223.tar.bz2) = 16e3fcfe9479791af46c3d8fb933fc3020d522c013f26e8847516f4561824e54
+SIZE (screenshot-20070223.tar.bz2) = 407617
diff --git a/x11-wm/e17-module-slideshow/Makefile b/x11-wm/e17-module-slideshow/Makefile
index 5b9ac9375aae..883222cf321e 100644
--- a/x11-wm/e17-module-slideshow/Makefile
+++ b/x11-wm/e17-module-slideshow/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= slideshow
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/x11-wm/e17-module-slideshow/distinfo b/x11-wm/e17-module-slideshow/distinfo
index 973d1ebc4ca0..657acb2a7fd8 100644
--- a/x11-wm/e17-module-slideshow/distinfo
+++ b/x11-wm/e17-module-slideshow/distinfo
@@ -1,3 +1,3 @@
-MD5 (slideshow-20060926.tar.bz2) = 26e082dfe8aeb43d0fb1f56fcf27cee4
-SHA256 (slideshow-20060926.tar.bz2) = 9b709121621489fe84d9941fc2fd276800ddfe9be6b763f7242ebc00f79ea295
-SIZE (slideshow-20060926.tar.bz2) = 254831
+MD5 (slideshow-20070223.tar.bz2) = 619c2f89b4fe10fc608f3694a74a99ee
+SHA256 (slideshow-20070223.tar.bz2) = 59b481d3bdb1bd38187fc397f4a2f3922befc41713ede7dd08a30353321e1a25
+SIZE (slideshow-20070223.tar.bz2) = 284528
diff --git a/x11-wm/e17-module-snow/Makefile b/x11-wm/e17-module-snow/Makefile
index f01e84a9df7a..5576b057f405 100644
--- a/x11-wm/e17-module-snow/Makefile
+++ b/x11-wm/e17-module-snow/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= snow
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/x11-wm/e17-module-snow/distinfo b/x11-wm/e17-module-snow/distinfo
index b2e53b54dd7b..c88a10edbbf2 100644
--- a/x11-wm/e17-module-snow/distinfo
+++ b/x11-wm/e17-module-snow/distinfo
@@ -1,3 +1,3 @@
-MD5 (snow-20060926.tar.bz2) = c5dbea13f4151b4d0851d1b083c90732
-SHA256 (snow-20060926.tar.bz2) = 4372038f755e2e99f53a3e367ff175a634b94f618ad47533dbd68892f5f22490
-SIZE (snow-20060926.tar.bz2) = 248633
+MD5 (snow-20070223.tar.bz2) = 820d1c99ba6007e4d0d7eca164cbbe9a
+SHA256 (snow-20070223.tar.bz2) = 4695cc214ababccb04ca746626bc87edeb32c5319c1b3f9b76eb92c7023c8396
+SIZE (snow-20070223.tar.bz2) = 278212
diff --git a/x11-wm/e17-module-snow/pkg-plist b/x11-wm/e17-module-snow/pkg-plist
index d3d75cd2e5a8..c1752aa10628 100644
--- a/x11-wm/e17-module-snow/pkg-plist
+++ b/x11-wm/e17-module-snow/pkg-plist
@@ -6,7 +6,6 @@ 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/module_icon.png
lib/enlightenment/modules/snow/tree.png
%%NLS%%share/locale/eo/LC_MESSAGES/snow.mo
%%NLS%%share/locale/fi/LC_MESSAGES/snow.mo
diff --git a/x11-wm/e17-module-uptime/Makefile b/x11-wm/e17-module-uptime/Makefile
index c977b63d67e7..6d945e31c188 100644
--- a/x11-wm/e17-module-uptime/Makefile
+++ b/x11-wm/e17-module-uptime/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= uptime
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/x11-wm/e17-module-uptime/distinfo b/x11-wm/e17-module-uptime/distinfo
index 5257ad423257..a638c4ae756d 100644
--- a/x11-wm/e17-module-uptime/distinfo
+++ b/x11-wm/e17-module-uptime/distinfo
@@ -1,3 +1,3 @@
-MD5 (uptime-20060926.tar.bz2) = f39c2c7643adef2456e4e3994a3696d0
-SHA256 (uptime-20060926.tar.bz2) = 145ce4451b0df08985b691fbaa4fe783cac32a5b2bab007f093ebfb3cbfb5bec
-SIZE (uptime-20060926.tar.bz2) = 285109
+MD5 (uptime-20070223.tar.bz2) = 0c806db8ced0ec7e6b544cd0096cbe83
+SHA256 (uptime-20070223.tar.bz2) = 96ebb7053d410ed5f56cf0359ad7d7e7c393de376b349dc1107c96355d76d2d0
+SIZE (uptime-20070223.tar.bz2) = 316556
diff --git a/x11-wm/e17-module-weather/Makefile b/x11-wm/e17-module-weather/Makefile
index 458c9d203ff7..aa6f87e22d5e 100644
--- a/x11-wm/e17-module-weather/Makefile
+++ b/x11-wm/e17-module-weather/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= weather
-PORTVERSION= 20060926
+PORTVERSION= 20070223
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}
diff --git a/x11-wm/e17-module-weather/distinfo b/x11-wm/e17-module-weather/distinfo
index 51bc6124cecc..b552ac86e987 100644
--- a/x11-wm/e17-module-weather/distinfo
+++ b/x11-wm/e17-module-weather/distinfo
@@ -1,3 +1,3 @@
-MD5 (weather-20060926.tar.bz2) = 6bda3b61f7f026040865a262305fc9a4
-SHA256 (weather-20060926.tar.bz2) = 02371844b0d466d7a90ad47bef5e40470dec77aff07c8635cea4cf985ba384d3
-SIZE (weather-20060926.tar.bz2) = 948459
+MD5 (weather-20070223.tar.bz2) = f8b7e939ed671722639e5d1fff8ed5cf
+SHA256 (weather-20070223.tar.bz2) = 796a3a1167677e1360af7d997245f7d6400b89e1b9d173e9d775325fc2c77056
+SIZE (weather-20070223.tar.bz2) = 868191
diff --git a/x11-wm/e17-module-weather/pkg-plist b/x11-wm/e17-module-weather/pkg-plist
index bd4bcd2c0fbd..8c41253f625e 100644
--- a/x11-wm/e17-module-weather/pkg-plist
+++ b/x11-wm/e17-module-weather/pkg-plist
@@ -1,77 +1,13 @@
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/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
lib/enlightenment/modules/weather/module.desktop
lib/enlightenment/modules/weather/module.edj
-lib/enlightenment/modules/weather/module_icon.png
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
-@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 553c0ec4c557..7cf706db8f18 100644
--- a/x11-wm/e17-module-winselector/Makefile
+++ b/x11-wm/e17-module-winselector/Makefile
@@ -7,9 +7,9 @@
#
PORTNAME= winselector
-PORTVERSION= 20060926
+PORTVERSION= 20070223
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
MAINTAINER= stas@FreeBSD.org
diff --git a/x11-wm/e17-module-winselector/distinfo b/x11-wm/e17-module-winselector/distinfo
index 12ddf1232176..417522d22d7b 100644
--- a/x11-wm/e17-module-winselector/distinfo
+++ b/x11-wm/e17-module-winselector/distinfo
@@ -1,3 +1,3 @@
-MD5 (winselector-20060926.tar.bz2) = 7f3f5d26dff799c4c37945043b171d28
-SHA256 (winselector-20060926.tar.bz2) = f6e433dda44c9bedc81b12032a7618b015d33acdb7177becea4e56a2baa13484
-SIZE (winselector-20060926.tar.bz2) = 277497
+MD5 (winselector-20070223.tar.bz2) = bfd3d02ddda2bec18a400175bf6d6b6a
+SHA256 (winselector-20070223.tar.bz2) = b25e693378fd8cd64d69c8d5301b915e94b48e8d18a012850efef0ce928d0794
+SIZE (winselector-20070223.tar.bz2) = 271828
diff --git a/x11-wm/e17-utils/Makefile b/x11-wm/e17-utils/Makefile
index 5322ae6666e2..1e9ac8df90e3 100644
--- a/x11-wm/e17-utils/Makefile
+++ b/x11-wm/e17-utils/Makefile
@@ -7,9 +7,9 @@
#
PORTNAME= utils
-PORTVERSION= 20060926
+PORTVERSION= 20070223
CATEGORIES= x11-wm
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-
DISTNAME= e_${PORTNAME}-${PORTVERSION}
diff --git a/x11-wm/e17-utils/distinfo b/x11-wm/e17-utils/distinfo
index af03eaf36cd6..b457c41f88bc 100644
--- a/x11-wm/e17-utils/distinfo
+++ b/x11-wm/e17-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (e_utils-20060926.tar.bz2) = a7cf259d61a67eae2d53099b75eabd3d
-SHA256 (e_utils-20060926.tar.bz2) = bda5268080bcf1e04544f2f3dc85b142afe9f033e83f63a5eb9990a8306a8a99
-SIZE (e_utils-20060926.tar.bz2) = 921212
+MD5 (e_utils-20070223.tar.bz2) = 3ed1786358166c1cc0cfbccfbdd6a192
+SHA256 (e_utils-20070223.tar.bz2) = a9b86d8beaf995aa8643e0d5c6002e74576b64caf9b56485e1b6fdb9da822f8a
+SIZE (e_utils-20070223.tar.bz2) = 776040
diff --git a/x11-wm/e17-utils/pkg-descr b/x11-wm/e17-utils/pkg-descr
index 199702ee621f..baafeaee52b8 100644
--- a/x11-wm/e17-utils/pkg-descr
+++ b/x11-wm/e17-utils/pkg-descr
@@ -1,7 +1,5 @@
e_util is a collection of utils for enlightenment 0.17:
- - e17genmenu - menu entries generator
- e17setroot - cmdline util to set the background
- - eapp_edit - graphical eapp icons editor
- entangle - simple menu editor
- exige - program launcher
diff --git a/x11-wm/e17-utils/pkg-plist b/x11-wm/e17-utils/pkg-plist
index 3092b77dc2d3..198db601145c 100644
--- a/x11-wm/e17-utils/pkg-plist
+++ b/x11-wm/e17-utils/pkg-plist
@@ -1,23 +1,6 @@
-bin/e17genmenu
bin/e17setroot
-bin/eap_edit
bin/entangle
bin/exige
-%%DATADIR%%/data/e17genmenu/icons/e.png
-%%DATADIR%%/data/e17genmenu/icons/package_applications.png
-%%DATADIR%%/data/e17genmenu/icons/package_development.png
-%%DATADIR%%/data/e17genmenu/icons/package_editors.png
-%%DATADIR%%/data/e17genmenu/icons/package_edutainment.png
-%%DATADIR%%/data/e17genmenu/icons/package_favourite.png
-%%DATADIR%%/data/e17genmenu/icons/package_games.png
-%%DATADIR%%/data/e17genmenu/icons/package_graphics.png
-%%DATADIR%%/data/e17genmenu/icons/package_multimedia.png
-%%DATADIR%%/data/e17genmenu/icons/package_network.png
-%%DATADIR%%/data/e17genmenu/icons/package_settings.png
-%%DATADIR%%/data/e17genmenu/icons/package_system.png
-%%DATADIR%%/data/e17genmenu/icons/package_toys.png
-%%DATADIR%%/data/e17genmenu/icons/package_utilities.png
-%%DATADIR%%/data/e17genmenu/icons/package_wordprocessing.png
%%DATADIR%%/data/entangle/default.edj
%%DATADIR%%/data/exige/default.edj
share/enlightenment/config-apps/entangle.eap
@@ -25,7 +8,6 @@ share/enlightenment/config-apps/entangle.eap
@dirrmtry share/enlightenment/config-apps
@dirrm %%DATADIR%%/data/exige
@dirrm %%DATADIR%%/data/entangle
-@dirrm %%DATADIR%%/data/e17genmenu/icons
@dirrm %%DATADIR%%/data/e17genmenu
@dirrm %%DATADIR%%/data
@dirrm %%DATADIR%%
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index a6cbb3d0ce0a..e60dba48fddb 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= enlightenment
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= x11-wm
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
DISTNAME= e-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
diff --git a/x11-wm/enlightenment-devel/bsd.efl.mk b/x11-wm/enlightenment-devel/bsd.efl.mk
index 7d54e012c88d..0fb28a188daa 100644
--- a/x11-wm/enlightenment-devel/bsd.efl.mk
+++ b/x11-wm/enlightenment-devel/bsd.efl.mk
@@ -121,7 +121,7 @@ _evfs_VERSION= 0
_ewl_CATEGORY= x11-toolkits
_ewl_DEPENDS= evas ecore edje epsilon
_ewl_PREFIX= ${LOCALBASE}
-_ewl_VERSION= 0
+_ewl_VERSION= 1
_exml_CATEGORY= textproc
_exml_DEPENDS= ecore
@@ -130,7 +130,7 @@ _exml_VERSION= 1
_imlib2_CATEGORY= graphics
_imlib2_PREFIX= ${LOCALBASE}
-_imlib2_VERSION= 3
+_imlib2_VERSION= 4
_imlib2_SLIB= Imlib2
#
diff --git a/x11-wm/enlightenment-devel/distinfo b/x11-wm/enlightenment-devel/distinfo
index 96e4ff935a0d..bddc264ce440 100644
--- a/x11-wm/enlightenment-devel/distinfo
+++ b/x11-wm/enlightenment-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (e-20060926.tar.bz2) = 440377d3f561b2dc8dbc5a04be50193f
-SHA256 (e-20060926.tar.bz2) = fdba2748a0a172d11b5edd8f8ee1ecec17b4e270a7b9983a8d8f156d5e95d6bd
-SIZE (e-20060926.tar.bz2) = 31174715
+MD5 (e-20070223.tar.bz2) = d7c5ca68a6a276fdf4fa45e26757c7eb
+SHA256 (e-20070223.tar.bz2) = c9d112c1f0a9e5690745a3e6f8a45fa76366883d21d9c85010e5f22239b765a5
+SIZE (e-20070223.tar.bz2) = 31413115
diff --git a/x11-wm/enlightenment-devel/pkg-plist b/x11-wm/enlightenment-devel/pkg-plist
index 45d134ff37a7..ce5703e3181e 100644
--- a/x11-wm/enlightenment-devel/pkg-plist
+++ b/x11-wm/enlightenment-devel/pkg-plist
@@ -1,7 +1,5 @@
-bin/eap_to_desktop
bin/enlightenment
bin/enlightenment-config
-bin/enlightenment_eapp
bin/enlightenment_imc
bin/enlightenment_remote
bin/enlightenment_start
@@ -31,9 +29,9 @@ include/enlightenment/e_container.h
include/enlightenment/e_datastore.h
include/enlightenment/e_desk.h
include/enlightenment/e_desklock.h
-include/enlightenment/e_deskpreview.h
include/enlightenment/e_dialog.h
include/enlightenment/e_dnd.h
+include/enlightenment/e_dpms.h
include/enlightenment/e_eap_editor.h
include/enlightenment/e_editable.h
include/enlightenment/e_entry.h
@@ -42,10 +40,14 @@ include/enlightenment/e_error.h
include/enlightenment/e_exebuf.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_mime.h
+include/enlightenment/e_fm_prop.h
include/enlightenment/e_focus.h
include/enlightenment/e_font.h
+include/enlightenment/e_fwin.h
include/enlightenment/e_gadcon.h
include/enlightenment/e_grabinput.h
include/enlightenment/e_hints.h
@@ -53,28 +55,37 @@ include/enlightenment/e_icon.h
include/enlightenment/e_ilist.h
include/enlightenment/e_includes.h
include/enlightenment/e_init.h
-include/enlightenment/e_int_border_border.h
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
@@ -113,6 +124,7 @@ include/enlightenment/e_popup.h
include/enlightenment/e_prefix.h
include/enlightenment/e_remember.h
include/enlightenment/e_resist.h
+include/enlightenment/e_screensaver.h
include/enlightenment/e_scrollframe.h
include/enlightenment/e_sha1.h
include/enlightenment/e_shelf.h
@@ -131,12 +143,14 @@ include/enlightenment/e_tlist.h
include/enlightenment/e_user.h
include/enlightenment/e_utils.h
include/enlightenment/e_widget.h
+include/enlightenment/e_widget_aspect.h
include/enlightenment/e_widget_button.h
include/enlightenment/e_widget_check.h
include/enlightenment/e_widget_color_well.h
include/enlightenment/e_widget_config_list.h
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_framelist.h
include/enlightenment/e_widget_frametable.h
@@ -203,6 +217,9 @@ lib/enlightenment/modules/temperature/%%E17_ARCH%%/module.la
lib/enlightenment/modules/temperature/%%E17_ARCH%%/module.so
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/preload/e_precache.a
%%DATADIR%%/AUTHORS
%%DATADIR%%/COPYING
%%DATADIR%%/data/backgrounds/Blue_Sky_Tree.edj
@@ -223,13 +240,14 @@ lib/enlightenment/modules/temperature/module.edj
%%DATADIR%%/data/fonts/fonts.alias
%%DATADIR%%/data/fonts/fonts.dir
%%DATADIR%%/data/icons/audio_player.png
+%%DATADIR%%/data/icons/audio_player2.png
+%%DATADIR%%/data/icons/image_viewer.png
+%%DATADIR%%/data/icons/mail_client.png
+%%DATADIR%%/data/icons/text_editor.png
%%DATADIR%%/data/icons/video_player.png
%%DATADIR%%/data/icons/web_browser.png
%%DATADIR%%/data/icons/xterm.png
-%%DATADIR%%/data/images/button_in.png
-%%DATADIR%%/data/images/button_out.png
-%%DATADIR%%/data/images/e.png
-%%DATADIR%%/data/images/error_bg.png
+%%DATADIR%%/data/images/enlightenment.png
%%DATADIR%%/data/images/test.edj
%%DATADIR%%/data/images/test.jpg
%%DATADIR%%/data/images/test.png
@@ -246,27 +264,14 @@ lib/enlightenment/modules/temperature/module.edj
%%DATADIR%%/doc/documentation.html
%%DATADIR%%/doc/enlightenment.png
share/locale/bg/LC_MESSAGES/enlightenment.mo
-share/locale/cs/LC_MESSAGES/enlightenment.mo
-share/locale/da/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/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/nb/LC_MESSAGES/enlightenment.mo
-share/locale/nl/LC_MESSAGES/enlightenment.mo
-share/locale/pl/LC_MESSAGES/enlightenment.mo
-share/locale/pt/LC_MESSAGES/enlightenment.mo
share/locale/ru/LC_MESSAGES/enlightenment.mo
-share/locale/sk/LC_MESSAGES/enlightenment.mo
share/locale/sl/LC_MESSAGES/enlightenment.mo
-share/locale/sv/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/zh_TW/LC_MESSAGES
@@ -317,6 +322,7 @@ share/xsessions/enlightenment.desktop
@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
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index d2bd25665599..abd7318d144b 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -7,6 +7,7 @@
PORTNAME= enlightenment
PORTVERSION= 0.16.8.2
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,7 +16,7 @@ DISTNAME= e16-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
COMMENT= A very artistic X window manager
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2
DATADIR= ${PREFIX}/share/e16
diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile
index 64f173cc6ce9..9178fba7595a 100644
--- a/x11-wm/epplets/Makefile
+++ b/x11-wm/epplets/Makefile
@@ -7,6 +7,7 @@
PORTNAME= epplets
PORTVERSION= 0.9
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= enlightenment
@@ -15,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A collection of Enlightenment dock applications
BUILD_DEPENDS= e16:${PORTSDIR}/x11-wm/enlightenment
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2 \
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2 \
cdaudio.1:${PORTSDIR}/audio/libcdaudio
RUN_DEPENDS= import:${PORTSDIR}/graphics/ImageMagick \
e16:${PORTSDIR}/x11-wm/enlightenment
diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile
index f9a0c4213ea8..69d4377bc5a2 100644
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fluxbox
PORTVERSION= 1.0rc2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= fluxbox
@@ -59,7 +59,7 @@ PLIST_SUB+= DOCPDF:="@comment "
.endif
.if defined(WITH_IMLIB2)
-LIB_DEPENDS+= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS+= Imlib2.4:${PORTSDIR}/graphics/imlib2
CONFIGURE_ARGS+= --enable-imlib2
.else
CONFIGURE_ARGS+= --disable-imlib2
diff --git a/x11-wm/kahakai/Makefile b/x11-wm/kahakai/Makefile
index 8d22ce873751..9ab1a1425b65 100644
--- a/x11-wm/kahakai/Makefile
+++ b/x11-wm/kahakai/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kahakai
PORTVERSION= 0.6.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,7 +17,7 @@ COMMENT= Kahakai window manager
BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 \
${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2 \
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2 \
Xft.2:${PORTSDIR}/x11-fonts/libXft
RUN_DEPENDS= \
${X11BASE}/lib/X11/fonts/artwiz-fonts:${PORTSDIR}/x11-fonts/artwiz-fonts
diff --git a/x11-wm/phluid/Makefile b/x11-wm/phluid/Makefile
index f29d5477b763..7e5703e3cb5c 100644
--- a/x11-wm/phluid/Makefile
+++ b/x11-wm/phluid/Makefile
@@ -7,7 +7,7 @@
PORTNAME= phluid
PORTVERSION= 0.0.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= phluid
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= phluid
MAINTAINER= ports@FreeBSD.org
COMMENT= A window manager that emphasizes efficiency, speed, and beauty
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/x11-wm/skippy/Makefile b/x11-wm/skippy/Makefile
index e5e289a14b42..fc9c837a80a9 100644
--- a/x11-wm/skippy/Makefile
+++ b/x11-wm/skippy/Makefile
@@ -7,14 +7,14 @@
PORTNAME= skippy
PORTVERSION= 0.5.0
-PORTREVISION= 2
+PORTREVISION= 3
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.3:${PORTSDIR}/graphics/imlib2 \
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2 \
Xft.2:${PORTSDIR}/x11-fonts/libXft
USE_XLIB= yes
diff --git a/x11-wm/waimea/Makefile b/x11-wm/waimea/Makefile
index 9f638de43f90..489ce87800f7 100644
--- a/x11-wm/waimea/Makefile
+++ b/x11-wm/waimea/Makefile
@@ -7,7 +7,7 @@
PORTNAME= waimea
PORTVERSION= 0.4.0
-PORTREVISION= 2
+PORTREVISION= 3
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.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS+= Imlib2.4:${PORTSDIR}/graphics/imlib2
.endif
.if defined(WITH_DITHER)
diff --git a/x11/3ddesktop/Makefile b/x11/3ddesktop/Makefile
index e475a5659d99..5cac9f7eaf14 100644
--- a/x11/3ddesktop/Makefile
+++ b/x11/3ddesktop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= 3ddesktop
PORTVERSION= 0.2.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= desk3d
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= 3D Virtual Desktop Switcher
LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut \
- Imlib2.3:${PORTSDIR}/graphics/imlib2
+ Imlib2.4:${PORTSDIR}/graphics/imlib2
USE_GL= yes
USE_GETOPT_LONG= yes
diff --git a/x11/e17-module-cpu/Makefile b/x11/e17-module-cpu/Makefile
index 015ecef1a6cb..8ab175e48743 100644
--- a/x11/e17-module-cpu/Makefile
+++ b/x11/e17-module-cpu/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= cpu
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/x11/e17-module-cpu/distinfo b/x11/e17-module-cpu/distinfo
index 7a0ddda8eeeb..eab0e6c2036e 100644
--- a/x11/e17-module-cpu/distinfo
+++ b/x11/e17-module-cpu/distinfo
@@ -1,3 +1,3 @@
-MD5 (cpu-20060926.tar.bz2) = 1cd0a1463cb4e30bcc1bcb65416ed54b
-SHA256 (cpu-20060926.tar.bz2) = a66b516bfb10e0b9094bbc4bc6fdc3c34946cf0873142e7eb151a952e704ab0d
-SIZE (cpu-20060926.tar.bz2) = 261091
+MD5 (cpu-20070223.tar.bz2) = 30e514b12b1962bdccc25efe7fdb01b6
+SHA256 (cpu-20070223.tar.bz2) = a4ff1df53f919f0b101eaf335038a88e6d8712a1648528982e411a3805d75b96
+SIZE (cpu-20070223.tar.bz2) = 261528
diff --git a/x11/e17-module-cpu/pkg-plist b/x11/e17-module-cpu/pkg-plist
index 42144630fef3..1f5208e5a15b 100644
--- a/x11/e17-module-cpu/pkg-plist
+++ b/x11/e17-module-cpu/pkg-plist
@@ -4,7 +4,6 @@ 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/module_icon.png
@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 3bd1342191c7..8a50532eec2d 100644
--- a/x11/e17-module-deskshow/Makefile
+++ b/x11/e17-module-deskshow/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= deskshow
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/x11/e17-module-deskshow/distinfo b/x11/e17-module-deskshow/distinfo
index 7bf5af25b44c..02a446cb2b0d 100644
--- a/x11/e17-module-deskshow/distinfo
+++ b/x11/e17-module-deskshow/distinfo
@@ -1,3 +1,3 @@
-MD5 (deskshow-20060926.tar.bz2) = ca9f52acca54fb00923bc83344b38349
-SHA256 (deskshow-20060926.tar.bz2) = a689ee52663c4180b8d506a83d35b713fe9f328273627d03c6def55635b6230b
-SIZE (deskshow-20060926.tar.bz2) = 279254
+MD5 (deskshow-20070223.tar.bz2) = a18ff84163447ea899cc21ff71718f0c
+SHA256 (deskshow-20070223.tar.bz2) = 98b1b9138fa75d43a8e4a2c9c461007bf3129d5aa934798241e12c22b12bdfb5
+SIZE (deskshow-20070223.tar.bz2) = 281233
diff --git a/x11/e17-module-flame/Makefile b/x11/e17-module-flame/Makefile
index f41380ec4e8f..5e7b1fc09a4a 100644
--- a/x11/e17-module-flame/Makefile
+++ b/x11/e17-module-flame/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= flame
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/x11/e17-module-flame/distinfo b/x11/e17-module-flame/distinfo
index e2b2a353bafc..7b40e0f4f2dc 100644
--- a/x11/e17-module-flame/distinfo
+++ b/x11/e17-module-flame/distinfo
@@ -1,3 +1,3 @@
-MD5 (flame-20060926.tar.bz2) = e7ebdd2606517342e0a35ebfbb996c62
-SHA256 (flame-20060926.tar.bz2) = 3aa971dcbd72023ad14a491d0a338f337a5d1509f1e47e5c0cff9cbfefff6fe5
-SIZE (flame-20060926.tar.bz2) = 250902
+MD5 (flame-20070223.tar.bz2) = 4fbb97b86add29eef207cda3dd802468
+SHA256 (flame-20070223.tar.bz2) = 18f81de98337826d04716278fe12efc7f0043cfe05f391b21e93ef9777be8738
+SIZE (flame-20070223.tar.bz2) = 278915
diff --git a/x11/e17-module-flame/pkg-plist b/x11/e17-module-flame/pkg-plist
index 716fee610674..81497b3558fb 100644
--- a/x11/e17-module-flame/pkg-plist
+++ b/x11/e17-module-flame/pkg-plist
@@ -3,7 +3,6 @@ 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
-lib/enlightenment/modules/flame/module_icon.png
%%NLS%%share/locale/eo/LC_MESSAGES/flame.mo
%%NLS%%share/locale/fi/LC_MESSAGES/flame.mo
%%NLS%%share/locale/it/LC_MESSAGES/flame.mo
diff --git a/x11/e17-module-language/Makefile b/x11/e17-module-language/Makefile
index 25ddecefa9d3..a1b6bf26521d 100644
--- a/x11/e17-module-language/Makefile
+++ b/x11/e17-module-language/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= language
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/x11/e17-module-language/distinfo b/x11/e17-module-language/distinfo
index 385ea90a9d6f..72899efb161e 100644
--- a/x11/e17-module-language/distinfo
+++ b/x11/e17-module-language/distinfo
@@ -1,3 +1,3 @@
-MD5 (language-20060926.tar.bz2) = 701d7dddddfa4ed4fcc0a11422cd5fb0
-SHA256 (language-20060926.tar.bz2) = f7ff47aa19a5015046bea49d6ac999bd9b8eba513856242f86614efc2d9d77fb
-SIZE (language-20060926.tar.bz2) = 422313
+MD5 (language-20070223.tar.bz2) = 7c915bfbb7bd52e9d0943488c0212a1d
+SHA256 (language-20070223.tar.bz2) = f80623d4ab1b6b259d21d546493fde30892aaf59b5c165dd017a7ab4a0608334
+SIZE (language-20070223.tar.bz2) = 456281
diff --git a/x11/e17-module-mail/Makefile b/x11/e17-module-mail/Makefile
index d002958813c8..b98454bdd4af 100644
--- a/x11/e17-module-mail/Makefile
+++ b/x11/e17-module-mail/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= mail
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/x11/e17-module-mail/distinfo b/x11/e17-module-mail/distinfo
index ef41257f2c56..2d267b2dcf5d 100644
--- a/x11/e17-module-mail/distinfo
+++ b/x11/e17-module-mail/distinfo
@@ -1,3 +1,3 @@
-MD5 (mail-20060926.tar.bz2) = d63660b2e38d82a212684420024458bb
-SHA256 (mail-20060926.tar.bz2) = b526a1d4d3cbb5b0e54d22b9cc87b4462d0bda6ba9a06450f7e8a1d95885d898
-SIZE (mail-20060926.tar.bz2) = 309337
+MD5 (mail-20070223.tar.bz2) = c300a031aa7e68ad4f45305e3a4bacbd
+SHA256 (mail-20070223.tar.bz2) = b3ef91549cc061904d8aea7e9a9ac44066fcdfe951bfb6da214afc11ea055207
+SIZE (mail-20070223.tar.bz2) = 344411
diff --git a/x11/e17-module-mem/Makefile b/x11/e17-module-mem/Makefile
index 623362f4038e..f09773a6980b 100644
--- a/x11/e17-module-mem/Makefile
+++ b/x11/e17-module-mem/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= mem
-PORTVERSION= 20060926
+PORTVERSION= 20070223
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}
diff --git a/x11/e17-module-mem/distinfo b/x11/e17-module-mem/distinfo
index cf64d06cdfc1..50f192030695 100644
--- a/x11/e17-module-mem/distinfo
+++ b/x11/e17-module-mem/distinfo
@@ -1,3 +1,3 @@
-MD5 (mem-20060926.tar.bz2) = 8cb953cc229a1864336ea6e4e547aef1
-SHA256 (mem-20060926.tar.bz2) = eed0876ef948eeabf15c67bfdb8e08d6ba9b6a5479b1ffd60cd29adb69793c49
-SIZE (mem-20060926.tar.bz2) = 389496
+MD5 (mem-20070223.tar.bz2) = 806aae2b3cc2e748a9b26bd8363265ab
+SHA256 (mem-20070223.tar.bz2) = 7d311e2f1efff3e54f33541d338a4ef63a4256e7969f1d7993d84d5a94bceae3
+SIZE (mem-20070223.tar.bz2) = 426211
diff --git a/x11/e17-module-mixer/Makefile b/x11/e17-module-mixer/Makefile
index c979be1591a9..a4ff2f184ec5 100644
--- a/x11/e17-module-mixer/Makefile
+++ b/x11/e17-module-mixer/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= mixer
-PORTVERSION= 20060926
+PORTVERSION= 20070223
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
@@ -24,6 +24,14 @@ USE_GNOME= gnometarget pkgconfig
USE_EFL= edje
GNU_CONFIGURE= yes
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
.include <bsd.port.pre.mk>
.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
.include <bsd.port.post.mk>
diff --git a/x11/e17-module-mixer/distinfo b/x11/e17-module-mixer/distinfo
index 058aebf14405..a90a4bba763e 100644
--- a/x11/e17-module-mixer/distinfo
+++ b/x11/e17-module-mixer/distinfo
@@ -1,3 +1,3 @@
-MD5 (mixer-20060926.tar.bz2) = 3652211f1b7fe321440de97d8801f5d0
-SHA256 (mixer-20060926.tar.bz2) = 0bbacb948166eb5324c602ffd741d1597aea07c69e51c2061d84fcb6638d2a1d
-SIZE (mixer-20060926.tar.bz2) = 289454
+MD5 (mixer-20070223.tar.bz2) = cc6f42aa6e610276e24c6751d4dd74c5
+SHA256 (mixer-20070223.tar.bz2) = c59985082b4cadcb9feccf1bc30f436fd1908f32d2f87bf53a9a47eaab6942c6
+SIZE (mixer-20070223.tar.bz2) = 338312
diff --git a/x11/e17-module-mixer/pkg-plist b/x11/e17-module-mixer/pkg-plist
index 7b5d44decf2c..65daad44b823 100644
--- a/x11/e17-module-mixer/pkg-plist
+++ b/x11/e17-module-mixer/pkg-plist
@@ -2,7 +2,10 @@ 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/module.eap
+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
@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 f442da8955c6..f1a7b0b84955 100644
--- a/x11/e17-module-moon/Makefile
+++ b/x11/e17-module-moon/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= moon
-PORTVERSION= 20060926
+PORTVERSION= 20070223
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}
diff --git a/x11/e17-module-moon/distinfo b/x11/e17-module-moon/distinfo
index 872df226239c..b686069e9d75 100644
--- a/x11/e17-module-moon/distinfo
+++ b/x11/e17-module-moon/distinfo
@@ -1,3 +1,3 @@
-MD5 (moon-20060926.tar.bz2) = f967701d2f031631d3b0a63b58df76c3
-SHA256 (moon-20060926.tar.bz2) = 3319d37fcd7fdfe0bf65aeb5d9016e3660e730263a97d18538e397ea5e2d50c0
-SIZE (moon-20060926.tar.bz2) = 672466
+MD5 (moon-20070223.tar.bz2) = a110d53bc5a05297e93a3a1eb05c9c11
+SHA256 (moon-20070223.tar.bz2) = 4e387eabe35435c61da7fd84a33cad8f8f3db31092c44bdf65834273f5f4a775
+SIZE (moon-20070223.tar.bz2) = 699637
diff --git a/x11/e17-module-rain/Makefile b/x11/e17-module-rain/Makefile
index 77f5f19018dc..daa433e7d545 100644
--- a/x11/e17-module-rain/Makefile
+++ b/x11/e17-module-rain/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= rain
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/x11/e17-module-rain/distinfo b/x11/e17-module-rain/distinfo
index 1df8e3b07846..15917d0bc525 100644
--- a/x11/e17-module-rain/distinfo
+++ b/x11/e17-module-rain/distinfo
@@ -1,3 +1,3 @@
-MD5 (rain-20060926.tar.bz2) = 4505ab2f405c09191fb3dace3160ef88
-SHA256 (rain-20060926.tar.bz2) = 5f7b172c99518b1bee0d9a79c150e25cdbf289e1506bedf72bbe0f2c0eee212f
-SIZE (rain-20060926.tar.bz2) = 315366
+MD5 (rain-20070223.tar.bz2) = 18fa7a1fdf1cd51098620a0514436d34
+SHA256 (rain-20070223.tar.bz2) = f132a1118622fd718b32ca5c28e415b5af3edc51d87642b58885ea723a344806
+SIZE (rain-20070223.tar.bz2) = 347010
diff --git a/x11/e17-module-rain/pkg-plist b/x11/e17-module-rain/pkg-plist
index fad84f556792..f9c08552a331 100644
--- a/x11/e17-module-rain/pkg-plist
+++ b/x11/e17-module-rain/pkg-plist
@@ -7,7 +7,6 @@ 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
-lib/enlightenment/modules/rain/module_icon.png
%%NLS%%share/locale/eo/LC_MESSAGES/rain.mo
%%NLS%%share/locale/fi/LC_MESSAGES/rain.mo
%%NLS%%share/locale/fr/LC_MESSAGES/rain.mo
diff --git a/x11/e17-module-screenshot/Makefile b/x11/e17-module-screenshot/Makefile
index 42347fec4de2..2e6ddd67d8c7 100644
--- a/x11/e17-module-screenshot/Makefile
+++ b/x11/e17-module-screenshot/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= screenshot
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/x11/e17-module-screenshot/distinfo b/x11/e17-module-screenshot/distinfo
index fc042b17e8d8..a5226e0d1280 100644
--- a/x11/e17-module-screenshot/distinfo
+++ b/x11/e17-module-screenshot/distinfo
@@ -1,3 +1,3 @@
-MD5 (screenshot-20060926.tar.bz2) = 59d9780357c3f41676474800d274d6b9
-SHA256 (screenshot-20060926.tar.bz2) = fc5f809d6af7da0a65033e28a27f91db424e716c46574f449a3300ba8a73277f
-SIZE (screenshot-20060926.tar.bz2) = 373270
+MD5 (screenshot-20070223.tar.bz2) = d351d0fb604bf87c5eaf80c0a8089c96
+SHA256 (screenshot-20070223.tar.bz2) = 16e3fcfe9479791af46c3d8fb933fc3020d522c013f26e8847516f4561824e54
+SIZE (screenshot-20070223.tar.bz2) = 407617
diff --git a/x11/e17-module-slideshow/Makefile b/x11/e17-module-slideshow/Makefile
index 5b9ac9375aae..883222cf321e 100644
--- a/x11/e17-module-slideshow/Makefile
+++ b/x11/e17-module-slideshow/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= slideshow
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/x11/e17-module-slideshow/distinfo b/x11/e17-module-slideshow/distinfo
index 973d1ebc4ca0..657acb2a7fd8 100644
--- a/x11/e17-module-slideshow/distinfo
+++ b/x11/e17-module-slideshow/distinfo
@@ -1,3 +1,3 @@
-MD5 (slideshow-20060926.tar.bz2) = 26e082dfe8aeb43d0fb1f56fcf27cee4
-SHA256 (slideshow-20060926.tar.bz2) = 9b709121621489fe84d9941fc2fd276800ddfe9be6b763f7242ebc00f79ea295
-SIZE (slideshow-20060926.tar.bz2) = 254831
+MD5 (slideshow-20070223.tar.bz2) = 619c2f89b4fe10fc608f3694a74a99ee
+SHA256 (slideshow-20070223.tar.bz2) = 59b481d3bdb1bd38187fc397f4a2f3922befc41713ede7dd08a30353321e1a25
+SIZE (slideshow-20070223.tar.bz2) = 284528
diff --git a/x11/e17-module-snow/Makefile b/x11/e17-module-snow/Makefile
index f01e84a9df7a..5576b057f405 100644
--- a/x11/e17-module-snow/Makefile
+++ b/x11/e17-module-snow/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= snow
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/x11/e17-module-snow/distinfo b/x11/e17-module-snow/distinfo
index b2e53b54dd7b..c88a10edbbf2 100644
--- a/x11/e17-module-snow/distinfo
+++ b/x11/e17-module-snow/distinfo
@@ -1,3 +1,3 @@
-MD5 (snow-20060926.tar.bz2) = c5dbea13f4151b4d0851d1b083c90732
-SHA256 (snow-20060926.tar.bz2) = 4372038f755e2e99f53a3e367ff175a634b94f618ad47533dbd68892f5f22490
-SIZE (snow-20060926.tar.bz2) = 248633
+MD5 (snow-20070223.tar.bz2) = 820d1c99ba6007e4d0d7eca164cbbe9a
+SHA256 (snow-20070223.tar.bz2) = 4695cc214ababccb04ca746626bc87edeb32c5319c1b3f9b76eb92c7023c8396
+SIZE (snow-20070223.tar.bz2) = 278212
diff --git a/x11/e17-module-snow/pkg-plist b/x11/e17-module-snow/pkg-plist
index d3d75cd2e5a8..c1752aa10628 100644
--- a/x11/e17-module-snow/pkg-plist
+++ b/x11/e17-module-snow/pkg-plist
@@ -6,7 +6,6 @@ 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/module_icon.png
lib/enlightenment/modules/snow/tree.png
%%NLS%%share/locale/eo/LC_MESSAGES/snow.mo
%%NLS%%share/locale/fi/LC_MESSAGES/snow.mo
diff --git a/x11/e17-module-uptime/Makefile b/x11/e17-module-uptime/Makefile
index c977b63d67e7..6d945e31c188 100644
--- a/x11/e17-module-uptime/Makefile
+++ b/x11/e17-module-uptime/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= uptime
-PORTVERSION= 20060926
+PORTVERSION= 20070223
PORTREVISION= 0
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/x11/e17-module-uptime/distinfo b/x11/e17-module-uptime/distinfo
index 5257ad423257..a638c4ae756d 100644
--- a/x11/e17-module-uptime/distinfo
+++ b/x11/e17-module-uptime/distinfo
@@ -1,3 +1,3 @@
-MD5 (uptime-20060926.tar.bz2) = f39c2c7643adef2456e4e3994a3696d0
-SHA256 (uptime-20060926.tar.bz2) = 145ce4451b0df08985b691fbaa4fe783cac32a5b2bab007f093ebfb3cbfb5bec
-SIZE (uptime-20060926.tar.bz2) = 285109
+MD5 (uptime-20070223.tar.bz2) = 0c806db8ced0ec7e6b544cd0096cbe83
+SHA256 (uptime-20070223.tar.bz2) = 96ebb7053d410ed5f56cf0359ad7d7e7c393de376b349dc1107c96355d76d2d0
+SIZE (uptime-20070223.tar.bz2) = 316556
diff --git a/x11/e17-module-weather/Makefile b/x11/e17-module-weather/Makefile
index 458c9d203ff7..aa6f87e22d5e 100644
--- a/x11/e17-module-weather/Makefile
+++ b/x11/e17-module-weather/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= weather
-PORTVERSION= 20060926
+PORTVERSION= 20070223
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}
diff --git a/x11/e17-module-weather/distinfo b/x11/e17-module-weather/distinfo
index 51bc6124cecc..b552ac86e987 100644
--- a/x11/e17-module-weather/distinfo
+++ b/x11/e17-module-weather/distinfo
@@ -1,3 +1,3 @@
-MD5 (weather-20060926.tar.bz2) = 6bda3b61f7f026040865a262305fc9a4
-SHA256 (weather-20060926.tar.bz2) = 02371844b0d466d7a90ad47bef5e40470dec77aff07c8635cea4cf985ba384d3
-SIZE (weather-20060926.tar.bz2) = 948459
+MD5 (weather-20070223.tar.bz2) = f8b7e939ed671722639e5d1fff8ed5cf
+SHA256 (weather-20070223.tar.bz2) = 796a3a1167677e1360af7d997245f7d6400b89e1b9d173e9d775325fc2c77056
+SIZE (weather-20070223.tar.bz2) = 868191
diff --git a/x11/e17-module-weather/pkg-plist b/x11/e17-module-weather/pkg-plist
index bd4bcd2c0fbd..8c41253f625e 100644
--- a/x11/e17-module-weather/pkg-plist
+++ b/x11/e17-module-weather/pkg-plist
@@ -1,77 +1,13 @@
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/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
lib/enlightenment/modules/weather/module.desktop
lib/enlightenment/modules/weather/module.edj
-lib/enlightenment/modules/weather/module_icon.png
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
-@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 553c0ec4c557..7cf706db8f18 100644
--- a/x11/e17-module-winselector/Makefile
+++ b/x11/e17-module-winselector/Makefile
@@ -7,9 +7,9 @@
#
PORTNAME= winselector
-PORTVERSION= 20060926
+PORTVERSION= 20070223
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
MAINTAINER= stas@FreeBSD.org
diff --git a/x11/e17-module-winselector/distinfo b/x11/e17-module-winselector/distinfo
index 12ddf1232176..417522d22d7b 100644
--- a/x11/e17-module-winselector/distinfo
+++ b/x11/e17-module-winselector/distinfo
@@ -1,3 +1,3 @@
-MD5 (winselector-20060926.tar.bz2) = 7f3f5d26dff799c4c37945043b171d28
-SHA256 (winselector-20060926.tar.bz2) = f6e433dda44c9bedc81b12032a7618b015d33acdb7177becea4e56a2baa13484
-SIZE (winselector-20060926.tar.bz2) = 277497
+MD5 (winselector-20070223.tar.bz2) = bfd3d02ddda2bec18a400175bf6d6b6a
+SHA256 (winselector-20070223.tar.bz2) = b25e693378fd8cd64d69c8d5301b915e94b48e8d18a012850efef0ce928d0794
+SIZE (winselector-20070223.tar.bz2) = 271828
diff --git a/x11/ecore/Makefile b/x11/ecore/Makefile
index 9b2c57420c87..c5198d789e0c 100644
--- a/x11/ecore/Makefile
+++ b/x11/ecore/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= ecore
-PORTVERSION= 20060926
-PORTREVISION= 2
+PORTVERSION= 20070223
+PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= A core event abstraction library
@@ -25,7 +25,7 @@ USE_GETOPT_LONG=yes
CONFIGURE_ARGS= --disable-ecore-dfb
-OPTIONS= DBUS "Enable DBUS support" off \
+OPTIONS= DBUS "Enable DBUS support" on \
CURL "Enable Curl support" on \
X11 "Enable X11 support" on \
EVAS "Enable evas support" on \
diff --git a/x11/ecore/distinfo b/x11/ecore/distinfo
index e7e0a4cadff5..3bfabbeb47d1 100644
--- a/x11/ecore/distinfo
+++ b/x11/ecore/distinfo
@@ -1,3 +1,3 @@
-MD5 (ecore-20060926.tar.bz2) = d714613d6c8d51e8c841c65d520e0047
-SHA256 (ecore-20060926.tar.bz2) = eb1f75c70146efa5470faf00d23b4da27dd43b9862fabcd6914c05de9c616e91
-SIZE (ecore-20060926.tar.bz2) = 4162746
+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
index 0d8aec39c52d..9acdc906fe83 100644
--- a/x11/ecore/pkg-plist
+++ b/x11/ecore/pkg-plist
@@ -1,10 +1,5 @@
bin/ecore-config
%%EET%%bin/ecore_config
-bin/ecore_dbus_hal_test
-bin/ecore_dbus_receiver_test
-bin/ecore_dbus_test
-%%EVAS%%bin/ecore_evas_test
-%%EVAS%%bin/ecore_test
include/Ecore.h
include/Ecore_Con.h
%%EET%%include/Ecore_Config.h
@@ -15,6 +10,7 @@ include/Ecore_Desktop.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
@@ -65,28 +61,6 @@ lib/libecore_txt.so.1
%%X11%%lib/libecore_x.so.1
libdata/pkgconfig/ecore.pc
share/aclocal/ecore.m4
-%%DATADIR%%/fonts/Vera.ttf
-%%DATADIR%%/fonts/VeraBI.ttf
-%%DATADIR%%/fonts/VeraBd.ttf
-%%DATADIR%%/fonts/VeraIt.ttf
-%%DATADIR%%/fonts/VeraMoBI.ttf
-%%DATADIR%%/fonts/VeraMoBd.ttf
-%%DATADIR%%/fonts/VeraMoIt.ttf
-%%DATADIR%%/fonts/VeraMono.ttf
-%%DATADIR%%/fonts/VeraSe.ttf
-%%DATADIR%%/fonts/VeraSeBd.ttf
-%%DATADIR%%/fonts/fonts.alias
-%%DATADIR%%/fonts/fonts.dir
-%%DATADIR%%/images/ball.png
-%%DATADIR%%/images/bar.png
-%%DATADIR%%/images/bar_shad_above.png
-%%DATADIR%%/images/bar_shad_below.png
-%%DATADIR%%/images/bg.png
-%%DATADIR%%/images/crosshair.png
-%%DATADIR%%/images/e_logo.png
-%%DATADIR%%/images/evas_logo.png
-%%DATADIR%%/images/shadow.png
-%%DATADIR%%/pointers/mouse_pointer.png
@dirrm %%DATADIR%%/pointers
@dirrm %%DATADIR%%/images
@dirrm %%DATADIR%%/fonts
diff --git a/x11/elicit/Makefile b/x11/elicit/Makefile
index 50a4147d6eea..b9de513f5903 100644
--- a/x11/elicit/Makefile
+++ b/x11/elicit/Makefile
@@ -7,9 +7,9 @@
#
PORTNAME= elicit
-PORTVERSION= 20060926
+PORTVERSION= 20070223
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= Screen zoomer/color picker for e17
diff --git a/x11/elicit/distinfo b/x11/elicit/distinfo
index cf757b166401..b540de0e04cf 100644
--- a/x11/elicit/distinfo
+++ b/x11/elicit/distinfo
@@ -1,3 +1,3 @@
-MD5 (elicit-20060926.tar.bz2) = fe8e88cb2a959e37afb66fd48c3eaaf8
-SHA256 (elicit-20060926.tar.bz2) = 6cc88935cca450ca6867150c89557909c1b44b4cb4fdb02f45f513d1eaf30647
-SIZE (elicit-20060926.tar.bz2) = 468200
+MD5 (elicit-20070223.tar.bz2) = dbb76ba14f55983308096cb2b5af7525
+SHA256 (elicit-20070223.tar.bz2) = e2745d2b55012998d6b942338fe1d8f1afcd3f1afc645ed578ef001a817779c5
+SIZE (elicit-20070223.tar.bz2) = 460846
diff --git a/x11/enity/Makefile b/x11/enity/Makefile
index 2f9248afb800..0a1779b80f15 100644
--- a/x11/enity/Makefile
+++ b/x11/enity/Makefile
@@ -7,9 +7,9 @@
#
PORTNAME= enity
-PORTVERSION= 20060926
+PORTVERSION= 20070223
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= Create Etk dialogs using scripts
diff --git a/x11/enity/distinfo b/x11/enity/distinfo
index 7936ba5dd67f..576959f023c8 100644
--- a/x11/enity/distinfo
+++ b/x11/enity/distinfo
@@ -1,3 +1,3 @@
-MD5 (enity-20060926.tar.bz2) = aa2ba2aabd23e2b7f215085af12a7623
-SHA256 (enity-20060926.tar.bz2) = 4236e09b3e43af589684e44b1f1eed35226d642f6f907363d3cdc70432c4215e
-SIZE (enity-20060926.tar.bz2) = 232524
+MD5 (enity-20070223.tar.bz2) = a17a38719fb8e118dda824b13afa56a9
+SHA256 (enity-20070223.tar.bz2) = a2a147cee3fa682a09c42207b420856d0be3f092495dc7d17926794aed273c76
+SIZE (enity-20070223.tar.bz2) = 231111
diff --git a/x11/enity/files/patch-src_bin_enity.c b/x11/enity/files/patch-src_bin_enity.c
deleted file mode 100644
index 0b8afbac4f25..000000000000
--- a/x11/enity/files/patch-src_bin_enity.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/bin/enity.c.orig Thu Oct 5 01:06:18 2006
-+++ src/bin/enity.c Thu Oct 5 01:07:02 2006
-@@ -376,7 +376,7 @@
-
- valist[j] = NULL;
-
-- row = etk_tree_append_valist(ETK_TREE(tree), (va_list)valist);
-+/* row = etk_tree_append_valist(ETK_TREE(tree), (va_list)valist); */
- etk_tree_row_data_set(row, cols);
- }
- }
-@@ -583,7 +583,7 @@
- /* --list options */
- { "checklist", ' ', NULL, _en_list_check_cb, NULL, EN_ARGUMENT_FLAG_OPTIONAL, "Use check boxes for first column" },
- { "column", ' ', NULL, _en_list_column_cb, NULL, EN_ARGUMENT_FLAG_OPTIONAL|EN_ARGUMENT_FLAG_VALUE_REQUIRED|EN_ARGUMENT_FLAG_MULTIVALUE, "Set the column header" },
-- { "list", ' ', NULL, _en_list_cb, NULL, EN_ARGUMENT_FLAG_OPTIONAL, "Display list dialog" },
-+/* { "list", ' ', NULL, _en_list_cb, NULL, EN_ARGUMENT_FLAG_OPTIONAL, "Display list dialog" }, */
-
- /* --progress options */
- { "progress", ' ', NULL, _en_progress_cb, NULL, EN_ARGUMENT_FLAG_OPTIONAL, "Display progress indication dialog" },
diff --git a/x11/enterminus/Makefile b/x11/enterminus/Makefile
index 3e5a63869cfd..0c6470f4ef71 100644
--- a/x11/enterminus/Makefile
+++ b/x11/enterminus/Makefile
@@ -7,9 +7,9 @@
#
PORTNAME= enterminus
-PORTVERSION= 20060926
+PORTVERSION= 20070223
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= An EFL based terminal
diff --git a/x11/enterminus/distinfo b/x11/enterminus/distinfo
index d58480ff505d..c80c688406f5 100644
--- a/x11/enterminus/distinfo
+++ b/x11/enterminus/distinfo
@@ -1,3 +1,3 @@
-MD5 (enterminus-20060926.tar.bz2) = b0a96dc2f34cea46966515549450aedf
-SHA256 (enterminus-20060926.tar.bz2) = 195205d1687b3100c6f8a0441e8dea108893e5077519e12396f5fd24140d47ee
-SIZE (enterminus-20060926.tar.bz2) = 270790
+MD5 (enterminus-20070223.tar.bz2) = d896c9273317a302692f5c6f0a864933
+SHA256 (enterminus-20070223.tar.bz2) = 061614ee1ba76b4def1cff86cb46118e3536a52848748384179cedb104d71c23
+SIZE (enterminus-20070223.tar.bz2) = 269142
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 46698d3df6c2..be8f4d3e3c07 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= eterm
PORTVERSION= 0.9.4
+PORTREVISION= 1
CATEGORIES+= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,7 +17,7 @@ MAINTAINER?= olgeni@FreeBSD.org
COMMENT?= X11 terminal emulator based on rxvt/xterm
BUILD_DEPENDS= man2html:${PORTSDIR}/textproc/man2html
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2 \
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2 \
ast.2:${PORTSDIR}/devel/libast
GNU_CONFIGURE= yes
diff --git a/x11/examine/Makefile b/x11/examine/Makefile
index 4d468b648201..ac2d02d472b8 100644
--- a/x11/examine/Makefile
+++ b/x11/examine/Makefile
@@ -7,16 +7,13 @@
#
PORTNAME= examine
-PORTVERSION= 20060926
+PORTVERSION= 20070223
CATEGORIES= x11
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= Interface for configuring EFL applications
-LIB_DEPENDS= ecore.1:${PORTSDIR}/x11/ecore \
- ewl.0:${PORTSDIR}/x11-toolkits/ewl
-
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/x11/examine/distinfo b/x11/examine/distinfo
index bc8b311eb3ab..2ff0cb40d240 100644
--- a/x11/examine/distinfo
+++ b/x11/examine/distinfo
@@ -1,3 +1,3 @@
-MD5 (examine-20060926.tar.bz2) = e849fb33e7752673e4ee0153d3d32c07
-SHA256 (examine-20060926.tar.bz2) = 225d6e595a5bb600fa7801ec2b232aa6e05c9b3f23b380acbeb391d20c6fc6b1
-SIZE (examine-20060926.tar.bz2) = 1261349
+MD5 (examine-20070223.tar.bz2) = ba8357186142e80fda2c8c9a8ed4924f
+SHA256 (examine-20070223.tar.bz2) = e403fd35c538c41c3420e7e25376082a8087bd5dec2131fed96cd87cfba494dc
+SIZE (examine-20070223.tar.bz2) = 1260363
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index 72c0206c91be..c07bac39910a 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fbdesk
PORTVERSION= 1.4.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://fluxbox.sourceforge.net/download/ \
${MASTER_SITE_GENTOO} \
@@ -19,7 +20,7 @@ COMMENT= A Fluxbox utility to create and manage icons on the desktop
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
Xft.2:${PORTSDIR}/x11-fonts/libXft \
- Imlib2.3:${PORTSDIR}/graphics/imlib2
+ Imlib2.4:${PORTSDIR}/graphics/imlib2
PLIST_FILES= bin/fbdesk
USE_X_PREFIX= yes
diff --git a/x11/ipager/Makefile b/x11/ipager/Makefile
index 2970f8fad3fa..522ad0a77887 100644
--- a/x11/ipager/Makefile
+++ b/x11/ipager/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ipager
PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://useperl.ru/ipager/src/
DISTNAME= ipager-${PORTVERSION}
@@ -15,7 +15,7 @@ DISTNAME= ipager-${PORTVERSION}
MAINTAINER= vlad@vlad.uz.ua
COMMENT= X11 pager program
-LIB_DEPENDS+= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS+= Imlib2.4:${PORTSDIR}/graphics/imlib2
USE_SCONS= yes
diff --git a/x11/wmmsg/Makefile b/x11/wmmsg/Makefile
index 78965855a966..4ea344f1cff2 100644
--- a/x11/wmmsg/Makefile
+++ b/x11/wmmsg/Makefile
@@ -7,14 +7,14 @@
PORTNAME= wmmsg
PORTVERSION= 1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11 windowmaker
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.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2
WRKSRC= ${WRKDIR}/${PORTNAME}