4 files changed, 18 insertions, 24 deletions

diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index d9819d6b688b..bf35bb2bd8ac 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -1,25 +1,19 @@
-# New ports collection makefile for:    librsvg2
-# Date created:         		8th May 2001
-# Whom:                 		Ade Lovett <ade@FreeBSD.org>
-#
+# Created by: Ade Lovett <ade@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/graphics/librsvg2/Makefile,v 1.142 2011/06/11 04:12:40 mezz Exp $
-#
+#   $MCom: ports/graphics/librsvg2/Makefile,v 1.147 2012/10/16 08:58:47 kwm Exp $
 
-PORTNAME=	librsvg2
-PORTVERSION=	2.34.1
-PORTREVISION=	1
+PORTNAME=	librsvg
+PORTVERSION=	2.36.4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	sources/librsvg/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	librsvg-${PORTVERSION}
+PKGNAMESUFFIX=	2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library for parsing and rendering SVG vector-graphic files
 
-BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
+BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection		
+LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2 \
 		croco-${CROCO_VERSION}.3:${PORTSDIR}/textproc/libcroco
 RUN_DEPENDS=	gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2
 
@@ -28,17 +22,19 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack gnomeprefix libgsf ltverhack gtk20
+USE_GNOME=	gnomehier gnomeprefix libgsf ltverhack gtk20
+USES=		pathfix
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-svgz \
 		--with-croco \
+		--disable-Bsymbolic \
 		--enable-gtk-theme
 CROCO_VERSION=	0.6
-MAN1=		rsvg.1
+MAN1=		rsvg-convert.1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|GTK3_REQUIRED=2.90.0|GTK3_REQUIRED=9.90.0|g' \
+	@${REINPLACE_CMD} -e 's|GTK3_REQUIRED=3.0.0|GTK3_REQUIRED=9.90.0|g' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index 6e92d7c5a717..d666c6d0fd24 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/librsvg-2.34.1.tar.xz) = 4f2ab987eed2943b5a0ce3dde1672d2bc87123bee66d885dd7307eb7ede756db
-SIZE (gnome2/librsvg-2.34.1.tar.xz) = 482380
+SHA256 (gnome2/librsvg-2.36.4.tar.xz) = 1021935204798f4f0ad3004a09b583668ea94a48593461b147fdcff68a18e6c2
+SIZE (gnome2/librsvg-2.36.4.tar.xz) = 513028
diff --git a/graphics/librsvg2/pkg-descr b/graphics/librsvg2/pkg-descr
index 9e39343a5ca0..f9105415ec57 100644
--- a/graphics/librsvg2/pkg-descr
+++ b/graphics/librsvg2/pkg-descr
@@ -4,4 +4,4 @@ includes functions that render anti-aliased fonts using freetype, including
 caching of glyphs.  It is used by Nautilus for drawing vector icons and
 anti-aliased text.
 
-WWW: http://librsvg.sourceforge.net/
+WWW: http://live.gnome.org/LibRsvg
diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist
index 747ea98b233a..dc1e5ea6a9d0 100644
--- a/graphics/librsvg2/pkg-plist
+++ b/graphics/librsvg2/pkg-plist
@@ -1,6 +1,4 @@
-bin/rsvg
 bin/rsvg-convert
-bin/rsvg-view
 include/librsvg-2.0/librsvg/librsvg-enum-types.h
 include/librsvg-2.0/librsvg/librsvg-features.h
 include/librsvg-2.0/librsvg/rsvg-cairo.h
@@ -8,6 +6,7 @@ include/librsvg-2.0/librsvg/rsvg.h
 lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-svg.a
 lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-svg.la
 lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-svg.so
+lib/girepository-1.0/Rsvg-2.0.typelib
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.a
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.la
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.so
@@ -21,6 +20,7 @@ share/doc/rsvg-2.0/annotation-glossary.html
 share/doc/rsvg-2.0/api-index-2-14.html
 share/doc/rsvg-2.0/api-index-2-22.html
 share/doc/rsvg-2.0/api-index-2-32.html
+share/doc/rsvg-2.0/api-index-2-36.html
 share/doc/rsvg-2.0/api-index-2-4.html
 share/doc/rsvg-2.0/api-index-2-8.html
 share/doc/rsvg-2.0/api-index-2-9.html
@@ -33,7 +33,6 @@ share/doc/rsvg-2.0/left.png
 share/doc/rsvg-2.0/licence.html
 share/doc/rsvg-2.0/object-tree.html
 share/doc/rsvg-2.0/right.png
-share/doc/rsvg-2.0/rsvg-2.0.devhelp
 share/doc/rsvg-2.0/rsvg-2.0.devhelp2
 share/doc/rsvg-2.0/rsvg-Using-RSVG-with-GIO.html
 share/doc/rsvg-2.0/rsvg-Using-RSVG-with-GdkPixbuf.html
@@ -42,7 +41,7 @@ share/doc/rsvg-2.0/rsvg-Version-check-and-feature-tests.html
 share/doc/rsvg-2.0/rsvg.html
 share/doc/rsvg-2.0/style.css
 share/doc/rsvg-2.0/up.png
-share/pixmaps/svg-viewer.svg
+share/gir-1.0/Rsvg-2.0.gir
 share/themes/bubble/gtk-2.0/blue.svg
 share/themes/bubble/gtk-2.0/green.svg
 share/themes/bubble/gtk-2.0/gtkrc
@@ -53,7 +52,6 @@ share/themes/bubble/gtk-2.0/red.svg
 @dirrm include/librsvg-2.0/librsvg
 @dirrm include/librsvg-2.0
 @dirrmtry share/themes/bubble/gtk-2.0
-@dirrmtry share/themes/bubble/gtk-3.0
 @dirrmtry share/themes/bubble
 @exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true
 @unexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true