diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2013-01-17 16:43:07 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2013-01-17 16:43:07 +0000 |
| commit | c12f3598864fe559427580b8d6290137e6dcde03 (patch) | |
| tree | 27d4e5802f7275c64de60bd9d9138f07b39bca5c /databases/mysql55-client | |
| parent | b8cc06a151d7b2d0856ae516e6d3c48dc3b745cf (diff) | |
| download | ports-c12f3598864fe559427580b8d6290137e6dcde03.tar.gz ports-c12f3598864fe559427580b8d6290137e6dcde03.zip | |
Update CONFLCITS after the addition of percona55-* and mariadb55-*
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=310554
Diffstat (limited to 'databases/mysql55-client')
| -rw-r--r-- | databases/mysql55-client/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile index a58a46a97ce0..b0eea8d5c26f 100644 --- a/databases/mysql55-client/Makefile +++ b/databases/mysql55-client/Makefile @@ -18,7 +18,7 @@ PLIST= ${.CURDIR}/pkg-plist LATEST_LINK= mysql55-client -CONFLICTS_INSTALL= mysql-client-[34].* mysql-client-5.[0-46-9].* +CONFLICTS_INSTALL= mysql-client-[34].* mysql-client-5.[0-46-9].* mariadb-client-5.* percona-client-5.* CMAKE_ARGS+= -DWITHOUT_SERVER=1 |