From nobody Sat Jul 9 16:05:16 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 86C6917FD6E3; Sat, 9 Jul 2022 16:05:16 +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 4LgFNX3VPBz3ZHk; Sat, 9 Jul 2022 16:05:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657382716; 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=vKYTi28yW0B590jqSt6Kk2N0p14Y6c2GVfZO9OufqQY=; b=MYuPthg5JgezPJkazAnNodo0ew1jU0yluhs1mM6c2IATBQgwTzuGEMnZk0LOukfw1rfKH3 S7XdPbpf1cPBVB+aQstrop5Ty3597XtNgaYNZ4U+KIvykx2XRVAwCBw3JzB62WQZ67Qjpa o427rHUHBAFvyvu7OyMgclRXJKldiC6RMKdrT12JfoaB14X4ALVtkoLba4lXrSUJ7sdrq2 RegctzWb1nXS9yACtH6y5TprOLAe23ZSYnahpNzGqLAuWLFbnWp+Jc5ip1YyOfk9LNmgsb I5ty2IOkqbBoJPlVpo0rf1oH2cwTDSdrwCNaYpZFWUZvKk/asBgg6EmtRXrkmw== 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 4LgFNX2cZlzrmg; Sat, 9 Jul 2022 16:05:16 +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 269G5GBZ091628; Sat, 9 Jul 2022 16:05:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 269G5G1v091627; Sat, 9 Jul 2022 16:05:16 GMT (envelope-from git) Date: Sat, 9 Jul 2022 16:05:16 GMT Message-Id: <202207091605.269G5G1v091627@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: 7d9bad3564f1 - main - www/mod_php81: 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: 7d9bad3564f1b91c66af8a4524612c6c8e5a1ac5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657382716; 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=vKYTi28yW0B590jqSt6Kk2N0p14Y6c2GVfZO9OufqQY=; b=eTytnDCOJMbNcz/WLvnvhIsEjgPO5+EZJKBo9fkNrhFYA0JcYgvukBVH4SXnJA10vDOCX0 v37IYjbcUYEMrmWRNW59VT0iczVr3zMcysUBtObWSmYJLUCt5DXvdhUtVo0cur2NYFYaLR iP9jSI4OmGCgSdq4zx4QUEHA4Jix/CVLXBsYz/nqSIuHYJx1OkE3jg1rqTYVPob84KJ5cc HW0E3dgk1FtEYOp2dJi+HAPfqcpSWsFDktyhnxh4b0ybcmgusRfJKqMy61MxtVeu8FJ1lD ZLGLBgMVNZT03keRoPuGgs7NQOsDwxrPNEmde5EJtEdEItHT6EBusCoTdEmwGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657382716; a=rsa-sha256; cv=none; b=JUzWw+2yJ+OOT2hdfPab51d/BUFR49cw7JPTmg2hhnEiG9z5jOGVIc3I10svDscJtWm65L GIdcss9NSjvM4fQu/XFcgzGulAqRc2T+M/QzURSLpDp3+xwTvx4QB/llj1goaI3j3zvdth N482tiIdAVmPO9azCFnnyxl2uL9GuYu0XpuJgnTurxo++5VWGupY61LV/fZtk/aQ7yDRtC JfBtiZfmJuCkGgrpFtDatsDIeF7MSy/8/8lWXtzmSFaMutG4vt4NM9nPm83FMebQ4pjOkr Enjz31dVsDsEFK51HZeo8RB4V4rVCIfYyqkcmpAEB394W3RjtgYsYdExvKrxdw== 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=7d9bad3564f1b91c66af8a4524612c6c8e5a1ac5 commit 7d9bad3564f1b91c66af8a4524612c6c8e5a1ac5 Author: Muhammad Moinur Rahman AuthorDate: 2022-07-09 15:58:59 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-07-09 16:04:31 +0000 www/mod_php81: Fix CONFLICTS_INSTALL - After d4b3ad6 mod_php* ports creates CONFLICTS with php* ports itself Reported by: vvd@unislabs.com Fixes: d4b3ad make CONFLICTS_INSTALL visible to PHP module ports MFH: 2022Q3 Sponsored by: Bounce Experts --- www/mod_php81/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/www/mod_php81/Makefile b/www/mod_php81/Makefile index 5cf31b881fe6..71638d30ba29 100644 --- a/www/mod_php81/Makefile +++ b/www/mod_php81/Makefile @@ -1,13 +1,17 @@ +PORTREVISION= 1 CATEGORIES= www devel PKGNAMEPREFIX= mod_ MAINTAINER= bofh@FreeBSD.org +CONFLICTS_INSTALL= mod_php[0-9][0-9] + PHP_PORT= lang/php81 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"