diff options
author | flo <flo@FreeBSD.org> | 2013-01-18 00:43:07 +0800 |
---|---|---|
committer | flo <flo@FreeBSD.org> | 2013-01-18 00:43:07 +0800 |
commit | 2c6bcf4fd9262751cde5bee1003c145f08f1bd53 (patch) | |
tree | 27d4e5802f7275c64de60bd9d9138f07b39bca5c /databases/mariadb-client | |
parent | d4ef1e3e68b4c838ff0f3364c52db28c779c5f45 (diff) | |
download | freebsd-ports-gnome-2c6bcf4fd9262751cde5bee1003c145f08f1bd53.tar.gz freebsd-ports-gnome-2c6bcf4fd9262751cde5bee1003c145f08f1bd53.tar.zst freebsd-ports-gnome-2c6bcf4fd9262751cde5bee1003c145f08f1bd53.zip |
Update CONFLCITS after the addition of percona55-* and mariadb55-*
Approved by: maintainer
Diffstat (limited to 'databases/mariadb-client')
-rw-r--r-- | databases/mariadb-client/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/databases/mariadb-client/Makefile b/databases/mariadb-client/Makefile index 44a21bfba653..508193c96b8b 100644 --- a/databases/mariadb-client/Makefile +++ b/databases/mariadb-client/Makefile @@ -16,7 +16,7 @@ OPTIONS_DEFINE= THREADSAFE OPTIONS_DEFAULT= THREADSAFE THREADSAFE_DESC= Build thread-safe client -CONFLICTS= mysql-client-[0-9]* +CONFLICTS= mysql-client-[0-9]* mariadb-client-5.[0-24-9].* percona-client-5.* PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist |