Date: Thu, 30 Sep 2021 19:36:42 GMT From: Torsten Zuehlsdorff <tz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1eeec1bd06b6 - main - lang/php7*: adjust CONFLICTS to new versions Message-ID: <202109301936.18UJag8e093373@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tz: URL: https://cgit.FreeBSD.org/ports/commit/?id=1eeec1bd06b608d58ef7ee52471883e0c49fa96a commit 1eeec1bd06b608d58ef7ee52471883e0c49fa96a Author: Torsten Zuehlsdorff <tz@FreeBSD.org> AuthorDate: 2021-09-30 19:32:17 +0000 Commit: Torsten Zuehlsdorff <tz@FreeBSD.org> CommitDate: 2021-09-30 19:36:22 +0000 lang/php7*: adjust CONFLICTS to new versions PHP 7.3 conflicted with versions no longer in the ports-tree. Remove this conflicts. PHP 7.3 and 7.4 did not conflict with PHP 8.0. Add the missing conflict. PR: 258803 Reported by: Einar Bjarni Halldórsson <einar@isnic.is> Sponsored by: Bounce Experts --- lang/php73/Makefile | 2 +- lang/php74/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/php73/Makefile b/lang/php73/Makefile index 08790d95cbb0..8a4594fa8210 100644 --- a/lang/php73/Makefile +++ b/lang/php73/Makefile @@ -59,7 +59,7 @@ MYSQLND_DESC= Build with MySQL Native Driver LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build -CONFLICTS= php56-* php70-* php71-* php72-* +CONFLICTS= php74-* php80-* DESTDIRNAME= INSTALL_ROOT diff --git a/lang/php74/Makefile b/lang/php74/Makefile index 1cc5ba119945..ce14e4aff5f4 100644 --- a/lang/php74/Makefile +++ b/lang/php74/Makefile @@ -59,7 +59,7 @@ MYSQLND_DESC= Build with MySQL Native Driver LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build -CONFLICTS= php71-* php72-* php73-* +CONFLICTS= php73-* php80-* DESTDIRNAME= INSTALL_ROOT
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109301936.18UJag8e093373>