diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-07-14 01:48:10 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-07-14 01:48:10 +0800 |
| commit | ba12b593b389059b8e94c483b60e4aa13aa8b2d0 (patch) | |
| tree | be435fb248fc6e60baa73a1cf23e6f83d234cd18 | |
| parent | 85ecc721e8cca25eebab639129ab4a318da69dfe (diff) | |
| download | marcuscom-ports-ba12b593b389059b8e94c483b60e4aa13aa8b2d0.tar marcuscom-ports-ba12b593b389059b8e94c483b60e4aa13aa8b2d0.tar.gz marcuscom-ports-ba12b593b389059b8e94c483b60e4aa13aa8b2d0.tar.bz2 marcuscom-ports-ba12b593b389059b8e94c483b60e4aa13aa8b2d0.tar.lz marcuscom-ports-ba12b593b389059b8e94c483b60e4aa13aa8b2d0.tar.xz marcuscom-ports-ba12b593b389059b8e94c483b60e4aa13aa8b2d0.tar.zst marcuscom-ports-ba12b593b389059b8e94c483b60e4aa13aa8b2d0.zip | |
Sync with FreeBSD ports.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11114 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | audio/rhythmbox-devel/Makefile | 4 | ||||
| -rw-r--r-- | 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 <marcus@FreeBSD.org> # # $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 <bsd.port.pre.mk> .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 <marcus@FreeBSD.org> # # $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 <bsd.port.pre.mk> .if !defined(WITHOUT_VORBIS) |