git: d4b3ad64a4ca - main - lang/php??: make CONFLICTS_INSTALL visible to PHP module ports

The branch main has been updated by se:

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

commit d4b3ad64a4ca97d38fdce4ff6821758b5c2a9dcb
Author:     Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2022-02-06 18:46:36 +0000
Commit:     Stefan Eßer <se@FreeBSD.org>
CommitDate: 2022-02-06 18:46:36 +0000

    lang/php??: make CONFLICTS_INSTALL visible to PHP module ports
    
    The definition of CONFLICTS_INSTALL already included ${PKGNAMESUFFIX},
    but in a block that was conditional on ${PKGNAMESUFFIX} not being
    defined, defying the purpose.
    
    After this change all ports that refer to the lang/php?? interpreter
    ports get an automatic CONFLICTS_INSTALL definition that prevents the
    installation of the same module for multiple interpreter versions.
    
    This change adds correct CONFLICTS_INSTALL definitions to hundreds of
    PHP ports that previously lacked any such definition.
    
    PHP modules can override this generated CONFLICTS_INSTALL definition
    in their Makefiles, if required.
    
    Approved by:    portmgr (implicit)
---
 lang/php74/Makefile | 4 ++--
 lang/php80/Makefile | 4 ++--
 lang/php81/Makefile | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lang/php74/Makefile b/lang/php74/Makefile
index e5984688cca2..844391f2b287 100644
--- a/lang/php74/Makefile
+++ b/lang/php74/Makefile
@@ -18,6 +18,8 @@ USES+=		compiler:c11 tar:xz cpe gnome pkgconfig
 CPE_PRODUCT=	php
 NO_OPTIONS_SORT=yes
 
+CONFLICTS_INSTALL?=	php[0-9][0-9]${PKGNAMESUFFIX}
+
 .if !defined(PKGNAMESUFFIX)
 LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 \
 		libargon2.so:security/libargon2
@@ -36,8 +38,6 @@ USE_GNOME=	libxml2
 # PR230207 Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-z,notext
 
-CONFLICTS_INSTALL=	php[0-9][0-9]${PKGNAMESUFFIX}
-
 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MYSQLND LINKTHR ZTS
 OPTIONS_DEFAULT=CLI CGI FPM EMBED MYSQLND LINKTHR DTRACE
 OPTIONS_EXCLUDE_DragonFly=	DTRACE
diff --git a/lang/php80/Makefile b/lang/php80/Makefile
index 1e7c99b06cdf..940c5d9d106e 100644
--- a/lang/php80/Makefile
+++ b/lang/php80/Makefile
@@ -14,6 +14,8 @@ LICENSE=	PHP301
 USES+=		compiler:c11 tar:xz cpe gnome pkgconfig
 CPE_PRODUCT=	php
 
+CONFLICTS_INSTALL?=	php[0-9][0-9]${PKGNAMESUFFIX}
+
 .if !defined(PKGNAMESUFFIX)
 LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 \
 		libargon2.so:security/libargon2
@@ -32,8 +34,6 @@ CPPFLAGS=	-I${LOCALBASE}/include
 # PR230207 Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-z,notext
 
-CONFLICTS_INSTALL=	php[0-9][0-9]${PKGNAMESUFFIX}
-
 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MYSQLND MYSQL80 LINKTHR ZTS
 OPTIONS_DEFAULT=CLI CGI FPM EMBED MYSQLND LINKTHR DTRACE
 OPTIONS_EXCLUDE_DragonFly=	DTRACE
diff --git a/lang/php81/Makefile b/lang/php81/Makefile
index 8220c29387f4..4206fea49ec7 100644
--- a/lang/php81/Makefile
+++ b/lang/php81/Makefile
@@ -14,6 +14,8 @@ USES+=		compiler:c11 cpe gnome pkgconfig tar:xz
 CPE_PRODUCT=	php
 PHP_VER=	81
 
+CONFLICTS_INSTALL?=	php[0-9][0-9]${PKGNAMESUFFIX}
+
 .if !defined(PKGNAMESUFFIX)
 LIB_DEPENDS=	libargon2.so:security/libargon2 \
 		libpcre2-8.so:devel/pcre2
@@ -35,8 +37,6 @@ CPPFLAGS=	-I${LOCALBASE}/include
 # PR230207 Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-z,notext
 
-CONFLICTS_INSTALL=	php[0-9][0-9]${PKGNAMESUFFIX}
-
 OPTIONS_DEFINE+=		CGI CLI DEBUG DTRACE EMBED FPM IPV6 LINKTHR \
 				MYSQL80 MYSQLND PHPDBG ZTS
 OPTIONS_DEFAULT=		CGI CLI DTRACE EMBED FPM LINKTHR MYSQLND