diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2014-11-06 11:05:26 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2014-11-06 11:05:26 +0000 |
| commit | 5b75bfae2ec55189e328dc011b2a1cd78c02db10 (patch) | |
| tree | 36fd5a94bccb497c068e5b8740a2cdb01afcccb7 /databases | |
| parent | security/logcheck: update 1.3.16 -> 1.3.17 (diff) | |
Update CONFLICTS.
PR: 194819
Submitted by: spil.oss@gmail.com
Notes
Notes:
svn path=/head/; revision=372220
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql56-client/Makefile | 4 | ||||
| -rw-r--r-- | databases/mysql56-server/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/databases/mysql56-client/Makefile b/databases/mysql56-client/Makefile index 83e7b7d4e01b..8723f02c1cea 100644 --- a/databases/mysql56-client/Makefile +++ b/databases/mysql56-client/Makefile @@ -12,7 +12,9 @@ PKGMESSAGE= mustnotexist PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist -CONFLICTS_INSTALL= mysql5.[0-57-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-57-9]-client-* \ + mariadb*-client-* \ + percona*-client-* CMAKE_ARGS+= -DWITHOUT_SERVER=1 diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile index f1cc4aded935..7b726ba56b26 100644 --- a/databases/mysql56-server/Makefile +++ b/databases/mysql56-server/Makefile @@ -47,7 +47,9 @@ WANT_MYSQL_VER= 56 USES+= perl5 USE_PERL5= run -CONFLICTS_INSTALL= mysql5.[0-57-9]-server-* mysql[0-46-9][0-9]-server-* percona[0-9][0-9]-server-* mariadb[0-9][0-9]-server-* +CONFLICTS_INSTALL= mysql5[0-57-9]-server-* \ + mariadb*-server-* \ + percona*-server-* USE_RC_SUBR= mysql-server |