Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 9 Jul 2022 16:05:16 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 7d9bad3564f1 - main - www/mod_php81: Fix CONFLICTS_INSTALL
Message-ID:  <202207091605.269G5G1v091627@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7d9bad3564f1b91c66af8a4524612c6c8e5a1ac5

commit 7d9bad3564f1b91c66af8a4524612c6c8e5a1ac5
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2022-07-09 15:58:59 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
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"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207091605.269G5G1v091627>