[pkgsrc/trunk]: pkgsrc API depends of multimedia/totem/buildlink3.mk allows b...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/60604b78d8e6
branches:  trunk
changeset: 530358:60604b78d8e6
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jun 26 14:47:55 2007 +0000

description:
API depends of multimedia/totem/buildlink3.mk allows both totem and
totem-xine, ABI depends only the former. This creates conflicts when
pkg_add picks the latter to fulfill the API depends. Allow both packages
for the ABI depends as well and bump the revisions of the two affected
packages.

diffstat:

 audio/rhythmbox/Makefile       |  3 ++-
 multimedia/totem/buildlink3.mk |  4 ++--
 x11/py-gnome2-desktop/Makefile |  4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diffs (46 lines):

diff -r 1a9ef31ac5a2 -r 60604b78d8e6 audio/rhythmbox/Makefile
--- a/audio/rhythmbox/Makefile  Tue Jun 26 13:54:29 2007 +0000
+++ b/audio/rhythmbox/Makefile  Tue Jun 26 14:47:55 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2007/06/10 06:29:47 obache Exp $
+# $NetBSD: Makefile,v 1.49 2007/06/26 14:47:56 joerg Exp $
 #
 
 DISTNAME=      rhythmbox-0.9.8
+PKGREVISION=   1
 CATEGORIES=    audio gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/rhythmbox/0.9/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 1a9ef31ac5a2 -r 60604b78d8e6 multimedia/totem/buildlink3.mk
--- a/multimedia/totem/buildlink3.mk    Tue Jun 26 13:54:29 2007 +0000
+++ b/multimedia/totem/buildlink3.mk    Tue Jun 26 14:47:55 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2007/06/05 05:37:05 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2007/06/26 14:47:55 joerg Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 TOTEM_BUILDLINK3_MK:=  ${TOTEM_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@
 
 .if !empty(TOTEM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.totem+=  {totem,totem-xine}>=1.4.0
-BUILDLINK_ABI_DEPENDS.totem?=  totem>=2.18.1nb1
+BUILDLINK_ABI_DEPENDS.totem?=  {totem,totem-xine}>=2.18.1nb1
 BUILDLINK_PKGSRCDIR.totem?=    ../../multimedia/totem
 .endif # TOTEM_BUILDLINK3_MK
 
diff -r 1a9ef31ac5a2 -r 60604b78d8e6 x11/py-gnome2-desktop/Makefile
--- a/x11/py-gnome2-desktop/Makefile    Tue Jun 26 13:54:29 2007 +0000
+++ b/x11/py-gnome2-desktop/Makefile    Tue Jun 26 14:47:55 2007 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2007/06/05 05:37:40 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/06/26 14:47:56 joerg Exp $
 #
 
 DISTNAME=      gnome-python-desktop-2.18.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/-python/2/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gnome-python-desktop/2.18/}
 EXTRACT_SUFX=  .tar.bz2