7 files changed, 27 insertions, 24 deletions

diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index 3116e0750133..03f5ac6d0768 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -17,7 +17,6 @@ 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.4:${PORTSDIR}/graphics/imlib2 \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
 		freetype.9:${PORTSDIR}/print/freetype2
 
@@ -25,6 +24,7 @@ ONLY_FOR_ARCHS=	i386 alpha
 
 USE_XLIB=	yes
 USE_AUTOTOOLS=	autoconf:261 libtool:15 libltdl:15
+USE_EFL=	imlib2
 
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
diff --git a/multimedia/eclair/Makefile b/multimedia/eclair/Makefile
index 04d9ffec593f..a89e94248d71 100644
--- a/multimedia/eclair/Makefile
+++ b/multimedia/eclair/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	eclair
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	20080223
+PORTREVISION=	0
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
@@ -22,7 +22,8 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget pkgconfig libxml2
 USE_EFL=	ecore edje evas emotion
-USE_EFL_ESMART=	trans_x11
+USE_EFL_ECORE=	x11 evas file
+USE_EFL_ESMART=	draggies
 USE_SQLITE=	3
 
 .include <bsd.port.mk>
diff --git a/multimedia/eclair/distinfo b/multimedia/eclair/distinfo
index 3c0cba3d2b3d..0a5a5b77f15f 100644
--- a/multimedia/eclair/distinfo
+++ b/multimedia/eclair/distinfo
@@ -1,3 +1,3 @@
-MD5 (eclair-20070223.tar.bz2) = 5ae249d9c5501fd0dd150cf20082727f
-SHA256 (eclair-20070223.tar.bz2) = 9cf60e23c68118be5f81fdba15bc5ef40c9f97ac0e79d81bf3cb6f30e522b97e
-SIZE (eclair-20070223.tar.bz2) = 635817
+MD5 (eclair-20080223.tar.bz2) = 1d98f14b43c8db54ad0f80898110e74c
+SHA256 (eclair-20080223.tar.bz2) = 45ecdc84c828b89be61bd3b70fe1fce1f05b6639790d2a6d167359be8ed3ffd4
+SIZE (eclair-20080223.tar.bz2) = 642938
diff --git a/multimedia/emotion/Makefile b/multimedia/emotion/Makefile
index 729f37b7f68d..c1752b0c1bc5 100644
--- a/multimedia/emotion/Makefile
+++ b/multimedia/emotion/Makefile
@@ -7,18 +7,21 @@
 #
 
 PORTNAME=	emotion
-PORTVERSION=	20070223
-PORTREVISION=	1
+PORTVERSION=	0.1.0.042
+PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	multimedia
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
+		http://download.enlightenment.org/snapshots/2008-01-25/
 
 MAINTAINER=	stas@FreeBSD.org
-COMMENT=	Video playback wrapper library for e17
+COMMENT=	Video playback wrapper library for Enlightenment
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
 USE_EFL=	ecore edje eet embryo evas
+USE_EFL_EVAS_LOADERS=	png jpeg
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/multimedia/emotion/distinfo b/multimedia/emotion/distinfo
index ea9ad31b793e..98aebfcf2332 100644
--- a/multimedia/emotion/distinfo
+++ b/multimedia/emotion/distinfo
@@ -1,3 +1,3 @@
-MD5 (emotion-20070223.tar.bz2) = ef6e89c28b367fa4ed54d853d63694e1
-SHA256 (emotion-20070223.tar.bz2) = 640fc990183682d2f39376dbd65ba9a69b1ebd5a997f379ab7b9cded2d03fb55
-SIZE (emotion-20070223.tar.bz2) = 1433834
+MD5 (emotion-0.1.0.042.tar.bz2) = 123c043d02f4da22fb36eede930a44e5
+SHA256 (emotion-0.1.0.042.tar.bz2) = dcbe478648df63d71482947415d8cc83f1b4d8cd373801d6b1e479315d27cb97
+SIZE (emotion-0.1.0.042.tar.bz2) = 404323
diff --git a/multimedia/emotion/pkg-plist b/multimedia/emotion/pkg-plist
index da6dcdb15dea..ca64d8b743ee 100644
--- a/multimedia/emotion/pkg-plist
+++ b/multimedia/emotion/pkg-plist
@@ -1,16 +1,15 @@
-bin/emotion-config
 bin/emotion_test
 include/Emotion.h
-%%GST%%lib/emotion/emotion_decoder_gstreamer.a
-%%GST%%lib/emotion/emotion_decoder_gstreamer.la
-%%GST%%lib/emotion/emotion_decoder_gstreamer.so
-%%XINE%%lib/emotion/emotion_decoder_xine.a
-%%XINE%%lib/emotion/emotion_decoder_xine.la
-%%XINE%%lib/emotion/emotion_decoder_xine.so
+%%GST%%lib/emotion/gstreamer.a
+%%GST%%lib/emotion/gstreamer.la
+%%GST%%lib/emotion/gstreamer.so
+%%XINE%%lib/emotion/xine.a
+%%XINE%%lib/emotion/xine.la
+%%XINE%%lib/emotion/xine.so
 lib/libemotion.a
 lib/libemotion.la
 lib/libemotion.so
-lib/libemotion.so.0
+lib/libemotion.so.1
 libdata/pkgconfig/emotion.pc
 %%DATADIR%%/data/theme.edj
 @dirrm %%DATADIR%%/data
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index c1f78ff616cf..891f0f197b7e 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ffmpeg
 DISTVERSION=	2007-10-04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ahze
@@ -188,7 +188,7 @@ LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
 PLIST_FILES+=	lib/vhook/drawtext.so
 . endif # freetype2
 . ifdef(WITH_IMLIB2) || exists(${LOCALBASE}/lib/libImlib2.so)
-LIB_DEPENDS+=	Imlib2.4:${PORTSDIR}/graphics/imlib2
+USE_EFL+=	imlib2
 
 PLIST_FILES+=	lib/vhook/imlib2.so
 . else