summaryrefslogtreecommitdiff
path: root/databases/mysql40-server
diff options
context:
space:
mode:
authorNorikatsu Shigemura <nork@FreeBSD.org>2003-12-26 16:56:52 +0000
committerNorikatsu Shigemura <nork@FreeBSD.org>2003-12-26 16:56:52 +0000
commit6af6d64e7e494614a3637c5366caf0166af94d39 (patch)
tree45351d6a427a16321ce16928b8216bd2977b3ebc /databases/mysql40-server
parent- Update to 5.16.4.8.5 (diff)
o Add CONFLICTS sections.
o Fix packages dependencies. o portlint clean o Correct typo in MASTER_SITES, Fix non-optimized build. PR: ports/60559 Submitted by: Alex Dupre <sysadmin@alexdupre.com>
Notes
Notes: svn path=/head/; revision=96629
Diffstat (limited to 'databases/mysql40-server')
-rw-r--r--databases/mysql40-server/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index e028d64a0040..28fe4529a63c 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -99,8 +99,9 @@ CXXFLAGS+= -fno-exceptions
.if !defined(CLIENT_ONLY)
USE_PERL5_RUN= yes
-RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql40-client \
- ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql40
+
+CONFLICTS= mysql-server-3.* mysql-server-4.[1-9].* mysql-server-5.*
PLIST_SUB= MYSQL_VERSION=${PORTVERSION}
@@ -170,6 +171,8 @@ post-install:
# MySQL-Client part
.else
+CONFLICTS= mysql-client-3.* mysql-client-4.[1-9].* mysql-client-5.*
+
MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \
mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \
mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1