Rename librsvg2 to librsvg, to make upstream name.

8 files changed, 32 insertions, 33 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 92aaae8ae0c..ac9d918fdc9 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.467 2007/09/20 20:48:52 wiz Exp $
+# $NetBSD: Makefile,v 1.468 2007/09/20 21:36:55 wiz Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -184,7 +184,7 @@ SUBDIR+=	libkdcraw
 SUBDIR+=	libkexif
 SUBDIR+=	libkexiv2
 SUBDIR+=	libkipi
-SUBDIR+=	librsvg2
+SUBDIR+=	librsvg
 SUBDIR+=	libscigraphica
 SUBDIR+=	libungif
 SUBDIR+=	libvideogfx
diff --git a/graphics/librsvg2/DESCR b/graphics/librsvg/DESCR
index abbaa9d443f..912bf0120a3 100644
--- a/graphics/librsvg2/DESCR
+++ b/graphics/librsvg/DESCR
@@ -1,5 +1,5 @@
 librsvg is Raph's scalable vector graphics library.  It provides support for
 SVG graphics, and is used by the GNOME desktop.
 
-This package provides the librsvg2 library as well as some addons -- a pixbuf
+This package provides the librsvg library as well as some addons -- a pixbuf
 loader and a theme engine -- for the GTK+ toolkit.
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg/Makefile
index 83778538fc3..953e103eb0d 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2007/09/19 23:13:20 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2007/09/20 21:36:56 wiz Exp $
 
 DISTNAME=	librsvg-2.18.2
-PKGNAME=	${DISTNAME:S/-/2-/}
 PKGREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/librsvg/2.18/}
@@ -13,7 +12,7 @@ COMMENT=	SVG library for GNOME2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-CONFLICTS+=	librsvg2-gtk-[0-9]*
+CONFLICTS+=	librsvg2-gtk-[0-9]* librsvg2-[0-9]*
 MAKE_JOBS_SAFE=	NO
 
 USE_DIRS+=		xdg-1.1
diff --git a/graphics/librsvg2/PLIST b/graphics/librsvg/PLIST
index b437ba96c1a..b87c4829130 100644
--- a/graphics/librsvg2/PLIST
+++ b/graphics/librsvg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2006/09/15 15:09:32 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/09/20 21:36:56 wiz Exp $
 bin/rsvg
 bin/rsvg-convert
 bin/rsvg-view
diff --git a/graphics/librsvg/buildlink3.mk b/graphics/librsvg/buildlink3.mk
new file mode 100644
index 00000000000..56b6ce9d567
--- /dev/null
+++ b/graphics/librsvg/buildlink3.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink3.mk,v 1.10 2007/09/20 21:36:56 wiz Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+LIBRSVG_BUILDLINK3_MK:=		${LIBRSVG_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	librsvg
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibrsvg}
+BUILDLINK_PACKAGES+=	librsvg
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}librsvg
+
+.if !empty(LIBRSVG_BUILDLINK3_MK:M+)
+BUILDLINK_API_DEPENDS.librsvg+=		librsvg>=2.12.6nb1
+BUILDLINK_ABI_DEPENDS.librsvg+=		librsvg>=2.16.1nb2
+BUILDLINK_PKGSRCDIR.librsvg?=		../../graphics/librsvg
+.endif	# LIBRSVG_BUILDLINK3_MK
+
+.include "../../devel/libgsf/buildlink3.mk"
+.include "../../print/libgnomeprintui/buildlink3.mk"
+.include "../../textproc/libcroco/buildlink3.mk"
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg/distinfo
index a1ebdc00733..e747c912cd1 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2007/08/30 15:57:10 wiz Exp $
+$NetBSD: distinfo,v 1.8 2007/09/20 21:36:57 wiz Exp $
 
 SHA1 (librsvg-2.18.2.tar.bz2) = 9e3017817708025737e53b60fe3bfa813e670e02
 RMD160 (librsvg-2.18.2.tar.bz2) = df154e6a3c74a406a5d6435a82611b3d204f147f
diff --git a/graphics/librsvg2/patches/patch-ab b/graphics/librsvg/patches/patch-ab
index a5a0441ec49..6d049241942 100644
--- a/graphics/librsvg2/patches/patch-ab
+++ b/graphics/librsvg/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.8 2006/04/03 06:35:26 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2007/09/20 21:36:57 wiz Exp $
 
 --- gdk-pixbuf-loader/Makefile.in.orig	2006-04-01 16:31:29.000000000 +0000
 +++ gdk-pixbuf-loader/Makefile.in
diff --git a/graphics/librsvg2/buildlink3.mk b/graphics/librsvg2/buildlink3.mk
deleted file mode 100644
index e05035f3f57..00000000000
--- a/graphics/librsvg2/buildlink3.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.23 2007/06/05 05:37:16 wiz Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-LIBRSVG2_BUILDLINK3_MK:=	${LIBRSVG2_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	librsvg2
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibrsvg2}
-BUILDLINK_PACKAGES+=	librsvg2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}librsvg2
-
-.if !empty(LIBRSVG2_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.librsvg2+=	librsvg2>=2.12.6nb1
-BUILDLINK_ABI_DEPENDS.librsvg2+=	librsvg2>=2.16.1nb2
-BUILDLINK_PKGSRCDIR.librsvg2?=	../../graphics/librsvg2
-.endif	# LIBRSVG2_BUILDLINK3_MK
-
-.include "../../devel/libgsf/buildlink3.mk"
-.include "../../print/libgnomeprintui/buildlink3.mk"
-.include "../../textproc/libcroco/buildlink3.mk"
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}