8 files changed, 58 insertions, 52 deletions

diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 0310715b0204..a0fe5f7fe535 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	librsvg2
-PORTVERSION=	2.4.0
-PORTREVISION=	2
+PORTVERSION=	2.6.4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.4
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.6
 DISTNAME=	librsvg-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -20,21 +19,23 @@ COMMENT=	Library for parsing and rendering SVG vector-graphic files
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		popt.0:${PORTSDIR}/devel/popt \
-		gsf-1.9:${PORTSDIR}/devel/libgsf
-RUN_DEPENDS=	${X11BASE}/lib/gtk-2.0/2.2.0/engines/libmetal.so:${PORTSDIR}/x11-toolkits/gtk-engines2
+		gsf-1.9:${PORTSDIR}/devel/libgsf \
+		croco.2:${PORTSDIR}/textproc/libcroco
+RUN_DEPENDS=	${X11BASE}/lib/gtk-2.0/2.4.0/engines/libmetal.so:${PORTSDIR}/x11-toolkits/gtk-engines2
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=13
-USE_GNOME=	gnomehack gtk20 libartlgpl2 libxml2
+USE_GNOME=	gnomehack lthack gtk20 libartlgpl2 libxml2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-svgz \
 		--disable-gtk-doc \
-		--without-gimp
-PLIST_SUB=	GTK_VERSION="2.2.0"
+		--without-gimp \
+		--with-croco
+PLIST_SUB=	GTK_VERSION="2.4.0"
 
 MAN1=		rsvg.1
 
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index d4484f25efab..342d69174741 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/librsvg-2.4.0.tar.bz2) = 1a073864e5f6e9793cf23e38dc723803
-SIZE (gnome2/librsvg-2.4.0.tar.bz2) = 233627
+MD5 (gnome2/librsvg-2.6.4.tar.bz2) = 976b1e2d21ef094698f6eebb7ef9fe94
+SIZE (gnome2/librsvg-2.6.4.tar.bz2) = 221910
diff --git a/graphics/librsvg2/files/patch-configure b/graphics/librsvg2/files/patch-configure
deleted file mode 100644
index 444b8335e4d7..000000000000
--- a/graphics/librsvg2/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- configure	2002/04/25 19:16:30	1.1
-+++ configure	2002/04/25 19:16:42
-@@ -5397,6 +5397,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/graphics/librsvg2/files/patch-gimp-plugin_Makefile.in b/graphics/librsvg2/files/patch-gimp-plugin_Makefile.in
deleted file mode 100644
index b8d240267194..000000000000
--- a/graphics/librsvg2/files/patch-gimp-plugin_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gimp-plugin/Makefile.in.orig	Sun Mar 23 19:17:25 2003
-+++ gimp-plugin/Makefile.in	Sun Mar 23 19:17:41 2003
-@@ -103,7 +103,7 @@
- VERSION = @VERSION@
- VERSION_INFO = @VERSION_INFO@
- 
--gimpdir = $(libdir)/gimp/1.3/plug-ins
-+gimpdir = $(libexecdir)/gimp/1.3/plug-ins
- 
- INCLUDES = \
- 	$(LIBRSVG_CFLAGS) \
diff --git a/graphics/librsvg2/files/patch-rsvg-paint-server.c b/graphics/librsvg2/files/patch-rsvg-paint-server.c
new file mode 100644
index 000000000000..72f7b8d1fa0b
--- /dev/null
+++ b/graphics/librsvg2/files/patch-rsvg-paint-server.c
@@ -0,0 +1,22 @@
+--- rsvg-paint-server.c.orig	Tue Mar 30 13:48:53 2004
++++ rsvg-paint-server.c	Tue Mar 30 13:49:10 2004
+@@ -150,6 +150,9 @@
+ 	double dx, dy, scale;
+ 	double affine[6];
+ 	int i;
++	float xchange, ychange, pointlen,unitlen;
++	float nx2, ny2;
++	float x0, y0;
+ 
+ 	agl = z->agl;
+ 	if (agl == NULL)
+@@ -180,9 +183,6 @@
+ 
+ 	art_affine_multiply(affine, rlg->affine, affine);
+ 
+-	float xchange, ychange, pointlen,unitlen;
+-	float nx2, ny2;
+-	float x0, y0;
+ 
+ 	xchange = rlg->x2 - rlg->x1;
+ 	ychange = rlg->y2 - rlg->y1;
diff --git a/graphics/librsvg2/files/patch-rsvg-styles.c b/graphics/librsvg2/files/patch-rsvg-styles.c
new file mode 100644
index 000000000000..6e7eee133489
--- /dev/null
+++ b/graphics/librsvg2/files/patch-rsvg-styles.c
@@ -0,0 +1,21 @@
+--- rsvg-styles.c.orig	Tue Mar 23 23:04:27 2004
++++ rsvg-styles.c	Tue Mar 23 23:04:36 2004
+@@ -553,16 +553,16 @@
+ 	if (status != CR_OK)
+         {
+ 			g_warning ("Error setting CSS SAC handler\n");
+-			cr_parser_destroy (parser);			
+ 			cr_doc_handler_destroy (css_handler);
++			cr_parser_destroy (parser);			
+ 			return;
+         }        
+ 	
+ 	status = cr_parser_set_use_core_grammar (parser, FALSE);
+ 	status = cr_parser_parse (parser);
+ 	
+-	cr_parser_destroy (parser);
+ 	cr_doc_handler_destroy (css_handler);
++	cr_parser_destroy (parser);
+ }
+ 
+ #else /* !HAVE_LIBCROCO */
diff --git a/graphics/librsvg2/pkg-descr b/graphics/librsvg2/pkg-descr
index b3f050b65a28..3f521eda245a 100644
--- a/graphics/librsvg2/pkg-descr
+++ b/graphics/librsvg2/pkg-descr
@@ -1,7 +1,7 @@
 The librsvg library is a lightweight library for parsing and rendering
-vector-graphic files in SVG format (like the ones made by sodipodi). It also
+vector-graphic files in SVG format (like the ones made by sodipodi).  It also
 includes functions that render anti-aliased fonts using freetype, including
-caching of glyphs. It's used by Nautilus for drawing vector icons and
-anti-aliased type.
+caching of glyphs.  It is used by Nautilus for drawing vector icons and
+anti-aliased text.
 
 WWW: http://www.gnome.org/
diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist
index 094cff6f4b45..906759e2e185 100644
--- a/graphics/librsvg2/pkg-plist
+++ b/graphics/librsvg2/pkg-plist
@@ -6,22 +6,8 @@ lib/gtk-2.0/%%GTK_VERSION%%/engines/libsvg.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/svg_loader.so
 lib/librsvg-2.a
 lib/librsvg-2.so
-lib/librsvg-2.so.6
+lib/librsvg-2.so.8
 libdata/pkgconfig/librsvg-2.0.pc
-share/doc/librsvg/html/home.png
-share/doc/librsvg/html/i1013.html
-share/doc/librsvg/html/index.html
-share/doc/librsvg/html/index.sgml
-share/doc/librsvg/html/left.png
-share/doc/librsvg/html/r22.html
-share/doc/librsvg/html/r376.html
-share/doc/librsvg/html/r413.html
-share/doc/librsvg/html/right.png
-share/doc/librsvg/html/rsvg-convenience-functions.html
-share/doc/librsvg/html/rsvg-core-api.html
-share/doc/librsvg/html/rsvg-creating-a-svgz-reader.html
-share/doc/librsvg/html/rsvg.html
-share/doc/librsvg/html/up.png
 @dirrm share/doc/librsvg/html
 @dirrm share/doc/librsvg
 @dirrm include/librsvg-2/librsvg