diff options
| author | joerg <joerg@pkgsrc.org> | 2007-06-26 14:47:55 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-06-26 14:47:55 +0000 |
| commit | f24be610fc2587b0efc636605742fa8eee75be6e (patch) | |
| tree | 9d412a2d92f0accd20af97077e73b1555c86417d /multimedia | |
| parent | ef976b8c02609ee66c3f71869239d45f852cce8e (diff) | |
| download | pkgsrc-f24be610fc2587b0efc636605742fa8eee75be6e.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.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/totem/buildlink3.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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 |