From owner-svn-ports-all@freebsd.org  Mon May 15 12:25:29 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C6842D6C721;
 Mon, 15 May 2017 12:25:29 +0000 (UTC) (envelope-from tz@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 mx1.freebsd.org (Postfix) with ESMTPS id 9897E155A;
 Mon, 15 May 2017 12:25:29 +0000 (UTC) (envelope-from tz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4FCPSBH002308;
 Mon, 15 May 2017 12:25:28 GMT (envelope-from tz@FreeBSD.org)
Received: (from tz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4FCPS67002307;
 Mon, 15 May 2017 12:25:28 GMT (envelope-from tz@FreeBSD.org)
Message-Id: <201705151225.v4FCPS67002307@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org
 using -f
From: Torsten Zuehlsdorff <tz@FreeBSD.org>
Date: Mon, 15 May 2017 12:25:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r440921 - head/devel/phpunit6
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 May 2017 12:25:29 -0000

Author: tz
Date: Mon May 15 12:25:28 2017
New Revision: 440921
URL: https://svnweb.freebsd.org/changeset/ports/440921

Log:
  devel/phpunit6: register CONFLICTS_INSTALL for devel/phpunit
  
  PR:           219134
  Submitted by: Franco Fichtner <franco@opnsense.org>

Modified:
  head/devel/phpunit6/Makefile

Modified: head/devel/phpunit6/Makefile
==============================================================================
--- head/devel/phpunit6/Makefile	Mon May 15 12:21:50 2017	(r440920)
+++ head/devel/phpunit6/Makefile	Mon May 15 12:25:28 2017	(r440921)
@@ -13,6 +13,8 @@ COMMENT=	Testing framework for unit test
 
 LICENSE=	BSD3CLAUSE
 
+CONFLICTS_INSTALL=	phpunit
+
 USES=		cpe php
 CPE_VENDOR=	phpunit_project
 USE_PHP=	dom json spl pcre phar