diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-18 03:09:42 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-18 03:09:42 +0800 |
| commit | 2fb6591734f76b8240320dde503644b6f8b291e6 (patch) | |
| tree | 3e74507a147b70a9801d30732c2005706220418c /deskutils | |
| parent | fc7f35d286900e53f2188373e67bda4c483b571b (diff) | |
| download | marcuscom-ports-2fb6591734f76b8240320dde503644b6f8b291e6.tar marcuscom-ports-2fb6591734f76b8240320dde503644b6f8b291e6.tar.gz marcuscom-ports-2fb6591734f76b8240320dde503644b6f8b291e6.tar.bz2 marcuscom-ports-2fb6591734f76b8240320dde503644b6f8b291e6.tar.lz marcuscom-ports-2fb6591734f76b8240320dde503644b6f8b291e6.tar.xz marcuscom-ports-2fb6591734f76b8240320dde503644b6f8b291e6.tar.zst marcuscom-ports-2fb6591734f76b8240320dde503644b6f8b291e6.zip | |
Add CONFLICTS with the each others.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15835 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/gnome-utils/Makefile | 4 | ||||
| -rw-r--r-- | deskutils/gnome-utils3/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index cf88d9e4a..7f3ef76cf 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.152 2011/03/07 09:13:18 kwm Exp $ +# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.153 2011/04/10 19:41:35 mezz Exp $ # PORTNAME= gnome-utils @@ -19,6 +19,8 @@ COMMENT= GNOME 2 support utilities LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ canberra-gtk.0:${PORTSDIR}/audio/libcanberra +CONFLICTS= gnome-utils-3.[0-9]* + USE_BZIP2= yes USE_GETTEXT= yes INSTALLS_OMF= yes diff --git a/deskutils/gnome-utils3/Makefile b/deskutils/gnome-utils3/Makefile index e700576e0..fa9cdb079 100644 --- a/deskutils/gnome-utils3/Makefile +++ b/deskutils/gnome-utils3/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/gnome-utils3/Makefile,v 1.6 2011/04/05 13:40:20 kwm Exp $ +# $MCom: ports/deskutils/gnome-utils3/Makefile,v 1.7 2011/04/10 19:41:35 mezz Exp $ # PORTNAME= gnome-utils @@ -20,6 +20,8 @@ LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3 RUN_DEPENDS= gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas +CONFLICTS= gnome-utils-2.[0-9]* + USE_BZIP2= yes USE_GETTEXT= yes INSTALLS_OMF= yes |