mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-11 02:50:24 +00:00
Code Issues Releases Activity

lang/php??: make CONFLICTS_INSTALL visible to PHP module ports

Browse Source 
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)
This commit is contained in:
Stefan Eßer 2022-02-06 19:46:36 +01:00
parent bdd2d4af96
commit d4b3ad64a4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/php74/Makefile
View File

@ -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

4
lang/php80/Makefile
View File

@ -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

4
lang/php81/Makefile
View File

@ -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