From nobody Sat Jul 09 16:05:15 2022 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 5961017FD4FF; Sat, 9 Jul 2022 16:05:15 +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 4LgFNW2BMfz3ZTs; Sat, 9 Jul 2022 16:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657382715; 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=KFCzKnoq+9kIz01bKLPhU02/lVsVR+TFNmLM/5znR8A=; b=UZZluUlNZ2Jo22cMQZwdNEJb3cEz670jQtlb04Yv2AofoP3gujQvD8FSPQQLGbvrrbqCtc TCKInfcikRM0iGAtPrGgR9JQkOyDVHaCG7xEP7f7xRdkonms1poqZUsIy01OzkGD0RAG4q uhCmaennTPycjk+yDx4GX1mPLL9hIYBazL+AWou6WGs5mzlOpJBj1ogKdf4Z3YaYJnLKJW ssmAwy02muEgJQZc+BoFc10ymV1MUnspKb5hp9G/jSlcICHcpKA8N0I6aE1kblipHv4UkE OC1YeCME/uYpECj/abyZpaO4JQS+MkZ+XyJMbftdZ8E1n7ZBR5GsR8EnRzd3HA== 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 4LgFNW1Jdzzrvj; Sat, 9 Jul 2022 16:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 269G5FZ9091604; Sat, 9 Jul 2022 16:05:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 269G5F7x091603; Sat, 9 Jul 2022 16:05:15 GMT (envelope-from git) Date: Sat, 9 Jul 2022 16:05:15 GMT Message-Id: <202207091605.269G5F7x091603@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 1207779d1fc8 - main - www/mod_php80: Fix 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1207779d1fc8321cab649394bfd23178548c1b88 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657382715; 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=KFCzKnoq+9kIz01bKLPhU02/lVsVR+TFNmLM/5znR8A=; b=WWXFZPftcTsUn4vPhVadg+hHwk5pp62waw7XfbWxnm0h/UV7AvdZStptmWh4Dxpwq59mzq 2Qm7Uf+SjpUkbX5qOCiY9JAu8CEelMf31Y6R3I6ptoj4raNKva3N0gxDS8q7ffnmMrBayZ znaC4ZHxRDFBa07H1hlNMrnq84x28phGhnv4MZE4Ri4i3hudi9jYO5Pq0i0pVY/1Bqrm/2 hZ6TzYf0S8xPMVc9bYOWkJu41SRo4Bw9PB1l5qRHaqbfw2DZgFc6zCV4mlFA5XpVab41R6 HwaxPOxEHIxdEaVoHESI0qGQ/l0e0ANk+eQHa0uLSm5KXPfyeq5xnc/JfFGCjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657382715; a=rsa-sha256; cv=none; b=oOjTpPI4wNeit9117OZjjAiUqSUPKdQcAhON2yyroQj2uiEXZUYih4l9qWwq7Wbo7CrlDs 6E9H7B3IFTPt9dd4PWzCwaqrhA59D49z8exArcE5ia0eelN6JwfC7qI075qGUcj9WQKgju gSRVhY/7JUQotQQo7Wpeml2cK/koYQqWyEptppZbOm/FTpYS8LaGkERXd05uv/UuMgJgnZ Oc+l2oj49Bp86TQaj+D/ITSfw0IfxbDMU7Ds0t0nCh6Tt0MsQFeFu+LgAZUK/E5aNgTN66 yOxfYU8vf9VA1K8SRnx2HYmBq7jZhp+IrfvJGFmvHZjeBzobOeEzKp7bLiGj6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=1207779d1fc8321cab649394bfd23178548c1b88 commit 1207779d1fc8321cab649394bfd23178548c1b88 Author: Muhammad Moinur Rahman AuthorDate: 2022-07-09 15:55:32 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-07-09 16:04:30 +0000 www/mod_php80: Fix CONFLICTS_INSTALL - After d4b3ad6 mod_php* ports creates CONFLICTS with php* ports itself - Adopt port Reported by: vvd@unislabs.com Fixes: d4b3ad make CONFLICTS_INSTALL visible to PHP module ports MFH: 2022Q3 Sponsored by: Bounce Experts --- www/mod_php80/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/www/mod_php80/Makefile b/www/mod_php80/Makefile index cb7d4ce11e35..775b9efc9b2a 100644 --- a/www/mod_php80/Makefile +++ b/www/mod_php80/Makefile @@ -1,13 +1,17 @@ +PORTREVISION= 1 CATEGORIES= www devel PKGNAMEPREFIX= mod_ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= bofh@FreeBSD.org + +CONFLICTS_INSTALL= mod_php[0-9][0-9] PHP_PORT= lang/php80 MASTERDIR= ${.CURDIR}/../../${PHP_PORT} -OPTIONS_DEFINE= AP2FILTER +OPTIONS_DEFINE= AP2FILTER +OPTIONS_EXCLUDE= CGI CLI EMBED FPM + AP2FILTER_DESC= Use Apache 2.x filter interface (experimental) -OPTIONS_EXCLUDE=CGI CLI FPM EMBED .include "${MASTERDIR}/Makefile"