From nobody Sat Jul 09 16:05:17 2022 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 A8C1217FD7B7; Sat, 9 Jul 2022 16:05:17 +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 4LgFNY4XNsz3Zdd; Sat, 9 Jul 2022 16:05:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657382717; 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=r5Z14iYPLU/cBtMAR1HNL8HS4ExbHIXPBFyVSKocFVA=; b=t9zobS5XCFuaTjK6zDumUNANBYsZAdgW8Tsq/q9w97q9gNakf1Oyq2uKTD8jGMb/i4/wKH cRzQaao8nLcDqrN1FlGbt1dCVyEXSl9AQPQWuTN9S7z0OI05zLw+86c9oKK51eG0lEldJ/ Cn4kCT1Q3kYke47iGz2+XAVu/YdKXMdE5LStNwil0JqBzR4I3mYb7GY83QD6B4ZIK2aHZY UxWOfEQgcP2RPzgWnQPmvVl50/s1OiMH1ybcYIIAPpVwi6exc92pyqtw/FN9pM+pFUmt4S rBprwsBTqSZ8oGapXmI3fQ2Z0wsfUO6KLPXRG9nLcOvplxVjVZsaqZEVRR1xtg== 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 4LgFNY3fnQzrqK; Sat, 9 Jul 2022 16:05:17 +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 269G5HQ6091652; Sat, 9 Jul 2022 16:05:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 269G5HVa091651; Sat, 9 Jul 2022 16:05:17 GMT (envelope-from git) Date: Sat, 9 Jul 2022 16:05:17 GMT Message-Id: <202207091605.269G5HVa091651@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: b6a5dae387e5 - main - www/mod_php82: Fix CONFLICTS_INSTALL 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6a5dae387e5e5a21293a4e96ccf85f9670d9838 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657382717; 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=r5Z14iYPLU/cBtMAR1HNL8HS4ExbHIXPBFyVSKocFVA=; b=blkxDDn0UtkL20CyrYhGDpfBxz5NloFqFJFN3rlmnrsQS1BIUIWABO1iF+ua5W0C26j6d8 p8UZsy3UrJ5+IlLTxBVyhQGRtKa9NOV2wGVWhfxyHxleTDNVoCz6hEss+2R965P9MSD/5g muPhtKb/9fgGWLPwIpElkINSpWawWKXb8yU327hTFlxawUaQv9krNVsNPWSirMzqi7+2e4 HlaMiFd6gSzI7YSJmoJl+JLyKLmJJjLzz1jiTBYSZgs9537TDCmyWuq6L5NRF3xn6ZFdIF S3X/drTtFD2Ua5gG/O9sY14Vl6lVxbtXz0Ry8GdttrYDqg3zmJKd3e7UaBsO1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657382717; a=rsa-sha256; cv=none; b=BFQpAd4TmKrja4EjOa+NfHMrQor/gKXKdp6q1LbYhFbBcEPygoqYcQxi01wBoJZsdfsSOC QmdAn8A6s5JGCyzkG1bi5WgplbLcrcxeEtxpJXrqZnnzVc8M7hOtCrz0OUNcuBtLCDcg0M Rx5LDs+hEpkOd+L6/AF70aOZ1yNnYxDB7gm+k1iEhwKAUbt+PeRcN3DMF275n2TnDYu2bh eQWpalIYX48quYgY89GTVPGM9nZxzEBGgGYu6Mb9+coGqZzzieJGjUKUL6WELeXzZk8kba m/dETXo0Yf+ZIallCeSLwMbqfhyBZqDGOEyPkjrUWsayzn1jgbUYcRJSKNctTw== 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=b6a5dae387e5e5a21293a4e96ccf85f9670d9838 commit b6a5dae387e5e5a21293a4e96ccf85f9670d9838 Author: Muhammad Moinur Rahman AuthorDate: 2022-07-09 16:02:46 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-07-09 16:04:31 +0000 www/mod_php82: Fix CONFLICTS_INSTALL Reported by: vvd@unislabs.com Sponsored by: Bounce Experts --- www/mod_php82/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/www/mod_php82/Makefile b/www/mod_php82/Makefile index 00d1ffb339c6..e19c3db1595f 100644 --- a/www/mod_php82/Makefile +++ b/www/mod_php82/Makefile @@ -1,12 +1,16 @@ +PORTREVISION= 1 CATEGORIES= www devel PKGNAMEPREFIX= mod_ MAINTAINER= bofh@FreeBSD.org +CONFLICTS_INSTALL= mod_php[0-9][0-9] + MASTERDIR= ${.CURDIR}/../../lang/php82 -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"