- Move to LOCALBASE

- Use new EFL framework
- Update all e17 ports to the lates stable cvs snapshot
- Add additional knobs/options to ports makefiles to control the
  feature set
- Add a bunch of new e17 applications/libraries
- Minor improvements/modification.

Approved by:	vanilla (old maintainer), sem (mentor)

4 files changed, 269 insertions, 103 deletions

diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile
index d8d63f789afd..912395599616 100644
--- a/graphics/evas/Makefile
+++ b/graphics/evas/Makefile
@@ -6,29 +6,36 @@
 #
 
 PORTNAME=	evas
-PORTVERSION=	0.9.9.032
+PORTVERSION=	20060926
 PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://enlightenment.freedesktop.org/files/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	vanilla@FreeBSD.org
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	A hardware-accelerated canvas API for X-Windows
 
-LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2 \
-		edb.1:${PORTSDIR}/databases/edb \
-		eet.9:${PORTSDIR}/devel/eet
-
-USE_X_PREFIX=	yes
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_FREETYPE2=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-OPTIONS=	GL "Enable GL support" off
 
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+OPTIONS=	GL		"Enable OpenGL rendering backend" off \
+		SOFTX11		"Enable software X11 rendering backend" on \
+		XRENDER		"Enable XRender X11 rendering backend" on \
+		BUFFER		"Enable buffer rendering backend" on \
+		DIRECTFB	"Enable DirectFB rendering backend" off \
+		FONTCONFIG	"Use fontconfig to find fonts" on \
+		GIF		"Enable GIF image loader" on \
+		PNG		"Enable PNG image loader" on \
+		JPEG		"Enable JPEG image loader" on \
+		EET		"Enable EET image loader" on \
+		EDB		"Enable EDB image loader" on \
+		TIFF		"Enable TIFF image loader" on \
+		XPM		"Enable XPM image loader" on \
+		SVG		"Enable SVG image loader" on \
+		EETFONT		"Enable EET font loader" on
 
 .include <bsd.port.pre.mk>
 
@@ -40,4 +47,134 @@ USE_GL=		yes
 PLIST_SUB+=	WITH_GL="@comment "
 .endif
 
+.if defined(WITH_DIRECTFB)
+CONFIGURE_ARGS+=	--enable-directfb
+PLIST_SUB+=	DIRECTFB=""
+LIB_DEPENDS+=	directfb-0.9.16:${PORTSDIR}/devel/directfb
+.else
+CONFIGURE_ARGS+=	--disable-directfb
+PLIST_SUB+=	DIRECTFB="@comment "
+.endif
+
+.if !defined(WITHOUT_FONTCONFIG)
+CONFIGURE_ARGS+=	--enable-fontconfig
+PLIST_SUB+=	FONTCONFIG=""
+LIB_DEPENDS+=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
+.else
+CONFIGURE_ARGS+=	--disable-fontconfig
+PLIST_SUB+=	FONTCONFIG="@comment "
+.endif
+
+.if !defined(WITHOUT_SOFTX11)
+CONFIGURE_ARGS+=	--enable-software-x11
+PLIST_SUB+=	SOFTX11=""
+USE_XLIB=	yes
+.else
+CONFIGURE_ARGS+=	--disable-software-x11
+PLIST_SUB+=	SOFTX11="@comment "
+.endif
+
+.if !defined(WITHOUT_XRENDER)
+CONFIGURE_ARGS+=	--enable-xrender-x11
+PLIST_SUB+=	XRENDER=""
+USE_XLIB=	yes
+.else
+CONFIGURE_ARGS+=	--disable-xrender-x11
+PLIST_SUB+=	XRENDER="@comment "
+.endif
+
+.if !defined(WITHOUT_BUFFER)
+CONFIGURE_ARGS+=	--enable-buffer
+PLIST_SUB+=	BUFFER=""
+.else
+CONFIGURE_ARGS+=	--disable-buffer
+PLIST_SUB+=	BUFFER="@comment "
+.endif
+
+.if !defined(WITHOUT_GIF)
+CONFIGURE_ARGS+=	--enable-image-loader-gif
+PLIST_SUB+=	GIF=""
+LIB_DEPENDS+=	ungif.5:${PORTSDIR}/graphics/libungif
+.else
+CONFIGURE_ARGS+=	--disable-image-loader-gif
+PLIST_SUB+=	GIF="@comment "
+.endif
+
+.if !defined(WITHOUT_PNG)
+CONFIGURE_ARGS+=	--enable-image-loader-png
+PLIST_SUB+=	PNG=""
+LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
+.else
+CONFIGURE_ARGS+=	--disable-image-loader-png
+PLIST_SUB+=	PNG="@comment "
+.endif
+
+.if !defined(WITHOUT_JPEG)
+CONFIGURE_ARGS+=	--enable-image-loader-jpeg
+PLIST_SUB+=	JPEG=""
+LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
+CFLAGS+=	-I${X11BASE}/include
+LDFLAGS+=	-L${X11BASE}/lib
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
+.else
+CONFIGURE_ARGS+=	--disable-image-loader-jpeg
+PLIST_SUB+=	JPEG="@comment "
+.endif
+
+.if !defined(WITHOUT_EET)
+CONFIGURE_ARGS+=	--enable-image-loader-eet
+PLIST_SUB+=	EET=""
+USE_EFL+=	eet
+.else
+CONFIGURE_ARGS+=	--disable-image-loader-eet
+PLIST_SUB+=	EET="@comment "
+.endif
+
+.if !defined(WITHOUT_EETFONT)
+CONFIGURE_ARGS+=	--enable-font-loader-eet
+PLIST_SUB+=	EETFONT=""
+USE_EFL+=	eet
+.else
+CONFIGURE_ARGS+=	--disable-font-loader-eet
+PLIST_SUB+=	EETFONT="@comment "
+.endif
+
+.if !defined(WITHOUT_EDB)
+CONFIGURE_ARGS+=	--enable-image-loader-edb
+PLIST_SUB+=	EDB=""
+USE_EFL+=	edb
+.else
+CONFIGURE_ARGS+=	--disable-image-loader-edb
+PLIST_SUB+=	EDB="@comment "
+.endif
+
+.if !defined(WITHOUT_TIFF)
+CONFIGURE_ARGS+=	--enable-image-loader-tiff
+LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
+PLIST_SUB+=	TIFF=""
+.else
+CONFIGURE_ARGS+=	--disable-image-loader-tiff
+PLIST_SUB+=	TIFF="@comment "
+.endif
+
+.if !defined(WITHOUT_XPM)
+CONFIGURE_ARGS+=	--enable-image-loader-xpm
+USE_XPM=	yes
+PLIST_SUB+=	XPM=""
+.else
+CONFIGURE_ARGS+=	--disable-image-loader-xpm
+PLIST_SUB+=	XPM="@comment "
+.endif
+
+.if !defined(WITHOUT_SVG)
+CONFIGURE_ARGS+=	--enable-image-loader-svg
+USE_GNOME+=	librsvg2
+LIB_DEPENDS+=	svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo
+PLIST_SUB+=	SVG=""
+.else
+CONFIGURE_ARGS+=	--disable-image-loader-svg
+PLIST_SUB+=	SVG="@comment "
+.endif
+
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
 .include <bsd.port.post.mk>
diff --git a/graphics/evas/distinfo b/graphics/evas/distinfo
index 7f6995ea2e58..6ac8c2bbc653 100644
--- a/graphics/evas/distinfo
+++ b/graphics/evas/distinfo
@@ -1,3 +1,3 @@
-MD5 (evas-0.9.9.032.tar.gz) = f7cedd3e75290bc8a8220b8081a14018
-SHA256 (evas-0.9.9.032.tar.gz) = 4b7dd45bc5851fef30361f95922e40796aa6b0b38611ba100dd5e439335ae9a1
-SIZE (evas-0.9.9.032.tar.gz) = 1728982
+MD5 (evas-20060926.tar.bz2) = 4cf57ca17141e52679ead8bb61e9772e
+SHA256 (evas-20060926.tar.bz2) = 029cd028b6925c4b6b99bc79247dc1fb73bd24e7747761f0126f7eb041dfe6e5
+SIZE (evas-20060926.tar.bz2) = 4343022
diff --git a/graphics/evas/files/patch-src_bin_evas_directfb_window.c b/graphics/evas/files/patch-src_bin_evas_directfb_window.c
new file mode 100644
index 000000000000..b3c9e11854f0
--- /dev/null
+++ b/graphics/evas/files/patch-src_bin_evas_directfb_window.c
@@ -0,0 +1,11 @@
+--- 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 4a103b171268..8e95e353e86d 100644
--- a/graphics/evas/pkg-plist
+++ b/graphics/evas/pkg-plist
@@ -1,67 +1,79 @@
 bin/evas-config
-bin/evas_buffer_test
+%%BUFFER%%bin/evas_buffer_test
+%%DIRECTFB%%bin/evas_directfb_test
+%%DIRECTFB%%bin/evas_directfb_window
 %%WITH_GL%%bin/evas_gl_x11_test
-bin/evas_software_x11_perf_load
-bin/evas_software_x11_perf_test
-bin/evas_software_x11_test
-bin/evas_xrender_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
-include/Evas_Engine_Buffer.h
+%%BUFFER%%include/Evas_Engine_Buffer.h
+%%DIRECTFB%%include/Evas_Engine_DirectFB.h
 %%WITH_GL%%include/Evas_Engine_GL_X11.h
-include/Evas_Engine_Software_X11.h
-include/Evas_Engine_XRender_X11.h
+%%SOFTX11%%include/Evas_Engine_Software_X11.h
+%%XRENDER%%include/Evas_Engine_XRender_X11.h
+%%BUFFER%%lib/evas/modules/engines/buffer/%%E17_ARCH%%/module.a
+%%BUFFER%%lib/evas/modules/engines/buffer/%%E17_ARCH%%/module.la
+%%BUFFER%%lib/evas/modules/engines/buffer/%%E17_ARCH%%/module.so
+%%DIRECTFB%%lib/evas/modules/engines/directfb/%%E17_ARCH%%/module.a
+%%DIRECTFB%%lib/evas/modules/engines/directfb/%%E17_ARCH%%/module.la
+%%DIRECTFB%%lib/evas/modules/engines/directfb/%%E17_ARCH%%/module.so
+%%WITH_GL%%lib/evas/modules/engines/gl_x11/%%E17_ARCH%%/module.a
+%%WITH_GL%%lib/evas/modules/engines/gl_x11/%%E17_ARCH%%/module.la
+%%WITH_GL%%lib/evas/modules/engines/gl_x11/%%E17_ARCH%%/module.so
+lib/evas/modules/engines/software_generic/%%E17_ARCH%%/module.a
+lib/evas/modules/engines/software_generic/%%E17_ARCH%%/module.la
+lib/evas/modules/engines/software_generic/%%E17_ARCH%%/module.so
+%%SOFTX11%%lib/evas/modules/engines/software_x11/%%E17_ARCH%%/module.a
+%%SOFTX11%%lib/evas/modules/engines/software_x11/%%E17_ARCH%%/module.la
+%%SOFTX11%%lib/evas/modules/engines/software_x11/%%E17_ARCH%%/module.so
+%%XRENDER%%lib/evas/modules/engines/xrender_x11/%%E17_ARCH%%/module.a
+%%XRENDER%%lib/evas/modules/engines/xrender_x11/%%E17_ARCH%%/module.la
+%%XRENDER%%lib/evas/modules/engines/xrender_x11/%%E17_ARCH%%/module.so
+%%EDB%%lib/evas/modules/loaders/edb/%%E17_ARCH%%/module.a
+%%EDB%%lib/evas/modules/loaders/edb/%%E17_ARCH%%/module.la
+%%EDB%%lib/evas/modules/loaders/edb/%%E17_ARCH%%/module.so
+%%EET%%lib/evas/modules/loaders/eet/%%E17_ARCH%%/module.a
+%%EET%%lib/evas/modules/loaders/eet/%%E17_ARCH%%/module.la
+%%EET%%lib/evas/modules/loaders/eet/%%E17_ARCH%%/module.so
+%%GIF%%lib/evas/modules/loaders/gif/%%E17_ARCH%%/module.a
+%%GIF%%lib/evas/modules/loaders/gif/%%E17_ARCH%%/module.la
+%%GIF%%lib/evas/modules/loaders/gif/%%E17_ARCH%%/module.so
+%%JPEG%%lib/evas/modules/loaders/jpeg/%%E17_ARCH%%/module.a
+%%JPEG%%lib/evas/modules/loaders/jpeg/%%E17_ARCH%%/module.la
+%%JPEG%%lib/evas/modules/loaders/jpeg/%%E17_ARCH%%/module.so
+%%PNG%%lib/evas/modules/loaders/png/%%E17_ARCH%%/module.a
+%%PNG%%lib/evas/modules/loaders/png/%%E17_ARCH%%/module.la
+%%PNG%%lib/evas/modules/loaders/png/%%E17_ARCH%%/module.so
+%%SVG%%lib/evas/modules/loaders/svg/%%E17_ARCH%%/module.a
+%%SVG%%lib/evas/modules/loaders/svg/%%E17_ARCH%%/module.la
+%%SVG%%lib/evas/modules/loaders/svg/%%E17_ARCH%%/module.so
+%%TIFF%%lib/evas/modules/loaders/tiff/%%E17_ARCH%%/module.a
+%%TIFF%%lib/evas/modules/loaders/tiff/%%E17_ARCH%%/module.la
+%%TIFF%%lib/evas/modules/loaders/tiff/%%E17_ARCH%%/module.so
+%%XPM%%lib/evas/modules/loaders/xpm/%%E17_ARCH%%/module.a
+%%XPM%%lib/evas/modules/loaders/xpm/%%E17_ARCH%%/module.la
+%%XPM%%lib/evas/modules/loaders/xpm/%%E17_ARCH%%/module.so
+%%EDB%%lib/evas/modules/savers/edb/%%E17_ARCH%%/module.a
+%%EDB%%lib/evas/modules/savers/edb/%%E17_ARCH%%/module.la
+%%EDB%%lib/evas/modules/savers/edb/%%E17_ARCH%%/module.so
+%%EET%%lib/evas/modules/savers/eet/%%E17_ARCH%%/module.a
+%%EET%%lib/evas/modules/savers/eet/%%E17_ARCH%%/module.la
+%%EET%%lib/evas/modules/savers/eet/%%E17_ARCH%%/module.so
+%%JPEG%%lib/evas/modules/savers/jpeg/%%E17_ARCH%%/module.a
+%%JPEG%%lib/evas/modules/savers/jpeg/%%E17_ARCH%%/module.la
+%%JPEG%%lib/evas/modules/savers/jpeg/%%E17_ARCH%%/module.so
+%%PNG%%lib/evas/modules/savers/png/%%E17_ARCH%%/module.a
+%%PNG%%lib/evas/modules/savers/png/%%E17_ARCH%%/module.la
+%%PNG%%lib/evas/modules/savers/png/%%E17_ARCH%%/module.so
+%%TIFF%%lib/evas/modules/savers/tiff/%%E17_ARCH%%/module.a
+%%TIFF%%lib/evas/modules/savers/tiff/%%E17_ARCH%%/module.la
+%%TIFF%%lib/evas/modules/savers/tiff/%%E17_ARCH%%/module.so
 lib/libevas.a
 lib/libevas.la
 lib/libevas.so
 lib/libevas.so.1
-lib/evas/modules/engines/buffer/%%MODULE_ARCH%%/module.a
-lib/evas/modules/engines/buffer/%%MODULE_ARCH%%/module.la
-lib/evas/modules/engines/buffer/%%MODULE_ARCH%%/module.so
-%%WITH_GL%%lib/evas/modules/engines/gl_x11/%%MODULE_ARCH%%/module.a
-%%WITH_GL%%lib/evas/modules/engines/gl_x11/%%MODULE_ARCH%%/module.la
-%%WITH_GL%%lib/evas/modules/engines/gl_x11/%%MODULE_ARCH%%/module.so
-lib/evas/modules/engines/software_generic/%%MODULE_ARCH%%/module.a
-lib/evas/modules/engines/software_generic/%%MODULE_ARCH%%/module.la
-lib/evas/modules/engines/software_generic/%%MODULE_ARCH%%/module.so
-lib/evas/modules/engines/software_x11/%%MODULE_ARCH%%/module.a
-lib/evas/modules/engines/software_x11/%%MODULE_ARCH%%/module.la
-lib/evas/modules/engines/software_x11/%%MODULE_ARCH%%/module.so
-lib/evas/modules/engines/xrender_x11/%%MODULE_ARCH%%/module.a
-lib/evas/modules/engines/xrender_x11/%%MODULE_ARCH%%/module.la
-lib/evas/modules/engines/xrender_x11/%%MODULE_ARCH%%/module.so
-lib/evas/modules/loaders/edb/%%MODULE_ARCH%%/module.a
-lib/evas/modules/loaders/edb/%%MODULE_ARCH%%/module.la
-lib/evas/modules/loaders/edb/%%MODULE_ARCH%%/module.so
-lib/evas/modules/loaders/eet/%%MODULE_ARCH%%/module.a
-lib/evas/modules/loaders/eet/%%MODULE_ARCH%%/module.la
-lib/evas/modules/loaders/eet/%%MODULE_ARCH%%/module.so
-lib/evas/modules/loaders/gif/%%MODULE_ARCH%%/module.a
-lib/evas/modules/loaders/gif/%%MODULE_ARCH%%/module.la
-lib/evas/modules/loaders/gif/%%MODULE_ARCH%%/module.so
-lib/evas/modules/loaders/jpeg/%%MODULE_ARCH%%/module.a
-lib/evas/modules/loaders/jpeg/%%MODULE_ARCH%%/module.la
-lib/evas/modules/loaders/jpeg/%%MODULE_ARCH%%/module.so
-lib/evas/modules/loaders/png/%%MODULE_ARCH%%/module.a
-lib/evas/modules/loaders/png/%%MODULE_ARCH%%/module.la
-lib/evas/modules/loaders/png/%%MODULE_ARCH%%/module.so
-lib/evas/modules/loaders/tiff/%%MODULE_ARCH%%/module.a
-lib/evas/modules/loaders/tiff/%%MODULE_ARCH%%/module.la
-lib/evas/modules/loaders/tiff/%%MODULE_ARCH%%/module.so
-lib/evas/modules/savers/edb/%%MODULE_ARCH%%/module.a
-lib/evas/modules/savers/edb/%%MODULE_ARCH%%/module.la
-lib/evas/modules/savers/edb/%%MODULE_ARCH%%/module.so
-lib/evas/modules/savers/eet/%%MODULE_ARCH%%/module.a
-lib/evas/modules/savers/eet/%%MODULE_ARCH%%/module.la
-lib/evas/modules/savers/eet/%%MODULE_ARCH%%/module.so
-lib/evas/modules/savers/jpeg/%%MODULE_ARCH%%/module.a
-lib/evas/modules/savers/jpeg/%%MODULE_ARCH%%/module.la
-lib/evas/modules/savers/jpeg/%%MODULE_ARCH%%/module.so
-lib/evas/modules/savers/png/%%MODULE_ARCH%%/module.a
-lib/evas/modules/savers/png/%%MODULE_ARCH%%/module.la
-lib/evas/modules/savers/png/%%MODULE_ARCH%%/module.so
-lib/evas/modules/savers/tiff/%%MODULE_ARCH%%/module.a
-lib/evas/modules/savers/tiff/%%MODULE_ARCH%%/module.la
-lib/evas/modules/savers/tiff/%%MODULE_ARCH%%/module.so
 libdata/pkgconfig/evas.pc
 %%DATADIR%%/Vera.ttf
 %%DATADIR%%/VeraBI.ttf
@@ -85,40 +97,46 @@ libdata/pkgconfig/evas.pc
 %%DATADIR%%/t2.png
 %%DATADIR%%/test_pattern.png
 @dirrm %%DATADIR%%
-@dirrm lib/evas/modules/savers/tiff/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/savers/tiff
-@dirrm lib/evas/modules/savers/png/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/savers/png
-@dirrm lib/evas/modules/savers/jpeg/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/savers/jpeg
-@dirrm lib/evas/modules/savers/eet/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/savers/eet
-@dirrm lib/evas/modules/savers/edb/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/savers/edb
+%%TIFF%%@dirrm lib/evas/modules/savers/tiff/%%E17_ARCH%%
+%%TIFF%%@dirrm lib/evas/modules/savers/tiff
+%%PNG%%@dirrm lib/evas/modules/savers/png/%%E17_ARCH%%
+%%PNG%%@dirrm lib/evas/modules/savers/png
+%%JPEG%%@dirrm lib/evas/modules/savers/jpeg/%%E17_ARCH%%
+%%JPEG%%@dirrm lib/evas/modules/savers/jpeg
+%%EET%%@dirrm lib/evas/modules/savers/eet/%%E17_ARCH%%
+%%EET%%@dirrm lib/evas/modules/savers/eet
+%%EDB%%@dirrm lib/evas/modules/savers/edb/%%E17_ARCH%%
+%%EDB%%@dirrm lib/evas/modules/savers/edb
 @dirrm lib/evas/modules/savers
-@dirrm lib/evas/modules/loaders/tiff/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/loaders/tiff
-@dirrm lib/evas/modules/loaders/png/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/loaders/png
-@dirrm lib/evas/modules/loaders/jpeg/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/loaders/jpeg
-@dirrm lib/evas/modules/loaders/gif/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/loaders/gif
-@dirrm lib/evas/modules/loaders/eet/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/loaders/eet
-@dirrm lib/evas/modules/loaders/edb/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/loaders/edb
+%%XPM%%@dirrm lib/evas/modules/loaders/xpm/%%E17_ARCH%%
+%%XPM%%@dirrm lib/evas/modules/loaders/xpm
+%%TIFF%%@dirrm lib/evas/modules/loaders/tiff/%%E17_ARCH%%
+%%TIFF%%@dirrm lib/evas/modules/loaders/tiff
+%%SVG%%@dirrm lib/evas/modules/loaders/svg/%%E17_ARCH%%
+%%SVG%%@dirrm lib/evas/modules/loaders/svg
+%%PNG%%@dirrm lib/evas/modules/loaders/png/%%E17_ARCH%%
+%%PNG%%@dirrm lib/evas/modules/loaders/png
+%%JPEG%%@dirrm lib/evas/modules/loaders/jpeg/%%E17_ARCH%%
+%%JPEG%%@dirrm lib/evas/modules/loaders/jpeg
+%%GIF%%@dirrm lib/evas/modules/loaders/gif/%%E17_ARCH%%
+%%GIF%%@dirrm lib/evas/modules/loaders/gif
+%%EET%%@dirrm lib/evas/modules/loaders/eet/%%E17_ARCH%%
+%%EET%%@dirrm lib/evas/modules/loaders/eet
+%%EDB%%@dirrm lib/evas/modules/loaders/edb/%%E17_ARCH%%
+%%EDB%%@dirrm lib/evas/modules/loaders/edb
 @dirrm lib/evas/modules/loaders
-@dirrm lib/evas/modules/engines/xrender_x11/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/engines/xrender_x11
-@dirrm lib/evas/modules/engines/software_x11/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/engines/software_x11
-@dirrm lib/evas/modules/engines/software_generic/%%MODULE_ARCH%%
+%%XRENDER%%@dirrm lib/evas/modules/engines/xrender_x11/%%E17_ARCH%%
+%%XRENDER%%@dirrm lib/evas/modules/engines/xrender_x11
+%%SOFTX11%%@dirrm lib/evas/modules/engines/software_x11/%%E17_ARCH%%
+%%SOFTX11%%@dirrm lib/evas/modules/engines/software_x11
+@dirrm lib/evas/modules/engines/software_generic/%%E17_ARCH%%
 @dirrm lib/evas/modules/engines/software_generic
-%%WITH_GL%%@dirrm lib/evas/modules/engines/gl_x11/%%MODULE_ARCH%%
+%%WITH_GL%%@dirrm lib/evas/modules/engines/gl_x11/%%E17_ARCH%%
 %%WITH_GL%%@dirrm lib/evas/modules/engines/gl_x11
-@dirrm lib/evas/modules/engines/buffer/%%MODULE_ARCH%%
-@dirrm lib/evas/modules/engines/buffer
+%%DIRECTFB%%@dirrm lib/evas/modules/engines/directfb/%%E17_ARCH%%
+%%DIRECTFB%%@dirrm lib/evas/modules/engines/directfb
+%%BUFFER%%@dirrm lib/evas/modules/engines/buffer/%%E17_ARCH%%
+%%BUFFER%%@dirrm lib/evas/modules/engines/buffer
 @dirrm lib/evas/modules/engines
 @dirrm lib/evas/modules
 @dirrm lib/evas