diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2009-07-21 08:27:37 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2009-07-21 08:27:37 +0000 |
| commit | 813ae9bd0dac10368319bd00c94de20f144a25ff (patch) | |
| tree | 7e8d24cf9b11d61e122661b9e0a2ec7fa7154fb4 /databases/mysql51-server | |
| parent | 6da08f829643d8dfe40a5fdda0505fc6c9146941 (diff) | |
| download | ports-813ae9bd0dac10368319bd00c94de20f144a25ff.tar.gz ports-813ae9bd0dac10368319bd00c94de20f144a25ff.zip | |
Update CONFLICTS.
Notes
Notes:
svn path=/head/; revision=238155
Diffstat (limited to 'databases/mysql51-server')
| -rw-r--r-- | databases/mysql51-server/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index 1fde344f2985..a61073e86068 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-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.* mysql-server-6.* +CONFLICTS= mysql-server-3.* mysql-server-4.* mysql-server-5.[04].* mysql-server-6.* USE_RC_SUBR= mysql-server.sh @@ -163,7 +163,7 @@ post-install: .if defined(CLIENT_ONLY) LATEST_LINK= mysql51-client -CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.0.* mysql-client-6.* +CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.[04].* mysql-client-6.* MAN1= mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \ mysqlbinlog.1 mysqlbug.1 mysqlcheck.1 \ @@ -196,7 +196,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.* mysql-scripts-6.* +CONFLICTS= mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.[04].* mysql-scripts-6.* MAN1= msql2mysql.1 mysql_convert_table_format.1 mysql_find_rows.1 \ mysql_fix_extensions.1 mysql_secure_installation.1 \ |