From owner-svn-ports-all@freebsd.org  Fri Sep 22 15:28:10 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 AA066E01D98;
 Fri, 22 Sep 2017 15:28:10 +0000 (UTC)
 (envelope-from mmokhi@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 77947707ED;
 Fri, 22 Sep 2017 15:28:10 +0000 (UTC)
 (envelope-from mmokhi@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8MFS9q2011020;
 Fri, 22 Sep 2017 15:28:09 GMT (envelope-from mmokhi@FreeBSD.org)
Received: (from mmokhi@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8MFS94Z011019;
 Fri, 22 Sep 2017 15:28:09 GMT (envelope-from mmokhi@FreeBSD.org)
Message-Id: <201709221528.v8MFS94Z011019@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mmokhi set sender to
 mmokhi@FreeBSD.org using -f
From: Mahdi Mokhtari <mmokhi@FreeBSD.org>
Date: Fri, 22 Sep 2017 15:28:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r450384 - head/Mk/Uses
X-SVN-Group: ports-head
X-SVN-Commit-Author: mmokhi
X-SVN-Commit-Paths: head/Mk/Uses
X-SVN-Commit-Revision: 450384
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Sep 2017 15:28:10 -0000

Author: mmokhi
Date: Fri Sep 22 15:28:09 2017
New Revision: 450384
URL: https://svnweb.freebsd.org/changeset/ports/450384

Log:
  Mk/Uses/mysql.mk: Change the way of extracting version info from MySQL flavors
  Use `mysql_config --version` instead of `mysql --version` because
      in MySQL 8.0 the format of output is changed and it'd be [more reliable] and
      easier to use just mysql_config because it only returns the numbers we want.
  
  Reviewed by:	brnrd, mat (mentor, portmgr)
  Approved by:	brnrd, mat (mentor, portmgr)
  Sponsored by:	EuroBSDCon Paris Devsummit
  Differential Revision:	https://reviews.freebsd.org/D12458

Modified:
  head/Mk/Uses/mysql.mk

Modified: head/Mk/Uses/mysql.mk
==============================================================================
--- head/Mk/Uses/mysql.mk	Fri Sep 22 15:22:56 2017	(r450383)
+++ head/Mk/Uses/mysql.mk	Fri Sep 22 15:28:09 2017	(r450384)
@@ -75,7 +75,7 @@ MYSQL102m_LIBVER=	3
 
 # Setting/finding MySQL version we want.
 .if exists(${LOCALBASE}/bin/mysql)
-_MYSQL!=	${LOCALBASE}/bin/mysql --version | ${SED} -e 's/.*Distrib \([0-9]\{1,2\}\)\.\([0-9]*\).*/\1\2/'
+_MYSQL!=	${LOCALBASE}/bin/mysql_config --version | ${SED} -e 's/\([0-9]\{1,2\}\)\.\([0-9]*\).*/\1\2/'
 _PERCONA!=	${LOCALBASE}/bin/mysql --version | ${GREP} Percona | wc -l
 _MARIADB!=	${LOCALBASE}/bin/mysql --version | ${GREP} MariaDB | wc -l