git: 7a09cbf47b03 - main - devel/php-composer: Remove obsolete conflicts.

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Guido Falsi <madpilot_at_FreeBSD.org>
Date: Sat, 30 Sep 2023 10:35:59 UTC

The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7a09cbf47b031e439b23df48d558ad63aa8f57bb

commit 7a09cbf47b031e439b23df48d558ad63aa8f57bb
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2023-09-30 10:35:23 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2023-09-30 10:35:23 +0000

    devel/php-composer: Remove obsolete conflicts.
---
 devel/php-composer/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devel/php-composer/Makefile b/devel/php-composer/Makefile
index 333bdc2141c6..b4a61f175c02 100644
--- a/devel/php-composer/Makefile
+++ b/devel/php-composer/Makefile
@@ -19,7 +19,7 @@ USES=		cpe php:flavors
 CPE_VENDOR=	getcomposer
 USE_PHP=	ctype filter intl mbstring phar
 
-CONFLICTS_INSTALL=	php*-composer php*-composer2
+CONFLICTS_INSTALL=	php*-composer
 
 NO_ARCH=	yes
 NO_BUILD=	yes