Update to 2.6.3: a new stable release of librsvg. This is the version

shipping with GNOME 2.6.  This version has a goodly number of bugfixes.

6 files changed, 16 insertions, 31 deletions

diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index eeea739574b..835a37ff97c 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2004/03/26 02:27:42 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2004/04/01 18:37:09 jmmv Exp $
 #
 
 .include "Makefile.common"
 
 PKGNAME=		${DISTNAME:S/-/2-/}
-PKGREVISION=		7
 
 CONFIGURE_ARGS+=	--disable-pixbuf-loader
 
diff --git a/graphics/librsvg2/Makefile.common b/graphics/librsvg2/Makefile.common
index 7c69c586703..b5d56e1db6d 100644
--- a/graphics/librsvg2/Makefile.common
+++ b/graphics/librsvg2/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.4 2004/02/14 18:26:28 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.5 2004/04/01 18:37:09 jmmv Exp $
 #
 
-DISTNAME=	librsvg-2.5.0
+DISTNAME=	librsvg-2.6.3
 CATEGORIES=	graphics gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/librsvg/2.5/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/librsvg/2.6/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
diff --git a/graphics/librsvg2/PLIST b/graphics/librsvg2/PLIST
index 272ab0e3263..d7b5c7fa0ba 100644
--- a/graphics/librsvg2/PLIST
+++ b/graphics/librsvg2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/01/22 12:43:10 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/04/01 18:37:09 jmmv Exp $
 bin/rsvg
 include/librsvg-2/librsvg/librsvg-features.h
 include/librsvg-2/librsvg/rsvg-gz.h
@@ -6,24 +6,11 @@ include/librsvg-2/librsvg/rsvg.h
 lib/librsvg-2.a
 lib/librsvg-2.la
 lib/librsvg-2.so
-lib/librsvg-2.so.7
-lib/librsvg-2.so.7.0
+lib/librsvg-2.so.8
+lib/librsvg-2.so.8.3
 lib/pkgconfig/librsvg-2.0.pc
 man/man1/rsvg.1
-share/doc/html/librsvg2/home.png
-share/doc/html/librsvg2/i967.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/r373.html
-share/doc/html/librsvg2/r407.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
+@exec ${MKDIR} %D/share/doc/html/librsvg2
 @dirrm share/doc/html/librsvg2
 @dirrm include/librsvg-2/librsvg
 @dirrm include/librsvg-2
diff --git a/graphics/librsvg2/buildlink3.mk b/graphics/librsvg2/buildlink3.mk
index 835aa787048..ecc62301947 100644
--- a/graphics/librsvg2/buildlink3.mk
+++ b/graphics/librsvg2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/26 02:27:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/04/01 18:37:09 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBRSVG2_BUILDLINK3_MK:=	${LIBRSVG2_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibrsvg2}
 BUILDLINK_PACKAGES+=	librsvg2
 
 .if !empty(LIBRSVG2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.librsvg2+=	librsvg2>=2.5.0nb4
-BUILDLINK_RECOMMENDED.librsvg2?=	librsvg2>=2.5.0nb7
+BUILDLINK_DEPENDS.librsvg2+=	librsvg2>=2.6.3
 BUILDLINK_PKGSRCDIR.librsvg2?=	../../graphics/librsvg2
 .endif	# LIBRSVG2_BUILDLINK3_MK
 
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index 118ea8c97bb..bb4d5fae33d 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2004/01/22 12:43:10 jmmv Exp $
+$NetBSD: distinfo,v 1.7 2004/04/01 18:37:09 jmmv Exp $
 
-SHA1 (librsvg-2.5.0.tar.bz2) = d52e55c872e046c3d0c85f7b8098df6b5c7d4ee5
-Size (librsvg-2.5.0.tar.bz2) = 228378 bytes
+SHA1 (librsvg-2.6.3.tar.bz2) = 639a35424fc257e37162d3979111e89bcb302ba9
+Size (librsvg-2.6.3.tar.bz2) = 221687 bytes
 SHA1 (patch-aa) = c8bf42abf7c1a862f0f7867d07ef10c590afafdf
 SHA1 (patch-ab) = 3485670e7746ff1d4dfdacc5aee3c17744b18454
-SHA1 (patch-ac) = 1ff6ecb5322abe1e85fff8418f826e68e897a642
+SHA1 (patch-ac) = 581c50cf81ad96958fce37e44545fe54755179e1
 SHA1 (patch-ad) = 45a3352b815c01a63b903be4692ce642b22073bc
diff --git a/graphics/librsvg2/patches/patch-ac b/graphics/librsvg2/patches/patch-ac
index 714a375105a..8943549b192 100644
--- a/graphics/librsvg2/patches/patch-ac
+++ b/graphics/librsvg2/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2004/01/22 12:43:10 jmmv Exp $
+$NetBSD: patch-ac,v 1.4 2004/04/01 18:37:09 jmmv Exp $
 
---- Makefile.in.orig	2003-12-07 20:35:55.000000000 +0100
+--- Makefile.in.orig	2003-12-07 19:35:55.000000000 +0000
 +++ Makefile.in
 @@ -104,7 +104,8 @@ STRIP = @STRIP@
  VERSION = @VERSION@