summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJochen Neumeister <joneum@FreeBSD.org>2019-12-29 12:50:28 +0000
committerJochen Neumeister <joneum@FreeBSD.org>2019-12-29 12:50:28 +0000
commit82edc3da30e8bef80a3aecb819ddeeae31a4b7a5 (patch)
tree1102983a635e702df9b4aec0027601010d44eb2f
parentAdd rubygem-async-pool 0.2.0 (diff)
Add CONFLICTS_INSTALL=
Sponsored by: Netzkommune GmbH
-rw-r--r--databases/phpmyadmin/Makefile2
-rw-r--r--databases/phpmyadmin5/Makefile2
2 files changed, 4 insertions, 0 deletions
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 6f0613be01b1..e7494a9786f7 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -14,6 +14,8 @@ COMMENT= Set of PHP-scripts to manage MySQL over the web
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
+CONFLICTS_INSTALL= phpmyadmin5
+
USES= cpe php:web,flavors tar:xz
CPE_PRODUCT= ${PORTNAME:tl}
diff --git a/databases/phpmyadmin5/Makefile b/databases/phpmyadmin5/Makefile
index d87920766a41..e548c2608a54 100644
--- a/databases/phpmyadmin5/Makefile
+++ b/databases/phpmyadmin5/Makefile
@@ -13,6 +13,8 @@ COMMENT= Set of PHP-scripts to manage MySQL over the web
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
+CONFLICTS_INSTALL= phpmyadmin
+
USES= cpe php:web,flavors tar:xz
CPE_PRODUCT= ${PORTNAME:tl}