From ba12b593b389059b8e94c483b60e4aa13aa8b2d0 Mon Sep 17 00:00:00 2001 From: marcus Date: Sun, 13 Jul 2008 17:48:10 +0000 Subject: Sync with FreeBSD ports. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11114 df743ca5-7f9a-e211-a948-0013205c9059 --- audio/rhythmbox-devel/Makefile | 4 +++- audio/rhythmbox/Makefile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile index a28ec89a7..bd575ab1d 100644 --- a/audio/rhythmbox-devel/Makefile +++ b/audio/rhythmbox-devel/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/audio/rhythmbox-devel/Makefile,v 1.94 2008/07/13 00:20:16 marcus Exp $ +# $MCom: ports/audio/rhythmbox-devel/Makefile,v 1.95 2008/07/13 17:41:11 marcus Exp $ # PORTNAME= rhythmbox @@ -54,6 +54,8 @@ OPTIONS= DAAP "Enable iTunes music sharing" off \ GECKO_PLUGIN "Enable iTunes browser plugin" on # GDA "Enable GDA database storage" off +CONFLICTS= rhythmbox-0.10.[0-9]* + .include .if !defined(WITHOUT_VORBIS) diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index b1774ac3d..adaa8c82d 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/audio/rhythmbox/Makefile,v 1.90 2008/05/14 02:10:38 marcus Exp $ +# $MCom: ports/audio/rhythmbox/Makefile,v 1.91 2008/06/06 21:38:45 marcus Exp $ # PORTNAME= rhythmbox @@ -50,6 +50,8 @@ OPTIONS= DAAP "Enable iTunes music sharing" off \ LIRC "Enable Infrared syncing support" off # GDA "Enable GDA database storage" off +CONFLICTS= rhythmbox-0.11.[0-9]* + .include .if !defined(WITHOUT_VORBIS) -- cgit v1.2.3