aboutsummaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorBernard Spil <brnrd@FreeBSD.org>2015-11-18 10:51:14 +0000
committerBernard Spil <brnrd@FreeBSD.org>2015-11-18 10:51:14 +0000
commite30954c60548a0f825d2b93f09f2fadd66092b79 (patch)
tree261d184f3fd0d5d98cd25fa7275b2bc100655862 /Mk
parentb25dc6aa1f1ce6f3644662e32d09fced1d134f62 (diff)
downloadports-e30954c60548a0f825d2b93f09f2fadd66092b79.tar.gz
ports-e30954c60548a0f825d2b93f09f2fadd66092b79.zip
Notes
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.database.mk26
1 files changed, 8 insertions, 18 deletions
diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk
index 26ab48d50222..d16e4df8bc7a 100644
--- a/Mk/bsd.database.mk
+++ b/Mk/bsd.database.mk
@@ -101,7 +101,6 @@ WARNING+= "DEFAULT_MYSQL_VER is defined, consider using DEFAULT_VERSIONS=mysql=$
DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//}
# MySQL client version currently supported.
MYSQL51_LIBVER= 16
-MYSQL53m_LIBVER= 16
MYSQL55_LIBVER= 18
MYSQL55m_LIBVER= 18
MYSQL55p_LIBVER= 18
@@ -145,26 +144,17 @@ IGNORE= cannot install: MySQL versions mismatch: mysql${_MYSQL_VER}-client is i
.endif
.endif
-.if (${MYSQL_VER} == "53m")
-_MYSQL_CLIENT= databases/mariadb-client
-_MYSQL_SERVER= databases/mariadb-server
-.elif (${MYSQL_VER} == "55m")
-_MYSQL_CLIENT= databases/mariadb55-client
-_MYSQL_SERVER= databases/mariadb55-server
-.elif (${MYSQL_VER} == "100m")
-_MYSQL_CLIENT= databases/mariadb100-client
-_MYSQL_SERVER= databases/mariadb100-server
-.elif (${MYSQL_VER} == "55p")
-_MYSQL_CLIENT= databases/percona55-client
-_MYSQL_SERVER= databases/percona55-server
-.elif (${MYSQL_VER} == "56p")
-_MYSQL_CLIENT= databases/percona56-client
-_MYSQL_SERVER= databases/percona56-server
+.if (${MYSQL_VER:C/[0-9]*//} == "m")
+_MYSQL_FLAVOUR= mariadb
+.elif (${MYSQL_VER:C/[0-9]*//} == "p")
+_MYSQL_FLAVOUR= percona
.else
-_MYSQL_CLIENT= databases/mysql${MYSQL_VER}-client
-_MYSQL_SERVER= databases/mysql${MYSQL_VER}-server
+_MYSQL_FLAVOUR= mysql
.endif
+_MYSQL_CLIENT= databases/${_MYSQL_FLAVOUR}${MYSQL_VER:C/[mp]//}-client
+_MYSQL_SERVER= databases/${_MYSQL_FLAVOUR}${MYSQL_VER:C/[mp]//}-server
+
# And now we are checking if we can use it
.if defined(MYSQL${MYSQL_VER}_LIBVER)
.if defined(IGNORE_WITH_MYSQL)