From nobody Sat Sep 30 10:35:59 2023 X-Original-To: dev-commits-ports-main@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 4RyNsr0xdfz4vvpL; Sat, 30 Sep 2023 10:36:00 +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 4RyNsr08vHz3TQs; Sat, 30 Sep 2023 10:36:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696070160; 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=f75lTVyYTzKJQYiBSx8wPm1g1r0F3D6f1AJQPqCOmpE=; b=tkabL/HwKr/MlFUoKBBKY8YHQBbLhiJLGJ/8t/NGKLZ9hBPqsutTyE0bhZZSYKxvAqC1wW mdnUT1+wTwTHyzfCCZipCBwr19wFFC/HUfvBjTQLPg1A6oJABgjC07LDhb8LT09YW51T+e uWYFjFsdc7hntiUBtptvKwqmh7RhEq8CMXA7/BLoMaWKbT9+vOB8gTjaJEdtf80nnZPn3f +th8c/mQibdnaLblwMvbgqQK3itNfBgL2cIai9IfAAzKgICqYX7SAxEW8YWiWmQ9VeuWN2 GQwhKh2QiEXDHkXOTEbGVu0LJrBcM/XY3s5sHRBOyXekY5+1n/EF37gru18woA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696070160; a=rsa-sha256; cv=none; b=WyujT4SKYT4176jCa056RbYFcC0QY5tF+M4zsYukIrwc7rWVHr1o8kfYruITbUusFf7hZK VSMZr5vvmbEiuMfF4zi7LR+aMGtui0dmqWsyLgTU5+NVKVXWUIanJDoqK6oZqOHyEVfzCz AJ4e8VS4FB8L4ir7Qu1VKoQEeXULk0lROlDQzvq5xyffzmpGZjEB9b1lJRgYV/Wv4IL4xW jyI9E6dZDRNV38NtZFbVOjv8nsL56ta6ktoszewhTWRLkESVDA7SqTbNewECsmt/k9uk0O i1kcMcl7BmR5WGEnwgnpb3nnX9T9ueg9ZD9W59CUrTErDNpKcfJAYjflFFAWPw== 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=1696070160; 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=f75lTVyYTzKJQYiBSx8wPm1g1r0F3D6f1AJQPqCOmpE=; b=fLhcFjjzf/qa40VsTDQQ/gm7JGUEa+lRzfugP8pybhxmmRZHsEvR8rBXEcb8Cy80AZXGAc rwMOrxUH+HrKAJ1EZ4247C1BNq1j5yijWubEyWJtDkCxIu7xZWF/j6QFjtinLG5aIm4L7M 7F6HyV4dgftNpW2fQUDrRl9bVmvg1EFhsbyjWB3jfmyEoOUxpZDZOlGRlZ2uHRQ5Am/8ok N9W+FEmE3FJytzttGVyatwkztZ0MsWyfJ3z4vqzEB4/RIyYTILHJvFbMrb9EiiUp+1xNfF R7LGxmXyH9DKBK/SOzyHi5drQMptQunNDIV1pmejPk+MhWBOpzicM1lyodOohQ== 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 4RyNsq67DTzkRC; Sat, 30 Sep 2023 10:35:59 +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 38UAZxCp014167; Sat, 30 Sep 2023 10:35:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38UAZx51014164; Sat, 30 Sep 2023 10:35:59 GMT (envelope-from git) Date: Sat, 30 Sep 2023 10:35:59 GMT Message-Id: <202309301035.38UAZx51014164@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 7a09cbf47b03 - main - devel/php-composer: Remove obsolete conflicts. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a09cbf47b031e439b23df48d558ad63aa8f57bb Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=7a09cbf47b031e439b23df48d558ad63aa8f57bb commit 7a09cbf47b031e439b23df48d558ad63aa8f57bb Author: Guido Falsi AuthorDate: 2023-09-30 10:35:23 +0000 Commit: Guido Falsi 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