diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2008-07-26 08:36:54 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2008-07-26 08:36:54 +0000 |
| commit | 2c7da133d634df9ae525e44d461dd95d9d457525 (patch) | |
| tree | c0909ac5b5bb57ea641fac32345a87cba1ad730f /databases/mysql40-server/Makefile | |
| parent | Add MySQL 6.0.5-alpha release. (diff) | |
Update CONFLICTS and remove duplicated USE_PERL5.
Notes
Notes:
svn path=/head/; revision=217548
Diffstat (limited to 'databases/mysql40-server/Makefile')
| -rw-r--r-- | databases/mysql40-server/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile index 4e9b9ebf3f65..cc484fcb8206 100644 --- a/databases/mysql40-server/Makefile +++ b/databases/mysql40-server/Makefile @@ -86,7 +86,7 @@ WANT_MYSQL_VER= 40 LATEST_LINK= mysql40-server -CONFLICTS= mysql-server-3.* mysql-server-4.[1-9].* mysql-server-5.* +CONFLICTS= mysql-server-3.* mysql-server-4.[1-9].* mysql-server-5.* mysql-server-6.* USE_RC_SUBR= mysql-server.sh @@ -132,7 +132,7 @@ post-install: .if defined(CLIENT_ONLY) LATEST_LINK= mysql40-client -CONFLICTS= mysql-client-3.* mysql-client-4.[1-9].* mysql-client-5.* +CONFLICTS= mysql-client-3.* mysql-client-4.[1-9].* mysql-client-5.* mysql-client-6.* MAN1= mysql.1 mysqladmin.1 mysqldump.1 mysqlshow.1 @@ -162,7 +162,7 @@ RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp LATEST_LINK= mysql40-scripts -CONFLICTS= mysql-scripts-3.* mysql-scripts-4.[1-9].* mysql-scripts-5.* +CONFLICTS= mysql-scripts-3.* mysql-scripts-4.[1-9].* mysql-scripts-5.* mysql-scripts-6.* MAN1= mysql_zap.1 mysqlaccess.1 mysqld_multi.1 mysql_fix_privilege_tables.1 |