From nobody Thu Dec 14 06:09:09 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SrMPL6nsJz53TlQ; Thu, 14 Dec 2023 06:09:10 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SrMPL6GdWz3R2G; Thu, 14 Dec 2023 06:09:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702534150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VNtiW0US84rT6dml1SjCs2D6v+2LLK3JoBr0KhdzEvM=; b=kLyXT+ExgrYlv3Yq7GgKXGEfmnI989vGsHFBwZFWkfu2qCduQTf8dRmzyppKdPI5CF4lex GhJng58dog9h2eemKNyMaD60CzvCrnuYIzDUCHCjTRfHITwJXk984QfuiIbR2cFhVAMWwy SSoLzaCmY9bie5KG1peBo9Jc7YEV8QHtEVakHprMr2bOXweYo/x82IWey5w35MnweYKZ3W BrbxT2A3q9LTNZjpDnnpzKjQ+e9F+xDNki/eDKVbWdfLtgTIz/9Rgle8hsdC3q+jAlNnfV v/RO5kpeABdgfUyJ5nZRhAj8CPJznIHHoFONzYo4kKraEvak3rrCKp/ZW0tQXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702534150; a=rsa-sha256; cv=none; b=yj0D8PNTkmpEkff3rxYtEdfDA/6zhkKDjfoqG0VhO9CRVz/BgNsxpuRY3TMe8TDHRRgBdh KQ7Q9CjDeQ1yOJMlyCLPtPjlOhZhj0S009Dw1iMccIMEnvDI6BGjGKkJ3JCrxINZ0deLzH zXhDfwLlufy5uw7z4cmlICiRGYGYwJ3wbcLcncV8cOuRwqV0RxVTp2SZBDenINjg7Js1Yn RFVH4JOoJZZw/Nn1RnUZLFYxW4LivgRhVuSLgf1IgIMve1wqOuCPS/trwLjsKodvnkbatk yxpvJ8oxPf2/mdXzVLa9Xwb/m6Qwf5OK6WVTcvv+cHySP/0Y/3096ZNPxBZwFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702534150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VNtiW0US84rT6dml1SjCs2D6v+2LLK3JoBr0KhdzEvM=; b=eYyxeRgonyGxdMCJtidKjZutvvLMTbUFjZuqMmlfdb4atSQkuR56Liv5dxaDCZuz1UFPA/ Qv/dtJgYROmXsqwQndeLB0GV33fjnsU2k/GBe5ytd9DC9vY/fVmMNrW6qPZ6HBvICADlS7 EE5goIz1Bn4K3XIYJMzbF97CwjvUJlcpqIX0TP9zqxOep5+CM5PtRGDNobYXi6j6Rdk0on D5YvRe85RAmMkWO8avJ3SO/NcXEWMMC8bp89u21n8yaW2ZAdDsYybEQr0zWlz+NkGmic9x FbJ8NZXiwCahJv2Hs26HlV4HXqS1B7JG5qG+InvuEbQLudzRidAM7Cs5hpnZmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SrMPK1Z9Qz1W7; Thu, 14 Dec 2023 06:09:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BE699wS006907; Thu, 14 Dec 2023 06:09:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BE699c4006904; Thu, 14 Dec 2023 06:09:09 GMT (envelope-from git) Date: Thu, 14 Dec 2023 06:09:09 GMT Message-Id: <202312140609.3BE699c4006904@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 49e08e9226cc - main - devel/phpunit8: Add missing CONFLICTS_INSTALL List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49e08e9226ccb05ea2fe5ca106d2d6aa2ab36c52 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=49e08e9226ccb05ea2fe5ca106d2d6aa2ab36c52 commit 49e08e9226ccb05ea2fe5ca106d2d6aa2ab36c52 Author: Po-Chuan Hsieh AuthorDate: 2023-12-14 05:41:30 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-14 05:49:04 +0000 devel/phpunit8: Add missing CONFLICTS_INSTALL Approved by: portmgr (blanket) --- devel/phpunit8/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/devel/phpunit8/Makefile b/devel/phpunit8/Makefile index 9a93b99bd0d6..fce8f3c29f2d 100644 --- a/devel/phpunit8/Makefile +++ b/devel/phpunit8/Makefile @@ -22,6 +22,8 @@ NO_BUILD= yes PLIST_FILES= bin/phpunit +CONFLICTS_INSTALL= phpunit* + # Download isn't compressed or aggregated, it's just the single file do-extract: ${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}/${PORTNAME}