From c4caf493c37bcc09b009d2ff7a97cd7a8efb12f0 Mon Sep 17 00:00:00 2001
From: gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Thu, 7 Nov 2013 22:05:32 +0000
Subject: Remove the CONFLICT and LATEST_LINK that got back by accident.

Reported by:	kwm


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18860 df743ca5-7f9a-e211-a948-0013205c9059
---
 x11/gdm/Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index fec5ee97a..959857b4e 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/x11/gdm/Makefile 18858 2013-11-07 19:21:23Z gusi $
 
 PORTNAME=	gdm
 PORTVERSION=	3.6.2
@@ -36,12 +36,9 @@ RUN_DEPENDS+=	xrdb:${PORTSDIR}/x11/xrdb \
 		xmodmap:${PORTSDIR}/x11/xmodmap \
 		xterm:${PORTSDIR}/x11/xterm
 
-CONFLICTS=	gdm-2.[0-9]*
-
 USERS=		gdm
 GROUPS=		gdm
 
-LATEST_LINK=	gdm3
 USE_XZ=		yes
 USE_LDCONFIG=	yes
 USE_XORG=	dmx dmxproto
-- 
cgit v1.2.3