Update librsvg2 and librsvg2-gtk2 to 2.8.1. This version corresponds to

GNOME 2.8.0.

- Filters
- Hugely improved text support
- GTK+ theme engine
- Masks
- Path markers
- Mozilla plugin
- Patterns
- Standalone viewer
- Decent <image> support
- Numerous bug fixes

9 files changed, 76 insertions, 83 deletions

diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index dc9eeef07a7..9a67ee1dc11 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.29 2004/05/15 17:25:42 minskim Exp $
+# $NetBSD: Makefile,v 1.30 2004/09/21 16:51:01 jmmv Exp $
 #
 
 .include "Makefile.common"
 
 PKGNAME=		${DISTNAME:S/-/2-/}
 
+USE_DIRS+=		xdg-1.1
+
 CONFIGURE_ARGS+=	--disable-pixbuf-loader
 
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/graphics/librsvg2/Makefile.common b/graphics/librsvg2/Makefile.common
index 4902a10592f..8d8d7734b23 100644
--- a/graphics/librsvg2/Makefile.common
+++ b/graphics/librsvg2/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.7 2004/05/15 17:25:42 minskim Exp $
+# $NetBSD: Makefile.common,v 1.8 2004/09/21 16:51:01 jmmv Exp $
 #
 
-DISTNAME=	librsvg-2.6.5
+DISTNAME=	librsvg-2.8.1
 CATEGORIES=	graphics gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/librsvg/2.6/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/librsvg/2.8/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
diff --git a/graphics/librsvg2/PLIST b/graphics/librsvg2/PLIST
index 446eac33202..0ac7d983f67 100644
--- a/graphics/librsvg2/PLIST
+++ b/graphics/librsvg2/PLIST
@@ -1,29 +1,33 @@
-@comment $NetBSD: PLIST,v 1.7 2004/05/15 12:01:07 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/09/21 16:51:01 jmmv Exp $
 bin/rsvg
+bin/rsvg-view
 include/librsvg-2/librsvg/librsvg-features.h
 include/librsvg-2/librsvg/rsvg-gz.h
 include/librsvg-2/librsvg/rsvg.h
 lib/librsvg-2.a
 lib/librsvg-2.la
 lib/librsvg-2.so
-lib/librsvg-2.so.8
-lib/librsvg-2.so.8.5
+lib/librsvg-2.so.10
+lib/librsvg-2.so.10.1
 lib/pkgconfig/librsvg-2.0.pc
 man/man1/rsvg.1
 share/doc/librsvg2/home.png
-share/doc/librsvg2/i1073.html
 share/doc/librsvg2/index.html
 share/doc/librsvg2/index.sgml
+share/doc/librsvg2/ix01.html
 share/doc/librsvg2/left.png
-share/doc/librsvg2/r22.html
-share/doc/librsvg2/r436.html
-share/doc/librsvg2/r473.html
 share/doc/librsvg2/right.png
-share/doc/librsvg2/rsvg-convenience-functions.html
-share/doc/librsvg2/rsvg-core-api.html
-share/doc/librsvg2/rsvg-creating-a-svgz-reader.html
+share/doc/librsvg2/rn01.html
+share/doc/librsvg2/rn02.html
+share/doc/librsvg2/rn03.html
+share/doc/librsvg2/rsvg-Convenience-Functions.html
+share/doc/librsvg2/rsvg-Core-API.html
+share/doc/librsvg2/rsvg-Creating-a-SVGZ-reader.html
+share/doc/librsvg2/rsvg.devhelp
 share/doc/librsvg2/rsvg.html
 share/doc/librsvg2/up.png
+share/pixmaps/svg-viewer.svg
+@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/doc/librsvg2
 @dirrm include/librsvg-2/librsvg
 @dirrm include/librsvg-2
diff --git a/graphics/librsvg2/buildlink3.mk b/graphics/librsvg2/buildlink3.mk
index 125761256cc..aa93f722f5c 100644
--- a/graphics/librsvg2/buildlink3.mk
+++ b/graphics/librsvg2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/05/27 19:33:29 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/09/21 16:51:01 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBRSVG2_BUILDLINK3_MK:=	${LIBRSVG2_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibrsvg2}
 BUILDLINK_PACKAGES+=	librsvg2
 
 .if !empty(LIBRSVG2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.librsvg2+=	librsvg2>=2.6.3nb2
+BUILDLINK_DEPENDS.librsvg2+=	librsvg2>=2.8.1
 BUILDLINK_PKGSRCDIR.librsvg2?=	../../graphics/librsvg2
 .endif	# LIBRSVG2_BUILDLINK3_MK
 
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index 6a846190871..400ca09fe5b 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.8 2004/05/15 12:01:07 jmmv Exp $
+$NetBSD: distinfo,v 1.9 2004/09/21 16:51:01 jmmv Exp $
 
-SHA1 (librsvg-2.6.5.tar.bz2) = edfffbc14463177a122381f53a942d4f316ba48c
-Size (librsvg-2.6.5.tar.bz2) = 294229 bytes
-SHA1 (patch-aa) = c8bf42abf7c1a862f0f7867d07ef10c590afafdf
-SHA1 (patch-ab) = 3485670e7746ff1d4dfdacc5aee3c17744b18454
-SHA1 (patch-ac) = 581c50cf81ad96958fce37e44545fe54755179e1
-SHA1 (patch-ad) = 45a3352b815c01a63b903be4692ce642b22073bc
+SHA1 (librsvg-2.8.1.tar.bz2) = 483c760e8300f504506af31accbf03c113b2854a
+Size (librsvg-2.8.1.tar.bz2) = 361446 bytes
+SHA1 (patch-ab) = 0def1d4342c6ca4e99ea0acc8a9d2987799d1527
+SHA1 (patch-ac) = 7a04dd7c01a6adeb2de18d7a67ab2790c6392f9f
+SHA1 (patch-ad) = 70a8bcd0fdd644ea20af53ca78e5ac4eee67a4e3
diff --git a/graphics/librsvg2/patches/patch-aa b/graphics/librsvg2/patches/patch-aa
deleted file mode 100644
index 57cf9779b5f..00000000000
--- a/graphics/librsvg2/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2003/12/18 14:15:26 adam Exp $
-
---- doc/Makefile.in.orig	2003-12-07 19:36:00.000000000 +0000
-+++ doc/Makefile.in
-@@ -299,6 +299,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
index aaa6effac96..a6ccb2aede4 100644
--- a/graphics/librsvg2/patches/patch-ab
+++ b/graphics/librsvg2/patches/patch-ab
@@ -1,26 +1,26 @@
-$NetBSD: patch-ab,v 1.3 2004/01/22 12:43:10 jmmv Exp $
+$NetBSD: patch-ab,v 1.4 2004/09/21 16:51:01 jmmv Exp $
 
---- gdk-pixbuf-loader/Makefile.in.orig	2003-12-07 20:35:59.000000000 +0100
+--- gdk-pixbuf-loader/Makefile.in.orig	2004-09-12 21:16:37.000000000 +0200
 +++ gdk-pixbuf-loader/Makefile.in
-@@ -122,7 +122,7 @@ svg_loader_la_SOURCES = io-svg.c
- svg_loader_la_LDFLAGS = -avoid-version -module $(no_undefined)
- svg_loader_la_LIBADD = $(LIBRSVG_LIBS) \
- 	$(LIBGSF_LIBS) $(LIBCROCO_LIBS)\
+@@ -52,7 +52,7 @@ LTLIBRARIES = $(loader_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ svg_loader_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/librsvg-2.la
++	$(am__DEPENDENCIES_1)
+ am_svg_loader_la_OBJECTS = io-svg.lo
+ svg_loader_la_OBJECTS = $(am_svg_loader_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -252,7 +252,7 @@ svg_loader_la_LDFLAGS = -avoid-version -
+ svg_loader_la_LIBADD = $(LIBRSVG_LIBS) 	\
+ 	$(LIBGNOME_VFS_LIBS)		\
+ 	$(LIBGSF_LIBS) $(LIBCROCO_LIBS)	\
 -	$(top_builddir)/librsvg-2.la
 +	`pkg-config --libs librsvg-2.0`
  
- 
  loader_LTLIBRARIES = $(target_pixbuf_loader)
-@@ -136,7 +136,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I..
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--svg_loader_la_DEPENDENCIES =  $(top_builddir)/librsvg-2.la
-+svg_loader_la_DEPENDENCIES =
- svg_loader_la_OBJECTS =  io-svg.lo
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -362,10 +362,6 @@ maintainer-clean-generic clean mostlycle
+ all: all-am
+@@ -534,10 +534,6 @@ uninstall-am: uninstall-info-am uninstal
  
  
  install-data-hook: 
@@ -28,6 +28,6 @@ $NetBSD: patch-ab,v 1.3 2004/01/22 12:43:10 jmmv Exp $
 -	  $(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.
+ .NOEXPORT:
diff --git a/graphics/librsvg2/patches/patch-ac b/graphics/librsvg2/patches/patch-ac
index 8943549b192..6b17e24ebf6 100644
--- a/graphics/librsvg2/patches/patch-ac
+++ b/graphics/librsvg2/patches/patch-ac
@@ -1,14 +1,13 @@
-$NetBSD: patch-ac,v 1.4 2004/04/01 18:37:09 jmmv Exp $
+$NetBSD: patch-ac,v 1.5 2004/09/21 16:51:01 jmmv Exp $
 
---- Makefile.in.orig	2003-12-07 19:35:55.000000000 +0000
+--- Makefile.in.orig	2004-09-12 21:16:35.000000000 +0200
 +++ Makefile.in
-@@ -104,7 +104,8 @@ STRIP = @STRIP@
- VERSION = @VERSION@
- VERSION_INFO = @VERSION_INFO@
- 
--SUBDIRS = . gtk-engine gdk-pixbuf-loader doc
-+# gtk-engine is built directly from the librsvg2-gtk2 package.
-+SUBDIRS = . gdk-pixbuf-loader doc
- 
- bin_PROGRAMS = rsvg
- 
+@@ -307,7 +307,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = . gtk-engine gdk-pixbuf-loader moz-plugin doc data
++SUBDIRS = . gdk-pixbuf-loader doc data
+ @HAVE_GTK_FALSE@target_rsvg_view = 
+ @HAVE_GTK_TRUE@target_rsvg_view = rsvg-view
+ man_MANS = rsvg.1
diff --git a/graphics/librsvg2/patches/patch-ad b/graphics/librsvg2/patches/patch-ad
index 2bad1d2794b..d10c8ddfc80 100644
--- a/graphics/librsvg2/patches/patch-ad
+++ b/graphics/librsvg2/patches/patch-ad
@@ -1,22 +1,23 @@
-$NetBSD: patch-ad,v 1.1 2004/01/22 12:43:10 jmmv Exp $
+$NetBSD: patch-ad,v 1.2 2004/09/21 16:51:01 jmmv Exp $
 
---- gtk-engine/Makefile.in.orig	2003-12-07 20:35:56.000000000 +0100
+--- gtk-engine/Makefile.in.orig	2004-09-12 21:16:38.000000000 +0200
 +++ gtk-engine/Makefile.in
-@@ -130,7 +130,7 @@ libsvg_la_SOURCES = \
- 
+@@ -51,8 +51,7 @@ engineLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(engine_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libsvg_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/librsvg-2.la
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_libsvg_la_OBJECTS = svg-draw.lo svg-main.lo svg-render.lo \
+ 	svg-rc-style.lo
+ libsvg_la_OBJECTS = $(am_libsvg_la_OBJECTS)
+@@ -266,7 +265,7 @@ libsvg_la_SOURCES = \
+ 	svg.h
  
  libsvg_la_LDFLAGS = -avoid-version -module $(no_undefined)
--libsvg_la_LIBADD = $(GTK_LIBS) $(LIBRSVG_LIBS) $(LIBCROCO_LIBS) $(top_builddir)/librsvg-2.la
-+libsvg_la_LIBADD = $(GTK_LIBS) $(LIBRSVG_LIBS) $(LIBCROCO_LIBS) `pkg-config --libs librsvg-2.0`
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
-@@ -141,7 +141,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I..
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libsvg_la_DEPENDENCIES =  $(top_builddir)/librsvg-2.la
-+libsvg_la_DEPENDENCIES =
- libsvg_la_OBJECTS =  svg-draw.lo svg-main.lo svg-render.lo \
- svg-rc-style.lo
- CFLAGS = @CFLAGS@
+-libsvg_la_LIBADD = $(GTK_LIBS) $(LIBRSVG_LIBS) $(LIBGNOME_VFS_LIBS) $(LIBCROCO_LIBS) $(top_builddir)/librsvg-2.la
++libsvg_la_LIBADD = $(GTK_LIBS) $(LIBRSVG_LIBS) $(LIBGNOME_VFS_LIBS) $(LIBCROCO_LIBS) `pkg-config --libs librsvg-2.0`
+ EXTRA_DIST = $(libsvg_la_SOURCES)
+ all: all-recursive
+