summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/gdm/Makefile4
-rw-r--r--x11/gdm3/Makefile4
2 files changed, 6 insertions, 2 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 3b6d89e8b..685bd4876 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gdm/Makefile,v 1.187 2011/06/03 19:56:54 kwm Exp $
+# $MCom: ports/x11/gdm/Makefile,v 1.188 2011/06/03 21:27:51 mezz Exp $
#
PORTNAME= gdm
@@ -28,6 +28,8 @@ RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \
gnome-session:${PORTSDIR}/x11/gnome-session \
${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+CONFLICTS= gdm-3.[0-9]*
+
USERS= gdm
GROUPS= gdm
diff --git a/x11/gdm3/Makefile b/x11/gdm3/Makefile
index bcbecbc57..413cc0fca 100644
--- a/x11/gdm3/Makefile
+++ b/x11/gdm3/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gdm3/Makefile,v 1.8 2011/05/31 21:49:31 kwm Exp $
+# $MCom: ports/x11/gdm3/Makefile,v 1.9 2011/06/10 22:59:10 mezz Exp $
#
PORTNAME= gdm
@@ -33,6 +33,8 @@ RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \
${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core \
${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+CONFLICTS= gdm-2.[0-9]*
+
USERS= gdm
GROUPS= gdm