git: 4f4a9060289c - main - www/joomla*: Update CONFLICTS, only contain the PKGBASE of the conflicting package [1]
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 15 May 2022 08:06:08 UTC
The branch main has been updated by wen:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4f4a9060289c7b226e5803850341e2053bc09a80
commit 4f4a9060289c7b226e5803850341e2053bc09a80
Author: Wen Heping <wen@FreeBSD.org>
AuthorDate: 2022-05-15 04:27:13 +0000
Commit: Wen Heping <wen@FreeBSD.org>
CommitDate: 2022-05-15 04:27:13 +0000
www/joomla*: Update CONFLICTS, only contain the PKGBASE of the conflicting package [1]
Change CONFLICTS to CONFLICTS_INSTALL
Spotted by: se@ [1]
---
www/joomla3/Makefile | 2 +-
www/joomla4/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/www/joomla3/Makefile b/www/joomla3/Makefile
index 26f455d7e0b7..49a6860e022b 100644
--- a/www/joomla3/Makefile
+++ b/www/joomla3/Makefile
@@ -16,7 +16,7 @@ USES= cpe php:web tar:bz2 shebangfix
CPE_VENDOR= ${PORTNAME}
CPE_PRODUCT= ${PORTNAME}\!
-CONFLICTS= joomla-4.1.[0-9]*
+CONFLICTS_INSTALL= joomla
NO_ARCH= yes
NO_BUILD= yes
diff --git a/www/joomla4/Makefile b/www/joomla4/Makefile
index ce8475c3a329..eea3176c09a7 100644
--- a/www/joomla4/Makefile
+++ b/www/joomla4/Makefile
@@ -13,7 +13,7 @@ USES= cpe php:web shebangfix zip
CPE_VENDOR= ${PORTNAME}
CPE_PRODUCT= ${PORTNAME}\!
-CONFLICTS= joomla-3.10.[0-9]*
+CONFLICTS_INSTALL= joomla3
NO_ARCH= yes
NO_BUILD= yes