4 files changed, 18 insertions, 55 deletions

diff --git a/graphics/evas-loader-svg/Makefile b/graphics/evas-loader-svg/Makefile
index 9e68f39712b1..7bbcfc198fc1 100644
--- a/graphics/evas-loader-svg/Makefile
+++ b/graphics/evas-loader-svg/Makefile
@@ -6,48 +6,32 @@
 #
 
 PORTNAME=	loader-svg
-PORTVERSION=	0.9.9.042
-PORTREVISION=	5
-CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
-		http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION=	1.0.0.beta
+PORTREVISION=	0
+CATEGORIES=	graphics enlightenment
+MASTER_SITES=	http://download.enlightenment.org/releases/ \
+		http://files.roorback.net/e17/2010-10-03/base/
 PKGNAMEPREFIX=	evas-
-DISTNAME=	evas-${PORTVERSION}
+DISTNAME=	evas-${DISTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
-COMMENT=	A hardware accelerated canvas API (SVG engine)
+COMMENT=	A hardware accelerated canvas API (SVG loader)
 
 LIB_DEPENDS=	svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo \
 		freetype.9:${PORTSDIR}/print/freetype2
 
+LICENSE=	BSD
+DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget librsvg2
-USE_EFL=	evas
+USE_EFL=	evas librt_hack libtool_hack
 
 MAKEDIRS=	${WRKSRC}/src/modules/loaders/svg
 
-CONFIGURE_ARGS=	--disable-software-x11 \
-		--disable-software-16-x11 \
-		--disable-software-xcb \
-		--disable-directfb \
-		--disable-sdl \
-		--disable-buffer \
-		--disable-software-qtopia \
-		--disable-gl-x11 \
-		--disable-cairo-x11 \
-		--disable-xrender-x11 \
-		--disable-xrender-xcb \
-		--disable-glitz-x11 \
-		--disable-image-loader-gif \
-		--disable-image-loader-png \
-		--disable-image-loader-jpeg \
-		--disable-image-loader-eet \
-		--disable-image-loader-edb \
-		--disable-image-loader-tiff \
-		--disable-image-loader-xpm \
-		--enable-image-loader-svg
+.include "../evas-core/Makefile.inc"
+CONFIGURE_ARGS+=	--enable-image-loader-svg
 
 post-patch:
 	@${REINPLACE_CMD} -E \
@@ -56,9 +40,11 @@ post-patch:
 		${MAKEDIRS:S,$,/Makefile.in,}
 
 do-build:
-	@(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
+	@(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+	    ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
 
 do-install:
-	@(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
+	@(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+	    ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
 
 .include <bsd.port.mk>
diff --git a/graphics/evas-loader-svg/distinfo b/graphics/evas-loader-svg/distinfo
index 5e8e2bc542ac..252e7b0fa992 100644
--- a/graphics/evas-loader-svg/distinfo
+++ b/graphics/evas-loader-svg/distinfo
@@ -1,3 +1,2 @@
-MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
-SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
-SIZE (evas-0.9.9.042.tar.bz2) = 7373199
+SHA256 (e17/evas-1.0.0.beta.tar.bz2) = 7ff9a3015e5c5a0bee3c1a13b65358905fb6c81386bc22bf98bd7f73a893be1d
+SIZE (e17/evas-1.0.0.beta.tar.bz2) = 1054215
diff --git a/graphics/evas-loader-svg/files/patch-evas_image_load_png.c b/graphics/evas-loader-svg/files/patch-evas_image_load_png.c
deleted file mode 100644
index b3de3f645163..000000000000
--- a/graphics/evas-loader-svg/files/patch-evas_image_load_png.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/modules/loaders/png/evas_image_load_png.c.orig	2007-10-28 11:35:13.000000000 +0100
-+++ src/modules/loaders/png/evas_image_load_png.c	2010-04-01 07:26:03.000000000 +0200
-@@ -44,7 +44,7 @@
- 	fclose(f);
- 	return 0;
-      }
--   if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
-+   if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
-      {
- 	fclose(f);
- 	return 0;
-@@ -121,7 +121,7 @@
- 
-    /* if we havent read the header before, set the header data */
-    fread(buf, 1, PNG_BYTES_TO_CHECK, f);
--   if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
-+   if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
-      {
- 	fclose(f);
- 	return 0;
diff --git a/graphics/evas-loader-svg/pkg-plist b/graphics/evas-loader-svg/pkg-plist
index 1c02d558442a..f22ed3eb7b6f 100644
--- a/graphics/evas-loader-svg/pkg-plist
+++ b/graphics/evas-loader-svg/pkg-plist
@@ -1,5 +1,3 @@
-lib/evas/modules/loaders/svg/%%E17_ARCH%%/module.a
-lib/evas/modules/loaders/svg/%%E17_ARCH%%/module.la
 lib/evas/modules/loaders/svg/%%E17_ARCH%%/module.so
 @dirrm lib/evas/modules/loaders/svg/%%E17_ARCH%%
 @dirrm lib/evas/modules/loaders/svg