3 files changed, 8 insertions, 52 deletions

diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 4eb85f535117..b3ff8529bd20 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 		Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/librsvg2/Makefile,v 1.136 2010/11/13 12:59:46 kwm Exp $
+#   $MCom: ports/graphics/librsvg2/Makefile,v 1.142 2011/06/11 04:12:40 mezz Exp $
 #
 
-PORTNAME?=	librsvg2
-PORTVERSION=	2.32.1
+PORTNAME=	librsvg2
+PORTVERSION=	2.34.0
 PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
@@ -21,48 +21,24 @@ COMMENT=	Library for parsing and rendering SVG vector-graphic files
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		croco-${CROCO_VERSION}.3:${PORTSDIR}/textproc/libcroco
+RUN_DEPENDS=	gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack gnomeprefix libgsf ltverhack
+USE_GNOME=	gnomehack gnomeprefix libgsf ltverhack gtk20
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-svgz \
 		--with-croco \
 		--enable-gtk-theme
 CROCO_VERSION=	0.6
-
-.if defined(SLAVEPORT)
-USE_GNOME+=	librsvg2 gtk30
-RUN_DEPENDS=	gtk-engines3>=2.90.3.1:${PORTSDIR}/x11-themes/gtk-engines3
-.else
-USE_GNOME+=	gtk20
-RUN_DEPENDS=	gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2
 MAN1=		rsvg.1
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if defined(SLAVEPORT)
-post-patch:
-	@${REINPLACE_CMD} -e 's|GTK2_REQUIRED=2.16.0|GTK2_REQUIRED=9.16.0|g' \
-		${WRKSRC}/configure
-
-do-build:
-	@cd ${WRKSRC} && gmake rsvg-view-3
-	@cd ${WRKSRC}/gtk-engine && gmake 
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rsvg-view-3 ${PREFIX}/bin
-	@cd ${WRKSRC}/gtk-engine && gmake install
-	
-.else
 post-patch:
 	@${REINPLACE_CMD} -e 's|GTK3_REQUIRED=2.90.0|GTK3_REQUIRED=9.90.0|g' \
 		${WRKSRC}/configure
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index 33e5b4a45477..c1ce498830ef 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/librsvg-2.32.1.tar.bz2) = 91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2f853ccf876d334
-SIZE (gnome2/librsvg-2.32.1.tar.bz2) = 517170
+SHA256 (gnome2/librsvg-2.34.0.tar.bz2) = 9d2111e086dcffd12466f48ab1ca088654011684c499a4cc4676da918290f3cd
+SIZE (gnome2/librsvg-2.34.0.tar.bz2) = 516994
diff --git a/graphics/librsvg2/files/patch-gtk-engines_Makefile.in b/graphics/librsvg2/files/patch-gtk-engines_Makefile.in
deleted file mode 100644
index b1f325203166..000000000000
--- a/graphics/librsvg2/files/patch-gtk-engines_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- gtk-engine/Makefile.in.orig	2010-07-07 12:59:02.000000000 +0200
-+++ gtk-engine/Makefile.in	2010-07-07 13:00:27.000000000 +0200
-@@ -72,7 +72,7 @@
- 	"$(DESTDIR)$(gtk3_enginedir)"
- LTLIBRARIES = $(gtk2_engine_LTLIBRARIES) $(gtk3_engine_LTLIBRARIES)
- am__DEPENDENCIES_1 =
--@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@libsvg_3_la_DEPENDENCIES = $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \
-+@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@libsvg_3_la_DEPENDENCIES =  \
- @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@	$(am__DEPENDENCIES_1) \
- @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@	$(am__DEPENDENCIES_1) \
- @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@	$(am__DEPENDENCIES_1) \
-@@ -405,7 +405,7 @@
- @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@	-module $(AM_LDFLAGS) \
- @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@	$(am__append_3)
- @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@libsvg_3_la_LIBADD = \
--@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@	$(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \
-+@ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@	-lrsvg-2 \
- @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@	$(GTK3_LIBS) 		\
- @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@	$(LIBRSVG_LIBS) 	\
- @ENABLE_GTK_ENGINE_TRUE@@HAVE_GTK_3_TRUE@	$(LIBCROCO_LIBS)	\