Update to 2.40.6:

Version 2.40.6
- MinGW build fixes
- Fix path data number parsing
- Fix build with newer libtool

4 files changed, 10 insertions, 37 deletions

diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index d21b19df69a..4f2ee0e12a6 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.79 2014/05/05 00:47:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.80 2015/01/16 09:39:12 wiz Exp $
 
-DISTNAME=	librsvg-2.40.1
-PKGREVISION=	1
+DISTNAME=	librsvg-2.40.6
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/librsvg/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/graphics/librsvg/PLIST b/graphics/librsvg/PLIST
index 120ddac23ea..b34b1e67d5e 100644
--- a/graphics/librsvg/PLIST
+++ b/graphics/librsvg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2012/04/30 14:17:12 drochner Exp $
+@comment $NetBSD: PLIST,v 1.10 2015/01/16 09:39:12 wiz Exp $
 bin/rsvg-convert
 include/librsvg-2.0/librsvg/librsvg-enum-types.h
 include/librsvg-2.0/librsvg/librsvg-features.h
@@ -22,9 +22,11 @@ share/gtk-doc/html/rsvg-2.0/api-index-full.html
 share/gtk-doc/html/rsvg-2.0/home.png
 share/gtk-doc/html/rsvg-2.0/index.html
 share/gtk-doc/html/rsvg-2.0/index.sgml
+share/gtk-doc/html/rsvg-2.0/left-insensitive.png
 share/gtk-doc/html/rsvg-2.0/left.png
 share/gtk-doc/html/rsvg-2.0/licence.html
 share/gtk-doc/html/rsvg-2.0/object-tree.html
+share/gtk-doc/html/rsvg-2.0/right-insensitive.png
 share/gtk-doc/html/rsvg-2.0/right.png
 share/gtk-doc/html/rsvg-2.0/rsvg-2.0.devhelp2
 share/gtk-doc/html/rsvg-2.0/rsvg-Using-RSVG-with-GIO.html
@@ -33,4 +35,5 @@ share/gtk-doc/html/rsvg-2.0/rsvg-Using-RSVG-with-cairo.html
 share/gtk-doc/html/rsvg-2.0/rsvg-Version-check-and-feature-tests.html
 share/gtk-doc/html/rsvg-2.0/rsvg.html
 share/gtk-doc/html/rsvg-2.0/style.css
+share/gtk-doc/html/rsvg-2.0/up-insensitive.png
 share/gtk-doc/html/rsvg-2.0/up.png
diff --git a/graphics/librsvg/distinfo b/graphics/librsvg/distinfo
index dd0f5994d16..f276d65c32b 100644
--- a/graphics/librsvg/distinfo
+++ b/graphics/librsvg/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.29 2013/12/10 00:25:18 prlw1 Exp $
+$NetBSD: distinfo,v 1.30 2015/01/16 09:39:12 wiz Exp $
 
-SHA1 (librsvg-2.40.1.tar.xz) = abbfed10433b26e88f18fe62a9b84d48fc00b9e1
-RMD160 (librsvg-2.40.1.tar.xz) = 6e0212214c7acc6d570d1dbb196bde3678e84525
-Size (librsvg-2.40.1.tar.xz) = 505664 bytes
+SHA1 (librsvg-2.40.6.tar.xz) = 22854596f8ab2fe8f549b0f35ca468387c785cf9
+RMD160 (librsvg-2.40.6.tar.xz) = cb3be08a7a3a4782123536d3d2391a52f3ed1633
+Size (librsvg-2.40.6.tar.xz) = 512500 bytes
 SHA1 (patch-ab) = 684e885aec9af2cfeff9e9708e3be9e158bba3f9
-SHA1 (patch-rsvg-base.c) = ab9c0651dac03bc1e3fcd93242bf42a73616084f
diff --git a/graphics/librsvg/patches/patch-rsvg-base.c b/graphics/librsvg/patches/patch-rsvg-base.c
deleted file mode 100644
index 85baae02928..00000000000
--- a/graphics/librsvg/patches/patch-rsvg-base.c
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-rsvg-base.c,v 1.1 2013/12/10 00:25:18 prlw1 Exp $
-
-Allow rsvg to built on other systems than just Linux.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=710163
-Finally committed as 02cb1983
---- rsvg-base.c.orig	2013-05-11 09:19:07.000000000 +0000
-+++ rsvg-base.c
-@@ -2190,8 +2190,7 @@ _rsvg_handle_allow_load (RsvgHandle *han
-     dir = g_file_get_path (base);
-     g_object_unref (base);
- 
--    /* FIXME portability */
--    cdir = canonicalize_file_name (dir);
-+    cdir = realpath (dir, NULL);
-     g_free (dir);
-     if (cdir == NULL)
-         goto deny;
-@@ -2200,8 +2199,7 @@ _rsvg_handle_allow_load (RsvgHandle *han
-     if (path == NULL)
-         goto deny;
- 
--    /* FIXME portability */
--    cpath = canonicalize_file_name (path);
-+    cpath = realpath (path, NULL);
-     g_free (path);
- 
-     if (cpath == NULL)