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-server | |
| 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-server')
| -rw-r--r-- | databases/mariadb-server/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/databases/mariadb-server/Makefile b/databases/mariadb-server/Makefile index 1d00223bfb60..e655ca65ed3a 100644 --- a/databases/mariadb-server/Makefile +++ b/databases/mariadb-server/Makefile @@ -22,7 +22,7 @@ LICENSE= GPLv2 UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} -CONFLICTS?= mysql-server-[0-9]* +CONFLICTS?= mysql-server-[0-9]* percona-server-[0-9]* mariadb-server-5.[0-24-9].* mariadb-server-[0-46-9].* GNU_CONFIGURE= yes |