summaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authormezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2011-04-11 05:55:36 +0800
committermezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2011-04-11 05:55:36 +0800
commit179a7ca6e48128a9954413c63fd55902dfcdac19 (patch)
tree5eb88b3b1ba0a2175c2fef256befe6c8447fcea5 /sysutils
parent38ceb7f7af0c267d8f73118b01768b9e32b0c17d (diff)
downloadmarcuscom-ports-179a7ca6e48128a9954413c63fd55902dfcdac19.tar
marcuscom-ports-179a7ca6e48128a9954413c63fd55902dfcdac19.tar.gz
marcuscom-ports-179a7ca6e48128a9954413c63fd55902dfcdac19.tar.bz2
marcuscom-ports-179a7ca6e48128a9954413c63fd55902dfcdac19.tar.lz
marcuscom-ports-179a7ca6e48128a9954413c63fd55902dfcdac19.tar.xz
marcuscom-ports-179a7ca6e48128a9954413c63fd55902dfcdac19.tar.zst
marcuscom-ports-179a7ca6e48128a9954413c63fd55902dfcdac19.zip
Add CONFLICTS with the each others.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15794 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/gnome-control-center3/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/sysutils/gnome-control-center3/Makefile b/sysutils/gnome-control-center3/Makefile
index bc6739885..5f310098f 100644
--- a/sysutils/gnome-control-center3/Makefile
+++ b/sysutils/gnome-control-center3/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-control-center3/Makefile,v 1.18 2011/04/07 07:24:16 kwm Exp $
+# $MCom: ports/sysutils/gnome-control-center3/Makefile,v 1.19 2011/04/10 19:41:37 mezz Exp $
#
PORTNAME= gnome-control-center
@@ -28,6 +28,8 @@ RUN_DEPENDS= gnome-eject:${PORTSDIR}/sysutils/gnome-mount \
${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
glxinfo:${PORTSDIR}/graphics/mesa-demos
+CONFLICTS= gnome-media-2.[0-9]*
+
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes