Adapt for librsvg rename. Bump PKGREVISION.

41 files changed, 101 insertions, 101 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 13a62f664b5..ba1e9954a25 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.74 2007/09/20 21:21:36 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2007/09/20 21:37:35 wiz Exp $
 #
 
 DISTNAME=	file-roller-2.18.4
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.18/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/bmpx/Makefile b/audio/bmpx/Makefile
index c1d487e9ae4..00253f163f0 100644
--- a/audio/bmpx/Makefile
+++ b/audio/bmpx/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2007/09/19 23:18:43 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/20 21:37:36 wiz Exp $
 #
 
 DISTNAME=	bmpx-0.40.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://files.beep-media-player.org/releases/0.40/
 EXTRACT_SUFX=	.tar.bz2
@@ -34,9 +34,9 @@ BUILDLINK_API_DEPENDS.glibmm+=		glibmm>=2.8.3
 .include "../../devel/glibmm/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libglademm+=	libglademm>=2.6.0
 .include "../../devel/libglademm/buildlink3.mk"
-BUILDLINK_API_DEPENDS.librsvg2+=	librsvg2>=2.14.0
+BUILDLINK_API_DEPENDS.librsvg+=	librsvg>=2.14.0
 .include "../../devel/libsexymm/buildlink3.mk"
-.include "../../graphics/librsvg2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../net/libsoup-devel/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.10.0
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index bfb02d56f0a..499aa54ae04 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2007/09/20 21:21:36 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2007/09/20 21:37:36 wiz Exp $
 #
 
 DISTNAME=	rhythmbox-0.9.8
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/rhythmbox/0.9/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index de1b63fe6eb..08b493efbb4 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2007/09/20 21:21:37 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/20 21:37:36 wiz Exp $
 #
 
 DISTNAME=		sound-juicer-2.14.5
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		audio
 MASTER_SITES=		http://www.burtonini.com/computing/
 
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 02fd4030fa4..536569b3c13 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2007/09/20 00:05:57 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2007/09/20 21:37:36 wiz Exp $
 
 DISTNAME=		gnome-games-2.18.2.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		games gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-games/2.18/}
 EXTRACT_SUFX=		.tar.bz2
@@ -62,7 +62,7 @@ PY_PATCHPLIST=		yes
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.3
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.0
 BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.10.0
-BUILDLINK_API_DEPENDS.librsvg2+=	librsvg2>=2.12.6
+BUILDLINK_API_DEPENDS.librsvg+=	librsvg>=2.12.6
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/GConf2/schemas.mk"
@@ -74,7 +74,7 @@ BUILDLINK_API_DEPENDS.librsvg2+=	librsvg2>=2.12.6
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/librsvg2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../lang/guile/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
diff --git a/games/kye/Makefile b/games/kye/Makefile
index 98c66c984cc..d5f98430b95 100644
--- a/games/kye/Makefile
+++ b/games/kye/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2007/09/19 23:18:52 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2007/09/20 21:37:36 wiz Exp $
 #
 
 DISTNAME=		kye-0.9.3
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		games
 MASTER_SITES=		http://games.moria.org.uk/kye/
 
@@ -19,5 +19,5 @@ SUBST_SED.prefix=	's|@PREFIX@|${PREFIX}|g'
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
-.include "../../graphics/librsvg2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index 38ab40f3568..745c57960b3 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2007/09/19 23:18:54 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2007/09/20 21:37:36 wiz Exp $
 
 DISTNAME=	gimageview-0.2.27
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkmmviewer/}
 
@@ -27,7 +27,7 @@ LDFLAGS.NetBSD+=	${PTHREAD_LDFLAGS}
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/librsvg2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/gimp-color-manager/Makefile b/graphics/gimp-color-manager/Makefile
index 7a7f1e46824..f8c1e466dc5 100644
--- a/graphics/gimp-color-manager/Makefile
+++ b/graphics/gimp-color-manager/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2007/09/19 23:18:56 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2007/09/20 21:37:37 wiz Exp $
 #
 
 DISTNAME=		gimp-color-manager-0.1.0
-PKGREVISION=		10
+PKGREVISION=		11
 CATEGORIES=		graphics
 MASTER_SITES=		ftp://www.virtual-sub.org/
 
diff --git a/graphics/gimp-fix-ca/Makefile b/graphics/gimp-fix-ca/Makefile
index 7f48cfb1b80..44003fe40b6 100644
--- a/graphics/gimp-fix-ca/Makefile
+++ b/graphics/gimp-fix-ca/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2007/09/19 23:18:56 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/09/20 21:37:37 wiz Exp $
 #
 
 DISTNAME=		gimp-fix-ca-2.1.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		graphics
 MASTER_SITES=		http://registry.gimp.org/file/fix-ca.c?action=download&id=8944&file=
 EXTRACT_SUFX=		.c
diff --git a/graphics/gimp-rawphoto/Makefile b/graphics/gimp-rawphoto/Makefile
index a20805dcb2e..115277c3fac 100644
--- a/graphics/gimp-rawphoto/Makefile
+++ b/graphics/gimp-rawphoto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2007/09/19 23:18:57 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/20 21:37:37 wiz Exp $
 #
 
 DISTNAME=		rawphoto-200410220928
 PKGNAME=		gimp-rawphoto-1.19
-PKGREVISION=		10
+PKGREVISION=		11
 CATEGORIES=		graphics
 MASTER_SITES=		#
 EXTRACT_SUFX=		.tgz
diff --git a/graphics/gimp-refocus-it/Makefile b/graphics/gimp-refocus-it/Makefile
index f14f21b067b..b27d6e99c99 100644
--- a/graphics/gimp-refocus-it/Makefile
+++ b/graphics/gimp-refocus-it/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2007/09/19 23:18:57 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/20 21:37:37 wiz Exp $
 #
 
 DISTNAME=		refocus-it-2.0.0
 PKGNAME=		gimp-refocus-it-2.0.0
-PKGREVISION=		10
+PKGREVISION=		11
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=refocus-it/}
 
diff --git a/graphics/gimp-ufraw/Makefile b/graphics/gimp-ufraw/Makefile
index e1e39265d35..36103426eb5 100644
--- a/graphics/gimp-ufraw/Makefile
+++ b/graphics/gimp-ufraw/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2007/09/19 23:18:57 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2007/09/20 21:37:37 wiz Exp $
 
 DISTNAME=		ufraw-0.12.1
 PKGNAME=		gimp-${DISTNAME}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ufraw/}
 
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 463619fcef5..4aca8773109 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.159 2007/09/19 23:18:54 wiz Exp $
+# $NetBSD: Makefile,v 1.160 2007/09/20 21:37:35 wiz Exp $
 
 DISTNAME=	gimp-2.2.17
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v2.2/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/v2.2/ \
@@ -62,7 +62,7 @@ PLIST_SUBST+=		TWAIN="@comment "
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
-.include "../../graphics/librsvg2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/graphics/gimp/buildlink3.mk b/graphics/gimp/buildlink3.mk
index 9187db54296..1d57caf72b2 100644
--- a/graphics/gimp/buildlink3.mk
+++ b/graphics/gimp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2007/06/05 05:37:07 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2007/09/20 21:37:35 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GIMP_BUILDLINK3_MK:=	${GIMP_BUILDLINK3_MK}+
@@ -24,7 +24,7 @@ BUILDLINK_PKGSRCDIR.gimp?=	../../graphics/gimp
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
-.include "../../graphics/librsvg2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/graphics/gimp2-wideangle/Makefile b/graphics/gimp2-wideangle/Makefile
index 1757cfb3ddd..23f6acb3d71 100644
--- a/graphics/gimp2-wideangle/Makefile
+++ b/graphics/gimp2-wideangle/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2007/09/19 23:18:57 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/09/20 21:37:37 wiz Exp $
 #
 
 DISTNAME=	wideangle
 PKGNAME=	gimp2-wideangle-1.0
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	graphics
 MASTER_SITES=	http://members.ozemail.com.au/~hodsond/
 EXTRACT_SUFX=	.c
diff --git a/graphics/gimp24/Makefile b/graphics/gimp24/Makefile
index c4b71dbfd63..6542196a788 100644
--- a/graphics/gimp24/Makefile
+++ b/graphics/gimp24/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2007/09/19 23:18:58 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2007/09/20 21:37:35 wiz Exp $
 
 DISTNAME=	gimp-2.3.19
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v2.3/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/v2.3/ \
@@ -67,7 +67,7 @@ PLIST_SUBST+=	TWAIN="@comment "
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
-.include "../../graphics/librsvg2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/graphics/gimp24/buildlink3.mk b/graphics/gimp24/buildlink3.mk
index 6bf5d6050c4..775cc83208e 100644
--- a/graphics/gimp24/buildlink3.mk
+++ b/graphics/gimp24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2007/06/05 05:37:07 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2007/09/20 21:37:35 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GIMP_BUILDLINK3_MK:=	${GIMP_BUILDLINK3_MK}+
@@ -23,7 +23,7 @@ BUILDLINK_PKGSRCDIR.gimp?=	../../graphics/gimp24
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
-.include "../../graphics/librsvg2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/libwmf/buildlink3.mk"
diff --git a/graphics/ruby-gnome2-rsvg/Makefile b/graphics/ruby-gnome2-rsvg/Makefile
index 5f639374df7..c44f841eb5e 100644
--- a/graphics/ruby-gnome2-rsvg/Makefile
+++ b/graphics/ruby-gnome2-rsvg/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2007/09/19 23:18:58 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/20 21:37:38 wiz Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-rsvg-${VERSION}
 COMMENT=		Ruby binding of librsvg
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		graphics
 
 RUBY_EXTCONF_SUBDIRS=	rsvg
@@ -12,6 +12,6 @@ DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-gli
 DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-gdkpixbuf>=${VERSION}:../../graphics/ruby-gnome2-gdkpixbuf
 USE_TOOLS+=		pkg-config
 
-.include "../../graphics/librsvg2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/ruby-rcairo/buildlink3.mk"
 .include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 796cf363dd4..a3f670ff048 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.34 2007/09/19 23:18:58 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2007/09/20 21:37:38 wiz Exp $
 
 .include "../../graphics/sane-backends/Makefile.common"
 
 DISTNAME=	sane-frontends-${SANE_VERSION}
 SANE_MICRO=	14
-PGKREVISION=	3
+PGKREVISION=	4
 
 COMMENT=	Frontends for access to scanners, digitals camera, frame grabbers etc
 
diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index 68f7ede3847..f820f4d3418 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2007/09/19 23:18:58 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2007/09/20 21:37:38 wiz Exp $
 #
 
 DISTNAME=	tuxpaint-0.9.17
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tuxpaint/} \
 		ftp://ftp.sonic.net/pub/users/nbs/unix/x/tuxpaint/source/
@@ -45,7 +45,7 @@ post-install:
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/librsvg2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../print/libpaper/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 232c717eeaf..a6ef2ce0b36 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2007/09/19 23:18:59 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2007/09/20 21:37:38 wiz Exp $
 
 DISTNAME=	xsane-0.994
 PKGNAME=	xsane-0.99.4
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.xsane.org/download/ \
 		http://gd.tuwien.ac.at/hci/sane/xsane/ \
diff --git a/multimedia/gnome-media/Makefile b/multimedia/gnome-media/Makefile
index 8a8a3879e9f..b7bf51e3965 100644
--- a/multimedia/gnome-media/Makefile
+++ b/multimedia/gnome-media/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2007/09/20 21:21:38 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2007/09/20 21:37:38 wiz Exp $
 
 DISTNAME=		gnome-media-2.18.0
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		multimedia gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.18/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index 3e91e7a9431..3d94305fcd5 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.33 2007/09/20 21:21:38 wiz Exp $
+# $NetBSD: Makefile.common,v 1.34 2007/09/20 21:37:38 wiz Exp $
 #
 
 DISTNAME=	totem-2.18.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/totem/2.18/}
 
diff --git a/net/logjam/Makefile b/net/logjam/Makefile
index 7d3d7657eb8..e8dc0d4b897 100644
--- a/net/logjam/Makefile
+++ b/net/logjam/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2007/09/19 23:19:05 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/20 21:37:38 wiz Exp $
 #
 
 DISTNAME=	logjam-4.5.3
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://logjam.danga.com/download/
 EXTRACT_SUFX=	.tar.bz2
@@ -18,7 +18,7 @@ USE_TOOLS+=		perl pkg-config intltool msgfmt
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../graphics/librsvg2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../net/libsoup-devel/buildlink3.mk"
 .include "../../textproc/gtkspell/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/net/mldonkey-gui/options.mk b/net/mldonkey-gui/options.mk
index 893881c87cb..7c2128e5e60 100644
--- a/net/mldonkey-gui/options.mk
+++ b/net/mldonkey-gui/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2007/06/15 21:40:54 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2007/09/20 21:37:42 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mldonkey-gui
 PKG_OPTIONS_REQUIRED_GROUPS+=	toolkit
@@ -14,7 +14,7 @@ CONFIGURE_ARGS+=	--enable-gui=newgui1
 
 .if !empty(PKG_OPTIONS:Mlablgtk2)
 CONFIGURE_ARGS+=	--enable-gui=newgui2
-.include "../../graphics/librsvg2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 # 2.6.0 is the first ~stable version (for mldonkey)
 BUILDLINK_API_DEPENDS.lablgtk2+=	lablgtk2>=2.6.0
diff --git a/print/evince-nautilus/Makefile b/print/evince-nautilus/Makefile
index d0a5a924468..08390db853c 100644
--- a/print/evince-nautilus/Makefile
+++ b/print/evince-nautilus/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2007/09/20 21:21:38 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2007/09/20 21:37:39 wiz Exp $
 #
 
 .include "../../print/evince/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/evince/evince-nautilus/}
-PKGREVISION=		2
+PKGREVISION=		3
 
 COMMENT=		File properties plugin for evince files
 PKG_OPTIONS_VAR=	PKG_OPTIONS.evince
diff --git a/security/seahorse-nautilus/Makefile b/security/seahorse-nautilus/Makefile
index fdd8e898e8e..f9a7b02108b 100644
--- a/security/seahorse-nautilus/Makefile
+++ b/security/seahorse-nautilus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2007/09/20 21:21:38 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/20 21:37:39 wiz Exp $
 
 DISTNAME=	seahorse-1.0.1
 PKGNAME=	seahorse-nautilus-1.0.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/seahorse/1.0/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index e25136e3ed2..5831e23216a 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2007/09/20 21:21:36 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2007/09/20 21:37:35 wiz Exp $
 #
 
 DISTNAME=	nautilus-cd-burner-2.14.3
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/nautilus-cd-burner/2.14/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index 53b017c42cf..eab8e3fa5c3 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.82 2007/09/20 21:21:36 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2007/09/20 21:37:35 wiz Exp $
 #
 
 DISTNAME=		nautilus-2.18.3
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.18/}
 EXTRACT_SUFX=		.tar.bz2
@@ -45,7 +45,7 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
-.include "../../graphics/librsvg2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/sysutils/nautilus/buildlink3.mk b/sysutils/nautilus/buildlink3.mk
index a6392606f6c..af6bc076acb 100644
--- a/sysutils/nautilus/buildlink3.mk
+++ b/sysutils/nautilus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2007/09/20 21:21:36 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2007/09/20 21:37:35 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NAUTILUS_BUILDLINK3_MK:=	${NAUTILUS_BUILDLINK3_MK}+
@@ -34,7 +34,7 @@ PRINT_PLIST_AWK+=	/^@dirrm lib\/nautilus\/extensions-1.0$$/ \
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
-.include "../../graphics/librsvg2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/time/cairo-clock/Makefile b/time/cairo-clock/Makefile
index 4a753a948dd..4220ed8ecde 100644
--- a/time/cairo-clock/Makefile
+++ b/time/cairo-clock/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2007/09/19 23:19:09 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/09/20 21:37:39 wiz Exp $
 #
 
 DISTNAME=	cairo-clock_0.3.3-1
 PKGNAME=	cairo-clock-0.3.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	time
 MASTER_SITES=	http://macslow.thepimp.net/projects/cairo-clock/
 
@@ -19,6 +19,6 @@ USE_DIRS+=	xdg-1.1
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/librsvg2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/compiz/Makefile b/wm/compiz/Makefile
index d674efc4207..403dc4b4070 100644
--- a/wm/compiz/Makefile
+++ b/wm/compiz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/09/19 23:19:10 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/20 21:37:39 wiz Exp $
 #
 
 DISTNAME=	compiz-0.4.0
@@ -39,7 +39,7 @@ CONFIGURE_ARGS+=	--enable-librsvg
 PLIST_SUBST+=		GNOME=""
 .include "../../x11/gnome2-control-center/buildlink3.mk"
 .include "../../wm/metacity/buildlink3.mk"
-.include "../../graphics/librsvg2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .else
 PLIST_SUBST+=		GNOME="@comment "
 .endif
diff --git a/wm/gnome-compiz-manager/Makefile b/wm/gnome-compiz-manager/Makefile
index 92b5b9d8ad8..87d4c7fd111 100644
--- a/wm/gnome-compiz-manager/Makefile
+++ b/wm/gnome-compiz-manager/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2007/09/19 23:19:10 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/20 21:37:39 wiz Exp $
 #
 
 DISTNAME=	gnome-compiz-manager-0.10.4
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	wm
 MASTER_SITES=	http://download.gna.org/gcm/gnome-compiz-manager/
 
@@ -24,7 +24,7 @@ PKGCONFIG_OVERRIDE+=	gnome-compiz-manager.pc.in
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../graphics/librsvg2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/control-center/Makefile b/x11/control-center/Makefile
index c5ec0bf7f95..fe86e387a92 100644
--- a/x11/control-center/Makefile
+++ b/x11/control-center/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2007/09/20 21:21:36 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2007/09/20 21:37:35 wiz Exp $
 #
 
 DISTNAME=	control-center-2.18.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.18/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 754f14573f4..850611fef5f 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.130 2007/09/19 23:19:12 wiz Exp $
+# $NetBSD: Makefile,v 1.131 2007/09/20 21:37:40 wiz Exp $
 #
 
 DISTNAME=	gdm-2.18.4
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.18/}
 EXTRACT_SUFX=	.tar.bz2
@@ -150,7 +150,7 @@ PRINT_PLIST_AWK+=	/gdmopen/ { print "$${GDMOPEN}" $$0; next }
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
-.include "../../graphics/librsvg2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 20a681cd97f..23b450ae650 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2007/09/20 21:21:38 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2007/09/20 21:37:40 wiz Exp $
 #
 
 DISTNAME=		gnome-applets-2.18.0
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.18/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 71ccbc12846..767b4047630 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.87 2007/09/20 21:21:39 wiz Exp $
+# $NetBSD: Makefile,v 1.88 2007/09/20 21:37:40 wiz Exp $
 #
 
 DISTNAME=		gnome-session-2.18.3
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/2.18/}
 SITES.gnome-splash-2.16.0.png=	${MASTER_SITE_LOCAL:=gnome-splash/}
diff --git a/x11/gnome-themes-extras/Makefile b/x11/gnome-themes-extras/Makefile
index 59d04ab17f9..5c995fc3117 100644
--- a/x11/gnome-themes-extras/Makefile
+++ b/x11/gnome-themes-extras/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2007/09/19 23:19:13 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2007/09/20 21:37:41 wiz Exp $
 #
 
 DISTNAME=	gnome-themes-extras-0.8.1
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-themes-extras/0.8/}
 EXTRACT_SUFX=	.tar.bz2
@@ -28,11 +28,11 @@ USE_TOOLS+=		gmake intltool msgfmt pkg-config
 BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
 BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
 
-BUILDLINK_API_DEPENDS.librsvg2+=	librsvg2>=2.12.6
+BUILDLINK_API_DEPENDS.librsvg+=	librsvg>=2.12.6
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../graphics/librsvg2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtk2-engines/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk2-sharp/Makefile b/x11/gtk2-sharp/Makefile
index 17631c89928..7acad554338 100644
--- a/x11/gtk2-sharp/Makefile
+++ b/x11/gtk2-sharp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2007/09/19 23:13:37 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/20 21:37:41 wiz Exp $
 #
 
 DISTNAME=		gtk-sharp-2.8.2
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		x11
 MASTER_SITES=		http://go-mono.com/sources/gtk-sharp-2.8/
 
@@ -47,7 +47,7 @@ substpcprefix:
 .include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../x11/gnome-panel/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
-.include "../../graphics/librsvg2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../www/gtkhtml38/buildlink3.mk"
 .include "../../x11/vte/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/lablgtk2/options.mk b/x11/lablgtk2/options.mk
index 3a24c74bd2c..3e339a67c8e 100644
--- a/x11/lablgtk2/options.mk
+++ b/x11/lablgtk2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2007/06/15 21:39:54 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2007/09/20 21:37:42 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.lablgtk2
 PKG_SUPPORTED_OPTIONS=	glade gnomecanvas svg
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+=	--without-gnomecanvas
 .endif
 
 .if !empty(PKG_OPTIONS:Msvg)
-.include "../../graphics/librsvg2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-rsvg
 PLIST_SRC+=		PLIST.svg
 .else
diff --git a/x11/py-gnome2-desktop/Makefile b/x11/py-gnome2-desktop/Makefile
index 58fefae0595..ec3d3cb1efc 100644
--- a/x11/py-gnome2-desktop/Makefile
+++ b/x11/py-gnome2-desktop/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2007/09/20 21:21:39 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/20 21:37:41 wiz Exp $
 #
 
 DISTNAME=	gnome-python-desktop-2.18.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-python/2/}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python-desktop/2.18/}
 EXTRACT_SUFX=	.tar.bz2
@@ -28,7 +28,7 @@ PLIST_SUBST+=	NAUTILUSBURN="@comment "
 #.include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
 
 .include "../../graphics/py-cairo/buildlink3.mk"
-.include "../../graphics/librsvg2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../multimedia/totem/buildlink3.mk"
 .include "../../multimedia/gnome-media/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"