5 files changed, 124 insertions, 41 deletions

diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 0d34a51e5127..708f7f4b6460 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -3,15 +3,14 @@
 # Whom:                 		Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/librsvg2/Makefile,v 1.131 2010/05/02 10:25:51 kwm Exp $
+#   $MCom: ports/graphics/librsvg2/Makefile,v 1.136 2010/11/13 12:59:46 kwm Exp $
 #
 
-PORTNAME=	librsvg2
-PORTVERSION=	2.26.3
-PORTREVISION=	1
+PORTNAME?=	librsvg2
+PORTVERSION=	2.32.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITE_SUBDIR=	sources/librsvg/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	librsvg-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -21,22 +20,48 @@ 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:22
-USE_GNOME=	gnomehack gnomeprefix libgsf gtk20 ltverhack
+USE_GNOME=	gnomehack gnomeprefix libgsf ltverhack
 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.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index b81219c6e67e..33e5b4a45477 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/librsvg-2.26.3.tar.bz2) = 8df68c2c02cdf2a96a92b43bf737bf9c
-SHA256 (gnome2/librsvg-2.26.3.tar.bz2) = c0005f9471b4bd3ba4873d165d8e481ee6b1d124dda4efc6bdc24b7da024b7e5
-SIZE (gnome2/librsvg-2.26.3.tar.bz2) = 511876
+SHA256 (gnome2/librsvg-2.32.1.tar.bz2) = 91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2f853ccf876d334
+SIZE (gnome2/librsvg-2.32.1.tar.bz2) = 517170
diff --git a/graphics/librsvg2/files/patch-Makefile.in b/graphics/librsvg2/files/patch-Makefile.in
new file mode 100644
index 000000000000..d2009b700b95
--- /dev/null
+++ b/graphics/librsvg2/files/patch-Makefile.in
@@ -0,0 +1,19 @@
+--- Makefile.in.orig	2010-07-07 13:03:21.000000000 +0200
++++ Makefile.in	2010-07-07 13:04:07.000000000 +0200
+@@ -155,7 +155,6 @@
+ am_rsvg_view_3_OBJECTS = rsvg_view_3-test-display.$(OBJEXT)
+ rsvg_view_3_OBJECTS = $(am_rsvg_view_3_OBJECTS)
+ rsvg_view_3_DEPENDENCIES =  \
+-	$(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+@@ -563,7 +562,7 @@
+ 
+ rsvg_view_3_LDFLAGS = 
+ rsvg_view_3_LDADD = \
+-	$(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \
++	-lrsvg-2 \
+ 	$(GTK3_LIBS)		\
+ 	$(LIBRSVG_LIBS)		\
+ 	$(LIBCROCO_LIBS)	\
diff --git a/graphics/librsvg2/files/patch-gtk-engines_Makefile.in b/graphics/librsvg2/files/patch-gtk-engines_Makefile.in
new file mode 100644
index 000000000000..b1f325203166
--- /dev/null
+++ b/graphics/librsvg2/files/patch-gtk-engines_Makefile.in
@@ -0,0 +1,20 @@
+--- 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)	\
diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist
index 52425f347f26..0992f99834ab 100644
--- a/graphics/librsvg2/pkg-plist
+++ b/graphics/librsvg2/pkg-plist
@@ -1,41 +1,61 @@
 bin/rsvg
 bin/rsvg-convert
 bin/rsvg-view
-include/librsvg-2/librsvg/librsvg-enum-types.h
-include/librsvg-2/librsvg/librsvg-features.h
-include/librsvg-2/librsvg/rsvg-cairo.h
-include/librsvg-2/librsvg/rsvg.h
+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
+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/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
-lib/gtk-2.0/%%GTK2_VERSION%%/loaders/svg_loader.a
-lib/gtk-2.0/%%GTK2_VERSION%%/loaders/svg_loader.la
-lib/gtk-2.0/%%GTK2_VERSION%%/loaders/svg_loader.so
 lib/librsvg-2.a
 lib/librsvg-2.la
 lib/librsvg-2.so
 lib/librsvg-2.so.2
 libdata/pkgconfig/librsvg-2.0.pc
-share/doc/rsvg/home.png
-share/doc/rsvg/index.html
-share/doc/rsvg/index.sgml
-share/doc/rsvg/ix01.html
-share/doc/rsvg/left.png
-share/doc/rsvg/pt02.html
-share/doc/rsvg/pt03.html
-share/doc/rsvg/pt04.html
-share/doc/rsvg/right.png
-share/doc/rsvg/rsvg-Cairo.html
-share/doc/rsvg/rsvg-Core-API.html
-share/doc/rsvg/rsvg-GdkPixbuf.html
-share/doc/rsvg/rsvg.devhelp
-share/doc/rsvg/rsvg.devhelp2
-share/doc/rsvg/rsvg.html
-share/doc/rsvg/style.css
-share/doc/rsvg/up.png
+share/doc/rsvg-2.0/RsvgHandle.html
+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-4.html
+share/doc/rsvg-2.0/api-index-2-8.html
+share/doc/rsvg-2.0/api-index-2-9.html
+share/doc/rsvg-2.0/api-index-deprecated.html
+share/doc/rsvg-2.0/api-index-full.html
+share/doc/rsvg-2.0/home.png
+share/doc/rsvg-2.0/index.html
+share/doc/rsvg-2.0/index.sgml
+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
+share/doc/rsvg-2.0/rsvg-Using-RSVG-with-cairo.html
+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
-@dirrm share/doc/rsvg
-@dirrm include/librsvg-2/librsvg
-@dirrm include/librsvg-2
-@exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true
-@unexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true
+share/themes/bubble/gtk-2.0/blue.svg
+share/themes/bubble/gtk-2.0/green.svg
+share/themes/bubble/gtk-2.0/gtkrc
+share/themes/bubble/gtk-2.0/orange.svg
+share/themes/bubble/gtk-2.0/purple.svg
+share/themes/bubble/gtk-2.0/red.svg
+@dirrm share/doc/rsvg-2.0
+@dirrm include/librsvg-2.0/librsvg
+@dirrm include/librsvg-2.0
+@dirrmtry lib/gtk-3.0/engines
+@dirrmtry lib/gtk-3.0
+@dirrmtry share/themes/bubble/gtk-2.0
+@dirrmtry share/themes/bubble/gtk-3.0
+@dirrmtry share/themes/bubble
+@comment @exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true
+@comment @unexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true