diff options
| author | joerg <joerg> | 2007-06-26 14:47:55 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2007-06-26 14:47:55 +0000 |
| commit | 78968ede7e5c7d96bc718577b655b48b8cb1d447 (patch) | |
| tree | 9d412a2d92f0accd20af97077e73b1555c86417d | |
| parent | 54f0410ded7b8fe3f52a1e965c36fc9884dc1a65 (diff) | |
| download | pkgsrc-78968ede7e5c7d96bc718577b655b48b8cb1d447.tar.gz | |
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.
| -rw-r--r-- | audio/rhythmbox/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/totem/buildlink3.mk | 4 | ||||
| -rw-r--r-- | x11/py-gnome2-desktop/Makefile | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index 30fdf8668bd..f22a39bf7ff 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -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 --git a/multimedia/totem/buildlink3.mk b/multimedia/totem/buildlink3.mk index b5f03c4b8a3..8934743a52b 100644 --- a/multimedia/totem/buildlink3.mk +++ b/multimedia/totem/buildlink3.mk @@ -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 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}totem .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 --git a/x11/py-gnome2-desktop/Makefile b/x11/py-gnome2-desktop/Makefile index da4c679a4f6..c18c1a0d927 100644 --- a/x11/py-gnome2-desktop/Makefile +++ b/x11/py-gnome2-desktop/Makefile @@ -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 |