Update CONFLICTS.

PR:		194810
Submitted by:	spil.oss@gmail.com
This commit is contained in:
Alex Dupre 2014-11-04 16:45:45 +00:00
parent 1f4338e28f
commit 07e30da27e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=372152
2 changed files with 6 additions and 2 deletions

View file

@ -12,7 +12,9 @@ PKGMESSAGE= mustnotexist
PATCHDIR= ${.CURDIR}/files PATCHDIR= ${.CURDIR}/files
PLIST= ${.CURDIR}/pkg-plist PLIST= ${.CURDIR}/pkg-plist
CONFLICTS_INSTALL= mysql5.[0-46-9]-client-* mysql[0-46-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona[0-9][0-9]-client-* CONFLICTS_INSTALL= mysql5[0-46-9]-client-* \
mariadb*-client-* \
percona*-client-*
CMAKE_ARGS+= -DWITHOUT_SERVER=1 CMAKE_ARGS+= -DWITHOUT_SERVER=1

View file

@ -63,7 +63,9 @@ CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1
USE_MYSQL= yes USE_MYSQL= yes
WANT_MYSQL_VER= 55 WANT_MYSQL_VER= 55
CONFLICTS_INSTALL= mysql5.[0-46-9]-server-* mysql[0-46-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona[0-9][0-9]-server-* CONFLICTS_INSTALL= mysql5[0-46-9]-server-* \
mariadb*-server-* \
percona*-server-*
USE_RC_SUBR= mysql-server USE_RC_SUBR= mysql-server