From owner-svn-ports-head@freebsd.org Tue Dec 12 16:06:45 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 D38CCE9D474 for ; Tue, 12 Dec 2017 16:06:45 +0000 (UTC) (envelope-from pgollucci@p6m7g8.com) Received: from mail-wm0-x22f.google.com (mail-wm0-x22f.google.com [IPv6:2a00:1450:400c:c09::22f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 724C4635EA for ; Tue, 12 Dec 2017 16:06:45 +0000 (UTC) (envelope-from pgollucci@p6m7g8.com) Received: by mail-wm0-x22f.google.com with SMTP id g75so21778799wme.0 for ; Tue, 12 Dec 2017 08:06:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=p6m7g8-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=IjzmMDjk7wuWt/zKKM3OeO4CcIixznxiQSEGAsWIhS8=; b=UOObB4bzGBqxbDP0gqKy/BLcgfv4YuQSBui6Wn5vmUcJGJTDJK3CD/JMby+7mbojr2 MkKjXtJ3z85PpyQede1KCKxQqxLwook/BxGhzlHMiJbNqKnvdivEs0bx7296WZCkFe3c c0NSP83LJOOkIieS5e/gRK20UpuHYaWyvQeajdy/MeeXhYqI6tbj/oJ5EWCG/Tsb15ez 61imP+Z1Ap+eGCLlJ28JXBUSeOK6m6ICT10dxm0D0oHy4GJszSGV+OY+g6oMT3Tv4glu W23SJRY1KKRDOG4LvnzT8fr0Mgwkd0Lvn4+jEqZV9rrrVJrdFxYv7SLlMZoydNGf2mSt SsHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=IjzmMDjk7wuWt/zKKM3OeO4CcIixznxiQSEGAsWIhS8=; b=Rkzc1BmJqlw/VxXCgSPL09Up6ZNPVi/ZmWlORD7T1z08kgxRq0pdSSKgFqo4rr1nqr S9ifBFUz0mE2h6D7q4+761Qe1kDJP8okg2NyLJdV2jGH2bIMbeJqgtvuaO0jF7tkh+GV F9mG1iuwC1c1vaOYgsKPHSEQ8vaUo7sOUbQIBd2qhOpbojyF/xAccOxPG8HqIVN6fnQm 1nQjkqyu5FfhFwAMiYOBbEF/BtJURhZmITw0UvkhIjZKVXxRh0vcWa/Bx/t/kXiI9q+A 6Y24Qst+Djmj5eJczLVBUFcC6PzoD183nL4nWaOAN3pq65pZCQODmy59KYD62r2M0M0s w/iw== X-Gm-Message-State: AKGB3mJKqFdsLIXvarNG76Byh08TK+L5e47OhszH6YsxbH87FDx9xnHo ZhGKCdTtob276AiUdDaUN1UEf4yC4CUbcmxvhdmIKA== X-Google-Smtp-Source: ACJfBouRF6ZH/2EBTIXmAvKOuor85Nvq1b/7CzzxrvJAiRP9ANFaH/r5zHNd85N6p/VhJRdlVHs4V+YuLfDL2qjgXAY= X-Received: by 10.80.215.89 with SMTP id i25mr3640301edj.274.1513094803716; Tue, 12 Dec 2017 08:06:43 -0800 (PST) MIME-Version: 1.0 Received: by 10.80.144.13 with HTTP; Tue, 12 Dec 2017 08:06:02 -0800 (PST) X-Originating-IP: [75.104.69.142] In-Reply-To: <201709221528.v8MFS94Z011019@repo.freebsd.org> References: <201709221528.v8MFS94Z011019@repo.freebsd.org> From: "Philip M. Gollucci" Date: Tue, 12 Dec 2017 08:06:02 -0800 Message-ID: Subject: Re: svn commit: r450384 - head/Mk/Uses To: Mahdi Mokhtari Cc: "ports-committers@freebsd.org" , "svn-ports-all@freebsd.org" , "svn-ports-head@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 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: Tue, 12 Dec 2017 16:06:45 -0000 is probably better written ad ${GREP} -c foo On Fri, Sep 22, 2017 at 8:28 AM, Mahdi Mokhtari wrote: > 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 > > _______________________________________________ > svn-ports-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-ports-all > To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" > -- --------------------------------------------------------------------------------- 4096R/D21D2752 ECDF B597 B54B 7F92 753E E0EA F699 A450 D21D 2752 Philip M. Gollucci (pgollucci@p6m7g8.com) c: 703.336.9354 Member, Apache Software Foundation Committer, FreeBSD Foundation Consultant, P6M7G8 Inc. Director Cloud Technology, Capital One What doesn't kill us can only make us stronger; Except it almost kills you.