summaryrefslogtreecommitdiffstats
path: root/x11/gnome-session/Makefile
diff options
context:
space:
mode:
authormezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2011-04-26 06:02:03 +0800
committermezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2011-04-26 06:02:03 +0800
commit313047a40033be82e837ac24567e31a2b6bd08a4 (patch)
treea7b737a209dad4318a1f3fde1382feab8aaa9ae3 /x11/gnome-session/Makefile
parente94987580b997f18538c077aa2ea4fd5a69b5ba0 (diff)
downloadmarcuscom-ports-313047a40033be82e837ac24567e31a2b6bd08a4.tar
marcuscom-ports-313047a40033be82e837ac24567e31a2b6bd08a4.tar.gz
marcuscom-ports-313047a40033be82e837ac24567e31a2b6bd08a4.tar.bz2
marcuscom-ports-313047a40033be82e837ac24567e31a2b6bd08a4.tar.lz
marcuscom-ports-313047a40033be82e837ac24567e31a2b6bd08a4.tar.xz
marcuscom-ports-313047a40033be82e837ac24567e31a2b6bd08a4.tar.zst
marcuscom-ports-313047a40033be82e837ac24567e31a2b6bd08a4.zip
Update the CONFLICTS.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15875 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gnome-session/Makefile')
-rw-r--r--x11/gnome-session/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 0fbb6813f..a1e40e971 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-session/Makefile,v 1.189 2011/03/07 08:03:57 kwm Exp $
+# $MCom: ports/x11/gnome-session/Makefile,v 1.190 2011/04/10 19:41:38 mezz Exp $
#
PORTNAME= gnome-session
@@ -16,7 +16,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Session component for the GNOME 2 desktop
-CONFLICTS= gnome-session-2.31.* gnome-session-2.90.* gnome-session-3.*
+CONFLICTS= gnome-session-3.[0-9]*
BUILD_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \