Module Name:	pkgsrc
Committed By:	joerg
Date:		Tue Jun 26 14:47:57 UTC 2007

Modified Files:
	pkgsrc/audio/rhythmbox: Makefile
	pkgsrc/multimedia/totem: buildlink3.mk
	pkgsrc/x11/py-gnome2-desktop: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -r1.48 -r1.49 pkgsrc/audio/rhythmbox/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/multimedia/totem/buildlink3.mk
cvs rdiff -r1.6 -r1.7 pkgsrc/x11/py-gnome2-desktop/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.