diff options
| author | ale <ale@FreeBSD.org> | 2014-11-05 00:44:33 +0800 |
|---|---|---|
| committer | ale <ale@FreeBSD.org> | 2014-11-05 00:44:33 +0800 |
| commit | b6683a6786adf1ffb2c1045f1020a6686d25dc89 (patch) | |
| tree | 4c47bff1383333c3eaae4d65e1d991b292faa6c7 /databases | |
| parent | 55e317b914939ff747dceae2344bb169fa77a79b (diff) | |
| download | freebsd-ports-gnome-b6683a6786adf1ffb2c1045f1020a6686d25dc89.tar.gz freebsd-ports-gnome-b6683a6786adf1ffb2c1045f1020a6686d25dc89.tar.zst freebsd-ports-gnome-b6683a6786adf1ffb2c1045f1020a6686d25dc89.zip | |
Update CONFLICTS.
PR: 194809
Submitted by: spil.oss@gmail.com
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql51-server/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index 8aac649a46de..c026b74dabc6 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -90,7 +90,9 @@ CXXFLAGS+= -fno-exceptions USE_MYSQL= yes WANT_MYSQL_VER= 51 -CONFLICTS_INSTALL= mysql5.[02-9]-server-* mysql[0-46-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona[0-9][0-9]-server-* +CONFLICTS_INSTALL= mysql5[2-9]-server-* \ + mariadb*-server-* \ + percona*-server-* USE_RC_SUBR= mysql-server @@ -158,7 +160,9 @@ post-patch: .else # MySQL-Client part .if defined(CLIENT_ONLY) -CONFLICTS_INSTALL= mysql5.[02-9]-client-* mysql[0-46-9][0-9]-client-* +CONFLICTS_INSTALL= mysql5[02-9]-client-* \ + mariadb*-client-* \ + percona*-client-* MAN1= mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \ mysqlbinlog.1 mysqlbug.1 mysqlcheck.1 \ @@ -186,7 +190,7 @@ WANT_MYSQL_VER= 51 RUN_DEPENDS= p5-DBD-mysql51>=0:${PORTSDIR}/databases/p5-DBD-mysql51 -CONFLICTS_INSTALL= mysql[0-46-9][0-9]-scripts-* mysql5.[02-9]-scripts-* +CONFLICTS_INSTALL= mariadb51-scripts-* MAN1= msql2mysql.1 mysql_convert_table_format.1 mysql_find_rows.1 \ mysql_fix_extensions.1 mysql_secure_installation.1 \ |