diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-16 15:42:38 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-16 15:42:38 +0800 |
| commit | 65b704b3aecd8091bdf70aa1c6232efc4ae60c18 (patch) | |
| tree | 5bfdfd290d509c086d271ff9e91ece109cdd3282 /audio | |
| parent | 89c614a62775bf3ef68338bd011c776e7665f234 (diff) | |
| download | marcuscom-ports-65b704b3aecd8091bdf70aa1c6232efc4ae60c18.tar marcuscom-ports-65b704b3aecd8091bdf70aa1c6232efc4ae60c18.tar.gz marcuscom-ports-65b704b3aecd8091bdf70aa1c6232efc4ae60c18.tar.bz2 marcuscom-ports-65b704b3aecd8091bdf70aa1c6232efc4ae60c18.tar.lz marcuscom-ports-65b704b3aecd8091bdf70aa1c6232efc4ae60c18.tar.xz marcuscom-ports-65b704b3aecd8091bdf70aa1c6232efc4ae60c18.tar.zst marcuscom-ports-65b704b3aecd8091bdf70aa1c6232efc4ae60c18.zip | |
Add conflicts with libgnome-media-profiles
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15827 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/gnome-media/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index db8231278..87b2f1049 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD: ports/audio/gnome-media/Makefile,v 1.105 2010/12/12 16:51:50 marcus Exp $ -# $MCom: ports/audio/gnome-media/Makefile,v 1.155 2010/09/29 08:17:11 kwm Exp $ +# $MCom: ports/audio/gnome-media/Makefile,v 1.157 2011/04/10 21:55:36 mezz Exp $ # PORTNAME= gnome-media @@ -20,7 +20,7 @@ BUILD_DEPENDS= xml2po:${PORTSDIR}/textproc/gnome-doc-utils LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique -CONFLICTS= gnome-control-center-3.[0-9]* +CONFLICTS= gnome-control-center-3.[0-9]* libgnome-media-profiles-3.[0-9]* USE_BZIP2= yes USE_GETTEXT= yes |