diff options
| author | ale <ale@FreeBSD.org> | 2014-11-05 00:45:45 +0800 |
|---|---|---|
| committer | ale <ale@FreeBSD.org> | 2014-11-05 00:45:45 +0800 |
| commit | 34b59f21ca5931ba844a1bc4cf9aaac80fd33f23 (patch) | |
| tree | 57fe7b37ca450d944d354ec9f1a26b6f88b9a5e0 /databases | |
| parent | b6683a6786adf1ffb2c1045f1020a6686d25dc89 (diff) | |
| download | freebsd-ports-gnome-34b59f21ca5931ba844a1bc4cf9aaac80fd33f23.tar.gz freebsd-ports-gnome-34b59f21ca5931ba844a1bc4cf9aaac80fd33f23.tar.zst freebsd-ports-gnome-34b59f21ca5931ba844a1bc4cf9aaac80fd33f23.zip | |
Update CONFLICTS.
PR: 194810
Submitted by: spil.oss@gmail.com
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql55-client/Makefile | 4 | ||||
| -rw-r--r-- | databases/mysql55-server/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile index 0e2b6c11fc15..eb8ed1c7012b 100644 --- a/databases/mysql55-client/Makefile +++ b/databases/mysql55-client/Makefile @@ -12,7 +12,9 @@ PKGMESSAGE= mustnotexist PATCHDIR= ${.CURDIR}/files 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 diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index c24e55778652..7c373816b91f 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -63,7 +63,9 @@ CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 USE_MYSQL= yes 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 |