From owner-svn-ports-all@freebsd.org  Sun Dec  3 20:03: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 66910E65986;
 Sun,  3 Dec 2017 20:03:10 +0000 (UTC)
 (envelope-from amdmi3@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 289D16476D;
 Sun,  3 Dec 2017 20:03:10 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB3K39cW042157;
 Sun, 3 Dec 2017 20:03:09 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB3K39RR042156;
 Sun, 3 Dec 2017 20:03:09 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201712032003.vB3K39RR042156@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Sun, 3 Dec 2017 20:03:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r455426 - head/Mk/Uses
X-SVN-Group: ports-head
X-SVN-Commit-Author: amdmi3
X-SVN-Commit-Paths: head/Mk/Uses
X-SVN-Commit-Revision: 455426
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.25
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: Sun, 03 Dec 2017 20:03:10 -0000

Author: amdmi3
Date: Sun Dec  3 20:03:09 2017
New Revision: 455426
URL: https://svnweb.freebsd.org/changeset/ports/455426

Log:
  Fix default python flavor wrt python version
  
  There's a flaw in FLAVOR selection logic which makes python FLAVOR
  default to py27 even with DEFAULT_VERSIONS=python=3.6. Fix this and
  generate FLAVOR based on PYTHON_DEFAULT, PYTHON2_DEFAULT, PYTHON3_DEFAULT
  (in that order) similar to how it's done in other parts of python.mk.
  This does not affect FLAVOR in default setup (py27 remains), but
  if python default version is modified, it will now properly affect FLAVOR.
  
  Approved by:	portmgr (antoine)
  Differential Revision:	D13326

Modified:
  head/Mk/Uses/python.mk

Modified: head/Mk/Uses/python.mk
==============================================================================
--- head/Mk/Uses/python.mk	Sun Dec  3 19:39:23 2017	(r455425)
+++ head/Mk/Uses/python.mk	Sun Dec  3 20:03:09 2017	(r455426)
@@ -426,8 +426,8 @@ FLAVORS=	${_ALL_PYTHON_FLAVORS}
 .  else
 .    for _v in ${PYTHON3_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON_DEFAULT}
 _f=	py${_v:S/.//}
-.      if ${_ALL_PYTHON_FLAVORS:M${_f}} && !${FLAVORS:M${_f}}
-FLAVORS:=	${_f} ${FLAVORS}
+.      if ${_ALL_PYTHON_FLAVORS:M${_f}}
+FLAVORS:=	${_f} ${FLAVORS:N${_f}}
 .      endif
 .    endfor
 .  endif