From owner-svn-ports-head@freebsd.org Fri May 26 19:27:05 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 89D9DD8137B; Fri, 26 May 2017 19:27:05 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 670171EE9; Fri, 26 May 2017 19:27:05 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4QJR4rQ075686; Fri, 26 May 2017 19:27:04 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4QJR4lL075685; Fri, 26 May 2017 19:27:04 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201705261927.v4QJR4lL075685@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Fri, 26 May 2017 19:27:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441810 - head/Mk/Uses X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 May 2017 19:27:05 -0000 Author: brnrd Date: Fri May 26 19:27:04 2017 New Revision: 441810 URL: https://svnweb.freebsd.org/changeset/ports/441810 Log: Mk/Uses/mysql.mk: Prepare for upcoming MariaDB 10.2 - Add 102m client and library version - Add dynamic libmysqlclient dependency (libmariadb) - Make WARNING and IGNORE messages display the correct port Reviewed by: mmokhi Differential Revision: https://reviews.freebsd.org/D10057 Modified: head/Mk/Uses/mysql.mk Modified: head/Mk/Uses/mysql.mk ============================================================================== --- head/Mk/Uses/mysql.mk Fri May 26 18:48:22 2017 (r441809) +++ head/Mk/Uses/mysql.mk Fri May 26 19:27:04 2017 (r441810) @@ -47,6 +47,13 @@ _MYSQL_ARGS:= ${_MYSQL_ARGS:Nclient} # Port requested a version .if !empty(_MYSQL_ARGS) _WANT_MYSQL_VER= ${_MYSQL_ARGS} +.if (${_WANT_MYSQL_VER:C/[0-9]*//} == "m") +_WANT_MYSQL_FLAVOUR= mariadb +.elif (${_WANT_MYSQL_VER:C/[0-9]*//} == "p") +_WANT_MYSQL_FLAVOUR= percona +.else +_WANT_MYSQL_FLAVOUR= mysql +.endif .endif .endif # !empty(mysql_ARGS) @@ -58,17 +65,13 @@ DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/./ # MySQL client version currently supported. # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -MYSQL55_LIBVER= 18 -MYSQL55m_LIBVER= 18 -MYSQL55p_LIBVER= 18 -MYSQL56_LIBVER= 18 -MYSQL56p_LIBVER= 18 -MYSQL56w_LIBVER= 18 +.for v in 55 55m 55p 56 56p 56w 100m 101m +MYSQL${v}_LIBVER= 18 +.endfor MYSQL57_LIBVER= 20 MYSQL57p_LIBVER= 20 MYSQL80_LIBVER= 21 -MYSQL100m_LIBVER= 18 -MYSQL101m_LIBVER= 18 +MYSQL102m_LIBVER= 3 # Setting/finding MySQL version we want. .if exists(${LOCALBASE}/bin/mysql) @@ -78,16 +81,26 @@ _MARIADB!= ${LOCALBASE}/bin/mysql --vers .if ${_PERCONA} == 1 _MYSQL_VER= ${_MYSQL}p +_MYSQL_FLAVOUR= percona .elif ${_MARIADB} == 1 _MYSQL_VER= ${_MYSQL}m +_MYSQL_FLAVOUR= mariadb .else _MYSQL_VER= ${_MYSQL} +_MYSQL_FLAVOUR= mysql .endif .endif .if defined(_WANT_MYSQL_VER) +.if defined(WITH_MYSQL_VER) && (${WITH_MYSQL_VER:C/[0-9]*//} == "m") +WITH_MYSQL_FLAVOUR= mariadb +.elif defined(WITH_MYSQL_VER) && (${WITH_MYSQL_VER:C/[0-9]*//} == "p") +WITH_MYSQL_FLAVOUR= percona +.else +WITH_MYSQL_FLAVOUR= mysql +.endif .if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${_WANT_MYSQL_VER} -IGNORE= cannot install: the port wants mysql${_WANT_MYSQL_VER}-client and you try to install mysql${WITH_MYSQL_VER}-client +IGNORE= cannot install: the port wants ${_WANT_MYSQL_FLAVOUR}${_WANT_MYSQL_VER:C/[mpw]//}-client and you try to install ${WITH_MYSQL_FLAVOUR}${WITH_MYSQL_VER:C/[mpw]//}-client .endif MYSQL_VER= ${_WANT_MYSQL_VER} .elif defined(WITH_MYSQL_VER) @@ -100,15 +113,27 @@ MYSQL_VER= ${DEFAULT_MYSQL_VER} .endif .endif # _WANT_MYSQL_VER +.if ${MYSQL_VER:C/[0-9]*//} == "m" +MYSQL_FLAVOUR= mariadb +.elif ${MYSQL_VER:C/[0-9]*//} == "p" +MYSQL_FLAVOUR= percona +.else +MYSQL_FLAVOUR= mysql +.endif + .if defined(_MYSQL_VER) .if ${_MYSQL_VER} != ${MYSQL_VER} -IGNORE= cannot install: MySQL versions mismatch: mysql${_MYSQL_VER}-client is installed and wanted version is mysql${MYSQL_VER}-client +IGNORE= cannot install: MySQL versions mismatch: ${_MYSQL_FLAVOUR}${_MYSQL_VER:C/[mpw]//}-client is installed and wanted version is ${MYSQL_FLAVOUR}${MYSQL_VER:C/[mpw]//}-client .endif .endif +_MYSQL_SHLIB= libmysqlclient .if (${MYSQL_VER:C/[0-9]*//} == "m") _MYSQL_SERVER_FLAVOUR= mariadb _MYSQL_CLIENT_FLAVOUR= mariadb +. if ${MYSQL_VER:C/m//} >= 102 +_MYSQL_SHLIB= libmariadb +. endif .elif (${MYSQL_VER:C/[0-9]*//} == "p") _MYSQL_SERVER_FLAVOUR= percona _MYSQL_CLIENT_FLAVOUR= percona @@ -140,7 +165,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/l .endif .if defined(_WANT_MYSQL_CLIENT) || \ !(defined(_WANT_MYSQL_SERVER) || defined(_WANT_MYSQL_EMBEDDED)) -LIB_DEPENDS+= libmysqlclient.so.${MYSQL${MYSQL_VER}_LIBVER}:${_MYSQL_CLIENT} +LIB_DEPENDS+= ${_MYSQL_SHLIB}.so.${MYSQL${MYSQL_VER}_LIBVER}:${_MYSQL_CLIENT} .endif .else IGNORE= cannot install: unknown MySQL version: ${MYSQL_VER}