diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-11 04:50:04 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-11 04:50:04 +0800 |
| commit | 44dc9e24e3d9d56a80086b7637e8679cc6134eaa (patch) | |
| tree | 2432499e9d3ef337cde32e29f560dbda9876ffef /sysutils | |
| parent | 485d31558761607d20f2d67f4c06a946e0fcb5d5 (diff) | |
| download | marcuscom-ports-44dc9e24e3d9d56a80086b7637e8679cc6134eaa.tar marcuscom-ports-44dc9e24e3d9d56a80086b7637e8679cc6134eaa.tar.gz marcuscom-ports-44dc9e24e3d9d56a80086b7637e8679cc6134eaa.tar.bz2 marcuscom-ports-44dc9e24e3d9d56a80086b7637e8679cc6134eaa.tar.lz marcuscom-ports-44dc9e24e3d9d56a80086b7637e8679cc6134eaa.tar.xz marcuscom-ports-44dc9e24e3d9d56a80086b7637e8679cc6134eaa.tar.zst marcuscom-ports-44dc9e24e3d9d56a80086b7637e8679cc6134eaa.zip | |
Add CONFLICTS with the each others.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15791 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/brasero/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/brasero3/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile index 2f9cfcc95..ce8728c6a 100644 --- a/sysutils/brasero/Makefile +++ b/sysutils/brasero/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/brasero/Makefile,v 1.85 2011/03/07 08:11:25 kwm Exp $ +# $MCom: ports/sysutils/brasero/Makefile,v 1.86 2011/04/10 19:41:36 mezz Exp $ PORTNAME= brasero PORTVERSION= 2.32.1 @@ -22,6 +22,8 @@ LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify \ RUN_DEPENDS= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ cdrdao:${PORTSDIR}/sysutils/cdrdao +CONFLICTS= brasero-3.[0-9]* + USE_GETTEXT= yes USE_BZIP2= yes GNU_CONFIGURE= yes diff --git a/sysutils/brasero3/Makefile b/sysutils/brasero3/Makefile index be4502537..8d0911ce1 100644 --- a/sysutils/brasero3/Makefile +++ b/sysutils/brasero3/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/brasero3/Makefile,v 1.8 2011/04/05 19:21:36 kwm Exp $ +# $MCom: ports/sysutils/brasero3/Makefile,v 1.9 2011/04/10 19:41:37 mezz Exp $ PORTNAME= brasero PORTVERSION= 3.0.0 @@ -20,6 +20,8 @@ LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify \ RUN_DEPENDS= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ cdrdao:${PORTSDIR}/sysutils/cdrdao +CONFLICTS= brasero-2.[0-9]* + USE_GETTEXT= yes USE_BZIP2= yes GNU_CONFIGURE= yes |