From owner-svn-ports-head@freebsd.org  Fri Sep 18 21:41:19 2020
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5C2EE3F1200;
 Fri, 18 Sep 2020 21:41:19 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4BtS2R0ZrYz4CMQ;
 Fri, 18 Sep 2020 21:41:19 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC77E214F2;
 Fri, 18 Sep 2020 21:41:18 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08ILfIAH012122;
 Fri, 18 Sep 2020 21:41:18 GMT (envelope-from linimon@FreeBSD.org)
Received: (from linimon@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08ILfIQZ012121;
 Fri, 18 Sep 2020 21:41:18 GMT (envelope-from linimon@FreeBSD.org)
Message-Id: <202009182141.08ILfIQZ012121@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: linimon set sender to
 linimon@FreeBSD.org using -f
From: Mark Linimon <linimon@FreeBSD.org>
Date: Fri, 18 Sep 2020 21:41:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r548920 - head/x11-drivers/xf86-video-ati
X-SVN-Group: ports-head
X-SVN-Commit-Author: linimon
X-SVN-Commit-Paths: head/x11-drivers/xf86-video-ati
X-SVN-Commit-Revision: 548920
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Sep 2020 21:41:19 -0000

Author: linimon
Date: Fri Sep 18 21:41:18 2020
New Revision: 548920
URL: https://svnweb.freebsd.org/changeset/ports/548920

Log:
  Remove conflict that is OBE.

Modified:
  head/x11-drivers/xf86-video-ati/Makefile

Modified: head/x11-drivers/xf86-video-ati/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-ati/Makefile	Fri Sep 18 21:38:47 2020	(r548919)
+++ head/x11-drivers/xf86-video-ati/Makefile	Fri Sep 18 21:41:18 2020	(r548920)
@@ -25,8 +25,6 @@ ONLY_FOR_ARCHS_REASON=	KMS is required and currently o
 LIB_DEPENDS=	libpciaccess.so:devel/libpciaccess \
 		libdrm_radeon.so:graphics/libdrm
 
-CONFLICTS_INSTALL=	xf86-video-ati-legacy
-
 USES=		gl xorg xorg-cat:driver
 USE_GL=		gl
 USE_XORG=	pciaccess