[pkgsrc/trunk]: pkgsrc librsvg2-gtk2 has gone away, so do not depend on it. ...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a9eb087acabc
branches:  trunk
changeset: 500552:a9eb087acabc
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Mon Oct 10 14:03:36 2005 +0000

description:
librsvg2-gtk2 has gone away, so do not depend on it.  Instead, require a
recent version of librsvg2 (>= 2.12.6) which now includes the GTK+ loader.
Bump PKGREVISION to 1.

diffstat:

 games/gnome2-games/Makefile      |  6 +++---
 meta-pkgs/gnome-base/Makefile    |  6 +++---
 meta-pkgs/gtk2-extras/Makefile   |  5 +++--
 x11/gnome-themes-extras/Makefile |  7 +++++--
 4 files changed, 14 insertions(+), 10 deletions(-)

diffs (105 lines):

diff -r 1ba7e5470689 -r a9eb087acabc games/gnome2-games/Makefile
--- a/games/gnome2-games/Makefile       Mon Oct 10 13:59:35 2005 +0000
+++ b/games/gnome2-games/Makefile       Mon Oct 10 14:03:36 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2005/08/10 20:56:17 jlam Exp $
+# $NetBSD: Makefile,v 1.51 2005/10/10 14:03:36 jmmv Exp $
 
 DISTNAME=              gnome-games-2.10.1
+PKGREVISION=           1
 CATEGORIES=            games gnome
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gnome-games/2.10/}
 EXTRACT_SUFX=          .tar.bz2
@@ -9,8 +10,6 @@
 HOMEPAGE=              http://www.gnome.org/
 COMMENT=               GNOME2 games collection
 
-DEPENDS+=              librsvg2-gtk2>=2.9.5:../../graphics/librsvg2-gtk2
-
 CONFLICTS=             xbill-[0-9]*
 
 BUILD_USES_MSGFMT=     yes
@@ -66,6 +65,7 @@
 
 BUILDLINK_DEPENDS.howl+=       howl>=0.9.6
 BUILDLINK_DEPENDS.libgnome+=   libgnome>=2.10.0
+BUILDLINK_DEPENDS.librsvg2+=   librsvg2>=2.12.6
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/GConf2/schemas.mk"
diff -r 1ba7e5470689 -r a9eb087acabc meta-pkgs/gnome-base/Makefile
--- a/meta-pkgs/gnome-base/Makefile     Mon Oct 10 13:59:35 2005 +0000
+++ b/meta-pkgs/gnome-base/Makefile     Mon Oct 10 14:03:36 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2005/08/21 11:49:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2005/10/10 14:03:36 jmmv Exp $
 
 DISTNAME=      gnome-base-2.10.2
+PKGREVISION=   1
 CATEGORIES=    meta-pkgs x11 gnome
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -50,8 +51,7 @@
 DEPENDS+=      libgnomeprint>=2.10.3:../../print/libgnomeprint
 DEPENDS+=      libgnomeprintui>=2.10.2:../../print/libgnomeprintui
 DEPENDS+=      libgtop2>=2.10.2:../../sysutils/libgtop2
-DEPENDS+=      librsvg2>=2.9.5:../../graphics/librsvg2
-DEPENDS+=      librsvg2-gtk2>=2.9.5:../../graphics/librsvg2-gtk2
+DEPENDS+=      librsvg2>=2.12.6:../../graphics/librsvg2
 DEPENDS+=      libxklavier>=2.0:../../x11/libxklavier
 DEPENDS+=      libgtkhtml>=2.6.3:../../www/libgtkhtml
 DEPENDS+=      libsoup-devel>=2.2.3:../../net/libsoup-devel
diff -r 1ba7e5470689 -r a9eb087acabc meta-pkgs/gtk2-extras/Makefile
--- a/meta-pkgs/gtk2-extras/Makefile    Mon Oct 10 13:59:35 2005 +0000
+++ b/meta-pkgs/gtk2-extras/Makefile    Mon Oct 10 14:03:36 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2005/10/02 12:19:53 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2005/10/10 14:03:36 jmmv Exp $
 
 DISTNAME=      gtk2-extras-2.8.0
+PKGREVISION=   1
 CATEGORIES=    meta-pkgs x11 gnome
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -11,7 +12,7 @@
 
 DEPENDS+=      gtk2+>=2.8.4:../../x11/gtk2
 DEPENDS+=      gtk2-engines>=2.6.0:../../x11/gtk2-engines
-DEPENDS+=      librsvg2-gtk2>=2.6.3:../../graphics/librsvg2-gtk2
+DEPENDS+=      librsvg2>=2.12.6:../../graphics/librsvg2
 DEPENDS+=      swfdec-gtk2>=0.2.1nb1:../../multimedia/swfdec-gtk2
 
 EXTRACT_ONLY=  # empty
diff -r 1ba7e5470689 -r a9eb087acabc x11/gnome-themes-extras/Makefile
--- a/x11/gnome-themes-extras/Makefile  Mon Oct 10 13:59:35 2005 +0000
+++ b/x11/gnome-themes-extras/Makefile  Mon Oct 10 14:03:36 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:26 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/10/10 14:03:36 jmmv Exp $
 #
 
 DISTNAME=      gnome-themes-extras-0.8.1
+PKGREVISION=   1
 CATEGORIES=    x11 gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gnome-themes-extras/0.8/}
 EXTRACT_SUFX=  .tar.bz2
@@ -10,7 +11,6 @@
 HOMEPAGE=      http://www.gnome.org/
 COMMENT=       Collection of metathemes for the GNOME desktop environment
 
-DEPENDS+=              librsvg2-gtk2>=2.6.1:../../graphics/librsvg2-gtk2
 BUILD_USES_MSGFMT=     yes
 
 # NetBSD's pax-as-tar truncates filenames
@@ -25,8 +25,11 @@
 BUILDLINK_TRANSFORM+=  rm:-DG_DISABLE_DEPRECATED
 BUILDLINK_TRANSFORM+=  rm:-DGTK_DISABLE_DEPRECATED
 
+BUILDLINK_DEPENDS.librsvg2+=   librsvg2>=2.12.6
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../graphics/librsvg2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtk2-engines/buildlink3.mk"