aboutsummaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authorDennis Herrmann <dhn@FreeBSD.org>2012-04-29 16:16:23 +0800
committerDennis Herrmann <dhn@FreeBSD.org>2012-04-29 16:16:23 +0800
commit88d9900dd2652587ba325a4ddc4745955f9a626b (patch)
tree0013689aab27914dde8096e50c719ff1195baa68 /databases
parent08fca51da9607fe14fda9aa50dab4ee7dd6b6070 (diff)
downloadfreebsd-ports-gnome-88d9900dd2652587ba325a4ddc4745955f9a626b.tar.gz
freebsd-ports-gnome-88d9900dd2652587ba325a4ddc4745955f9a626b.tar.zst
freebsd-ports-gnome-88d9900dd2652587ba325a4ddc4745955f9a626b.zip
- Add CONFLICTS with databases/mytop
Reported by: Matthew Seaman <matthew@freebsd.org>
Diffstat (limited to 'databases')
-rw-r--r--databases/mariadb-scripts/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/databases/mariadb-scripts/Makefile b/databases/mariadb-scripts/Makefile
index dbf2f565e994..bd912832bd90 100644
--- a/databases/mariadb-scripts/Makefile
+++ b/databases/mariadb-scripts/Makefile
@@ -17,7 +17,8 @@ USE_PERL5= yes
MASTERDIR= ${.CURDIR}/../mariadb-server
MARIADB_SCRIPTS_SLAVE= yes
-CONFLICTS= mysql-scripts-[0-9]*
+CONFLICTS= mysql-scripts-[0-9]* \
+ mytop-[0-9]*
PATCHDIR= ${.CURDIR}/files
PLIST= ${.CURDIR}/pkg-plist