aboutsummaryrefslogtreecommitdiff
path: root/databases/mysql55-server
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2008-07-26 08:36:54 +0000
committerAlex Dupre <ale@FreeBSD.org>2008-07-26 08:36:54 +0000
commit2c7da133d634df9ae525e44d461dd95d9d457525 (patch)
treec0909ac5b5bb57ea641fac32345a87cba1ad730f /databases/mysql55-server
parent25c217fb62746a1a6abac6a6ffd6fdd3a36c2d6a (diff)
downloadports-2c7da133d634df9ae525e44d461dd95d9d457525.tar.gz
ports-2c7da133d634df9ae525e44d461dd95d9d457525.zip
Notes
Diffstat (limited to 'databases/mysql55-server')
-rw-r--r--databases/mysql55-server/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 7054148353c3..92e5ce4d0121 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -91,7 +91,7 @@ WANT_MYSQL_VER= 51
LATEST_LINK= mysql51-server
-CONFLICTS= mysql-server-3.* mysql-server-4.* mysql-server-5.0.*
+CONFLICTS= mysql-server-3.* mysql-server-4.* mysql-server-5.0.* mysql-server-6.*
USE_RC_SUBR= mysql-server.sh
@@ -149,7 +149,7 @@ post-install:
.if defined(CLIENT_ONLY)
LATEST_LINK= mysql51-client
-CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.0.*
+CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.0.* mysql-client-6.*
MAN1= mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \
mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1
@@ -184,7 +184,7 @@ RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
LATEST_LINK= mysql51-scripts
-CONFLICTS= mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.0.*
+CONFLICTS= mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.0.* mysql-scripts-6.*
MAN1= msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \
mysqld_multi.1 mysql_fix_privilege_tables.1