From nobody Sat Jul 9 16:05:13 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 44CA217FD728; Sat, 9 Jul 2022 16:05:14 +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 4LgFNV1SpQz3ZXg; Sat, 9 Jul 2022 16:05:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657382714; 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=IwgBoDq2Eg0vXd/ee6AyQhKraLD6EpnNAtXvCBgDmuM=; b=Q/Lv7gT5O6u6lTcR48MJlmmj0CGtQFFWrt5AKINwdcGiXWV8TV3N59esFUz7lsSQofPSPF A0AYpmemXmSXbw46IVeqQIi6yPs0PLGKjH5wKhQHdCJjyIPaDpX906jSTieWB7ZwEbhq30 B1JZVIS9A3xls627f/SMO4r8iFeUO9cgTnMFxuqnVFjehYL3H0CAb7AZFirCJjj16YtwJI LzEZiPaIicl0Q8T9u8VMc5vs4OT5TmPS2oFXipTzYsbJgywP7BwPBb3p761z4ksQlhE0+C JzPz7o4AxPgnYBFGhYyzQ6Jd6cIgjrMmWPunOiGWZwBXPSrm81tA6OqS6HYGkw== 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 4LgFNV0WDTzrMg; Sat, 9 Jul 2022 16:05:14 +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 269G5D1p091580; Sat, 9 Jul 2022 16:05:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 269G5DHW091579; Sat, 9 Jul 2022 16:05:13 GMT (envelope-from git) Date: Sat, 9 Jul 2022 16:05:13 GMT Message-Id: <202207091605.269G5DHW091579@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: 379250cab056 - main - www/mod_php74: 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: 379250cab056cb669b87532e7f1773826d5f09ca Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657382714; 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=IwgBoDq2Eg0vXd/ee6AyQhKraLD6EpnNAtXvCBgDmuM=; b=AQpYRT2bJjYf8mtPPEJgeSxW8TO1ht0FGNKZ6ruhlfSfB3F+t7VbOfWFHJfTcmbZKkVdCe hR7er35Y80VZ3e/MlsBBRy40UyN1WVb89jX8i2EcETGiSzCCrj8vfpoeOSIxbDqO3j1ZxB 1TxZ94nA111j11PFkNmuFLuwRpzEE+e+OvBMLU/7AziipyxRNHpjN/cgC51Ve0uYItcqXq koEvA7vS2N6fr1b9ZhNoKKQbKg5tmy2CVqJ4UZSmT6veWSlOvDrhnrhGs3VhUwCSgIFzw1 qXO0FoxPNnBplLdEaoKnUBA7W9hkdfqk4I/cIzMJsYG5Wdid3ATFiVhcdCw1RA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657382714; a=rsa-sha256; cv=none; b=CW9E1CnaUApE7CCD27bGGD6bj6G76wkSGtJdRpBeUf//2JwAbkRg/EIRn0k7OoZPLkKgsy eaDQ7LAPSZ8XyUdO3DNZ0z8MMBxiHRbP+ltOvgvRMlwM+2GyNu1BMI8TADtIULmUu4f67x 1Oqxn1wrKW5TAgS7nyGT8uK+tqvluhW7Vahh0ahnVU7VTVnOfAcAjGXZzZCsf9nslT3eaV wZ+1CnP2/4hcy8MmgQUBmbuFWEHyY1zzrVDyFmJywX0i4HFeQWUyQH6QWoTJhVtbJtjgXU 4nlflTK3sXYLNbdzQ1xqm9g3CBVRXJRE/cKKpcHb9PI+yI7bVqDej6YDNIXq/Q== 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=379250cab056cb669b87532e7f1773826d5f09ca commit 379250cab056cb669b87532e7f1773826d5f09ca Author: Muhammad Moinur Rahman AuthorDate: 2022-07-09 15:45:14 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-07-09 16:04:30 +0000 www/mod_php74: 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_php74/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/www/mod_php74/Makefile b/www/mod_php74/Makefile index 1c81ca2d3c57..d1fa2c1abc2c 100644 --- a/www/mod_php74/Makefile +++ b/www/mod_php74/Makefile @@ -1,13 +1,16 @@ +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/php74 MASTERDIR= ${.CURDIR}/../../${PHP_PORT} -OPTIONS_DEFINE= AP2FILTER -AP2FILTER_DESC= Use Apache 2.x filter interface (experimental) -OPTIONS_EXCLUDE=CGI CLI FPM EMBED +OPTIONS_DEFINE= AP2FILTER +OPTIONS_EXCLUDE= CGI CLI EMBED FPM +AP2FILTER_DESC= Use Apache 2.x filter interface (experimental) .include "${MASTERDIR}/Makefile"