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 | |
| parent | Add MySQL 5.4.1-beta. (diff) | |
Update CONFLICTS.
Notes
Notes:
svn path=/head/; revision=238155
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql50-server/Makefile | 6 | ||||
| -rw-r--r-- | databases/mysql51-server/Makefile | 6 | ||||
| -rw-r--r-- | databases/p5-DBD-mysql51/Makefile | 2 |
3 files changed, 7 insertions, 7 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 \ 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 \ diff --git a/databases/p5-DBD-mysql51/Makefile b/databases/p5-DBD-mysql51/Makefile index 43e188aded27..39c4d119d5eb 100644 --- a/databases/p5-DBD-mysql51/Makefile +++ b/databases/p5-DBD-mysql51/Makefile @@ -9,7 +9,7 @@ PKGNAMESUFFIX= 51 COMMENT= MySQL 5.1 driver for the Perl5 Database Interface (DBI) -CONFLICTS= p5-Mysql-modules-[0-9]* p5-DBD-mysql-[0-9]* p5-DBD-mysql4[0-9]-[0-9]* p5-DBD-mysql50-[0-9]* p5-DBD-mysql6[0-9]-[0-9]* +CONFLICTS= p5-Mysql-modules-[0-9]* p5-DBD-mysql-[0-9]* p5-DBD-mysql4[0-9]-[0-9]* p5-DBD-mysql5[04]-[0-9]* p5-DBD-mysql6[0-9]-[0-9]* WANT_MYSQL_VER= 51 |