diff options
author | ale <ale@FreeBSD.org> | 2009-07-21 16:27:37 +0800 |
---|---|---|
committer | ale <ale@FreeBSD.org> | 2009-07-21 16:27:37 +0800 |
commit | 8645e4e18ddd03d7d8cc751f6aa51a07c7d5cef8 (patch) | |
tree | 8fb2b2945762b07fbe528fc56ae1d09f41fdb6cc /databases/mysql50-server | |
parent | f054faa463df0605334c0071ac4705f43cc1cea0 (diff) | |
download | freebsd-ports-gnome-8645e4e18ddd03d7d8cc751f6aa51a07c7d5cef8.tar.gz freebsd-ports-gnome-8645e4e18ddd03d7d8cc751f6aa51a07c7d5cef8.tar.zst freebsd-ports-gnome-8645e4e18ddd03d7d8cc751f6aa51a07c7d5cef8.zip |
Update CONFLICTS.
Diffstat (limited to 'databases/mysql50-server')
-rw-r--r-- | databases/mysql50-server/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index 96b968082eae..29e30d0d378b 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -101,7 +101,7 @@ WANT_MYSQL_VER= 50 LATEST_LINK= mysql50-server -CONFLICTS= mysql-server-3.* mysql-server-4.* mysql-server-5.1.* mysql-server-6.* +CONFLICTS= mysql-server-3.* mysql-server-4.* mysql-server-5.[1-9].* mysql-server-6.* USE_RC_SUBR= mysql-server.sh @@ -186,7 +186,7 @@ post-install: .if defined(CLIENT_ONLY) LATEST_LINK= mysql50-client -CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.1.* mysql-client-6.* +CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.[1-9].* mysql-client-6.* MAN1= mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \ mysqlbinlog.1 mysqlbug.1 mysqlcheck.1 \ @@ -223,7 +223,7 @@ RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp LATEST_LINK= mysql50-scripts -CONFLICTS= mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.1.* mysql-scripts-6.* +CONFLICTS= mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.[1-9].* mysql-scripts-6.* MAN1= msql2mysql.1 mysql_convert_table_format.1 mysql_explain_log.1 mysql_find_rows.1 \ mysql_fix_extensions.1 mysql_secure_installation.1 \ |