aboutsummaryrefslogtreecommitdiffstats
path: root/databases/mysql55-server
diff options
context:
space:
mode:
authorale <ale@FreeBSD.org>2008-07-26 16:36:54 +0800
committerale <ale@FreeBSD.org>2008-07-26 16:36:54 +0800
commit6c930ecbaae4383847a7a8d22c0fafa11bb5439f (patch)
tree8b09fbc7a958abd08f9babcc37bd5799ae82dab9 /databases/mysql55-server
parent34eeee9a910c9212c0946ed45d38326743cd9569 (diff)
downloadfreebsd-ports-graphics-6c930ecbaae4383847a7a8d22c0fafa11bb5439f.tar.gz
freebsd-ports-graphics-6c930ecbaae4383847a7a8d22c0fafa11bb5439f.tar.zst
freebsd-ports-graphics-6c930ecbaae4383847a7a8d22c0fafa11bb5439f.zip
Update CONFLICTS and remove duplicated USE_PERL5.
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 7054148353c..92e5ce4d012 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