From owner-svn-ports-all@freebsd.org  Sun Dec 29 12:44:29 2019
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 D7D4B1DE547;
 Sun, 29 Dec 2019 12:44:29 +0000 (UTC)
 (envelope-from joneum@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)
 server-signature RSA-PSS (4096 bits)
 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 47m0cs5RQBz4SvR;
 Sun, 29 Dec 2019 12:44:29 +0000 (UTC)
 (envelope-from joneum@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 B5F1319A94;
 Sun, 29 Dec 2019 12:44:29 +0000 (UTC)
 (envelope-from joneum@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBTCiTSi094223;
 Sun, 29 Dec 2019 12:44:29 GMT (envelope-from joneum@FreeBSD.org)
Received: (from joneum@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBTCiTUD094222;
 Sun, 29 Dec 2019 12:44:29 GMT (envelope-from joneum@FreeBSD.org)
Message-Id: <201912291244.xBTCiTUD094222@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: joneum set sender to
 joneum@FreeBSD.org using -f
From: Jochen Neumeister <joneum@FreeBSD.org>
Date: Sun, 29 Dec 2019 12:44:29 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r521281 - head/devel/phpunit7
X-SVN-Group: ports-head
X-SVN-Commit-Author: joneum
X-SVN-Commit-Paths: head/devel/phpunit7
X-SVN-Commit-Revision: 521281
X-SVN-Commit-Repository: ports
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.29
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: Sun, 29 Dec 2019 12:44:29 -0000

Author: joneum
Date: Sun Dec 29 12:44:29 2019
New Revision: 521281
URL: https://svnweb.freebsd.org/changeset/ports/521281

Log:
  Fix CONFLICTS_INSTALL
  
  Sponsored by:	Netzkommune GmbH

Modified:
  head/devel/phpunit7/Makefile

Modified: head/devel/phpunit7/Makefile
==============================================================================
--- head/devel/phpunit7/Makefile	Sun Dec 29 12:43:19 2019	(r521280)
+++ head/devel/phpunit7/Makefile	Sun Dec 29 12:44:29 2019	(r521281)
@@ -12,7 +12,7 @@ COMMENT=	Testing framework for unit tests
 
 LICENSE=	BSD3CLAUSE
 
-CONFLICTS_INSTALL=	phpunit6
+CONFLICTS_INSTALL=	phpunit8
 
 USES=		cpe php:flavors
 CPE_VENDOR=	phpunit_project