Update to 2.2.5:

- Gimp Import/Load plugin
- Bugfixes
- Few bugfixes
- All sorts of build and installation fixes
- "Bugfix" for a regression in GTK+'s pixbuf-io loader scheme
- Handle SVGZ files (Gzipped SVG)
- Handle objectBoundingBox coordinates on gradients
- API extensions
- Various bugfixes and crash fixes
- Better CSS style handling
- Fix for a crasher exploited by Sodipodi. Improved gradient handling
- RSVG allows you to specify the JPEG quality
- Handles Kontour's conicalGradients to some extent
- Better CSS style handling
- Works in "international" locales (non-C locales) in a threadsafe manner
- Handle rounded rects
- Add manpage
- Handle "ex" units better
- Missed files in tarball added.
- Fixed memory leak
- Better handling of display and visibility styles.
- Better font handling (stretch, style, variant, weight supported, inherited)
- Fixed crash with non-utf8 characters.
- Better ellipse rendering
- New functions to set rendering DPI
- Better handling of SVGs colors, gradients and images
- support dashes
- Includes a new gdk-pixbuf svg loader
- Includes a new gimp svg loader
- Now installs a binary that can rasterize svgs.
- New co-maintainer Dom Lachowicz
- Added new svg based gtk+ engine
- Handles SVGs a lot better. Especially with regards to units.

8 files changed, 114 insertions, 14 deletions

diff --git a/graphics/librsvg2/MESSAGE b/graphics/librsvg2/MESSAGE
new file mode 100644
index 00000000000..24fc2fb634c
--- /dev/null
+++ b/graphics/librsvg2/MESSAGE
@@ -0,0 +1,13 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2003/06/27 23:02:51 jmmv Exp $
+
+This package has installed new gdk-pixbuf loaders.  In order to get them
+working, you should update gdk-pixbuf's configuration file.  This can be
+usually done issuing the following command:
+
+    ${PREFIX}/bin/gdk-pixbuf-query-loaders > \
+	${PKG_SYSCONFDIR.gtk2}/gdk-pixbuf.loaders
+
+Note that this will discard your personal changes to that file.
+
+===========================================================================
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 75430d4fc42..52929022ad5 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2003/06/07 14:14:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/06/27 23:02:51 jmmv Exp $
 #
 
-DISTNAME=		librsvg-2.0.1
+DISTNAME=		librsvg-2.2.5
 PKGNAME=		${DISTNAME:S/-/2-/}
-PKGREVISION=		2
 CATEGORIES=		graphics gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/librsvg/2.0/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/librsvg/2.2/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tech-pkg@netbsd.org
@@ -19,11 +18,25 @@ GNU_CONFIGURE=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/librsvg-2.0.pc.in
 
+CONFIGURE_ARGS+=	--disable-gtk-doc
+CONFIGURE_ARGS+=	--with-gimp=no
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html/librsvg2
+
+.if !defined(PKG_SYSCONFDIR.gtk2) || empty(PKG_SYSCONFDIR.gtk2)
+MESSAGE_SUBST+=		PKG_SYSCONFDIR.gtk2="${PKG_SYSCONFBASE}/gtk-2.0"
+.else
+MESSAGE_SUBST+=		PKG_SYSCONFDIR.gtk2="${PKG_SYSCONFDIR.gtk2}"
+.endif
+
+BUILDLINK_DEPENDS.gtk2=	gtk2+>=2.2.2nb1
+
 .include "../../graphics/freetype2/buildlink2.mk"
 .include "../../graphics/libart2/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
+.include "../../devel/libgsf/buildlink2.mk"
 .include "../../devel/pango/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../devel/popt/buildlink2.mk"
 .include "../../x11/gtk2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/librsvg2/PLIST b/graphics/librsvg2/PLIST
index 383e9532f4f..c6139a5c382 100644
--- a/graphics/librsvg2/PLIST
+++ b/graphics/librsvg2/PLIST
@@ -1,11 +1,38 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/10/16 10:29:01 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/06/27 23:02:51 jmmv Exp $
+bin/rsvg
 include/librsvg-2/librsvg/librsvg-features.h
+include/librsvg-2/librsvg/rsvg-gz.h
 include/librsvg-2/librsvg/rsvg.h
+lib/gtk-2.0/2.2.0/engines/libsvg.a
+lib/gtk-2.0/2.2.0/engines/libsvg.la
+lib/gtk-2.0/2.2.0/engines/libsvg.so
+lib/gtk-2.0/2.2.0/loaders/svg_loader.a
+lib/gtk-2.0/2.2.0/loaders/svg_loader.la
+lib/gtk-2.0/2.2.0/loaders/svg_loader.so
 lib/librsvg-2.a
 lib/librsvg-2.la
 lib/librsvg-2.so
-lib/librsvg-2.so.2
-lib/librsvg-2.so.2.1
+lib/librsvg-2.so.4
+lib/librsvg-2.so.4.5
 lib/pkgconfig/librsvg-2.0.pc
+man/man1/rsvg.1
+share/doc/html/librsvg2/home.png
+share/doc/html/librsvg2/i909.html
+share/doc/html/librsvg2/index.html
+share/doc/html/librsvg2/index.sgml
+share/doc/html/librsvg2/left.png
+share/doc/html/librsvg2/r22.html
+share/doc/html/librsvg2/r320.html
+share/doc/html/librsvg2/r354.html
+share/doc/html/librsvg2/right.png
+share/doc/html/librsvg2/rsvg-convenience-functions.html
+share/doc/html/librsvg2/rsvg-core-api.html
+share/doc/html/librsvg2/rsvg-creating-a-svgz-reader.html
+share/doc/html/librsvg2/rsvg.html
+share/doc/html/librsvg2/up.png
+@dirrm share/doc/html/librsvg2
+@comment in gtk2: @dirrm lib/gtk-2.0/2.2.0/loaders
+@comment in gtk2: @dirrm lib/gtk-2.0/2.2.0/engines
+@comment in gtk2: @dirrm lib/gtk-2.0/2.2.0
 @dirrm include/librsvg-2/librsvg
 @dirrm include/librsvg-2
diff --git a/graphics/librsvg2/buildlink2.mk b/graphics/librsvg2/buildlink2.mk
index 1f0e41df6a9..dcef2ac0d4c 100644
--- a/graphics/librsvg2/buildlink2.mk
+++ b/graphics/librsvg2/buildlink2.mk
@@ -1,20 +1,22 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:55:25 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/06/27 23:02:51 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use librsvg2.
 #
-# This file was created automatically using createbuildlink 2.2.
+# This file was created automatically using createbuildlink 2.6.
 #
 
 .if !defined(LIBRSVG2_BUILDLINK2_MK)
 LIBRSVG2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			librsvg2
-BUILDLINK_DEPENDS.librsvg2?=		librsvg2>=2.0.1nb2
+BUILDLINK_DEPENDS.librsvg2?=		librsvg2>=2.2.5
 BUILDLINK_PKGSRCDIR.librsvg2?=		../../graphics/librsvg2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.librsvg2=librsvg2
 BUILDLINK_PREFIX.librsvg2_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.librsvg2+=	include/librsvg-2/librsvg/*.h
+BUILDLINK_FILES.librsvg2+=	include/librsvg-2/librsvg/*
+BUILDLINK_FILES.librsvg2+=	lib/gtk-2.0/2.2.0/engines/libsvg.*
+BUILDLINK_FILES.librsvg2+=	lib/gtk-2.0/2.2.0/loaders/svg_loader.*
 BUILDLINK_FILES.librsvg2+=	lib/librsvg-2.*
 BUILDLINK_FILES.librsvg2+=	lib/pkgconfig/librsvg-2.0.pc
 
@@ -22,6 +24,7 @@ BUILDLINK_FILES.librsvg2+=	lib/pkgconfig/librsvg-2.0.pc
 .include "../../graphics/libart2/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
+.include "../../devel/libgsf/buildlink2.mk"
 .include "../../devel/pango/buildlink2.mk"
 .include "../../devel/popt/buildlink2.mk"
 .include "../../x11/gtk2/buildlink2.mk"
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index b0bf37b4440..de882b71071 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,4 +1,7 @@
-$NetBSD: distinfo,v 1.2 2002/10/30 03:09:34 rh Exp $
+$NetBSD: distinfo,v 1.3 2003/06/27 23:02:51 jmmv Exp $
 
-SHA1 (librsvg-2.0.1.tar.bz2) = 9c38ca158baaf492fdf20612d1d32dc38aa5c393
-Size (librsvg-2.0.1.tar.bz2) = 155093 bytes
+SHA1 (librsvg-2.2.5.tar.bz2) = 84fbaf6bc21d29ce2c70d5474df59574994374f6
+Size (librsvg-2.2.5.tar.bz2) = 225319 bytes
+SHA1 (patch-aa) = 2475e09eaaf400ddfcb810909b4670bbd5f70797
+SHA1 (patch-ab) = 0cbb9b87c080290d2bf2feb310e9cca3234b564a
+SHA1 (patch-ac) = ef3a46fe1cb85f9056000eee3be393ca2ccc0f66
diff --git a/graphics/librsvg2/patches/patch-aa b/graphics/librsvg2/patches/patch-aa
new file mode 100644
index 00000000000..282dfafe151
--- /dev/null
+++ b/graphics/librsvg2/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.3 2003/06/27 23:02:51 jmmv Exp $
+
+--- doc/Makefile.in.orig	2003-06-27 15:38:16.000000000 +0200
++++ doc/Makefile.in
+@@ -283,6 +283,7 @@ mostlyclean-generic distclean-generic cl
+ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
+ 
++@ENABLE_GTK_DOC_FALSE@all-local:
+ @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp
+ 
+ #### scan ####
diff --git a/graphics/librsvg2/patches/patch-ab b/graphics/librsvg2/patches/patch-ab
new file mode 100644
index 00000000000..bae0b576c37
--- /dev/null
+++ b/graphics/librsvg2/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2003/06/27 23:02:52 jmmv Exp $
+
+--- gdk-pixbuf-loader/Makefile.in.orig	2003-06-27 19:56:48.000000000 +0200
++++ gdk-pixbuf-loader/Makefile.in
+@@ -356,10 +356,6 @@ maintainer-clean-generic clean mostlycle
+ 
+ 
+ install-data-local: 
+-	if [ -z "$(DESTDIR)" ] ; then \
+-	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
+-	  $(QUERYLOADERS) > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
+-	fi
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/graphics/librsvg2/patches/patch-ac b/graphics/librsvg2/patches/patch-ac
new file mode 100644
index 00000000000..ec93e949c0b
--- /dev/null
+++ b/graphics/librsvg2/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2003/06/27 23:02:52 jmmv Exp $
+
+--- gimp-plugin/Makefile.in.orig	2003-06-27 21:22:20.000000000 +0200
++++ gimp-plugin/Makefile.in
+@@ -292,7 +292,8 @@ installcheck: installcheck-am
+ install-exec-am:
+ install-exec: install-exec-am
+ 
+-install-data-am: install-gimpPROGRAMS
++@ENABLE_GIMP_PLUGIN_TRUE@install-data-am: install-gimpPROGRAMS
++@ENABLE_GIMP_PLUGIN_FALSE@install-data-am:
+ install-data: install-data-am
+ 
+ install-am: all-am