From owner-svn-ports-head@freebsd.org Sat Jun 25 19:51:33 2016 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 4B8A6B811A2; Sat, 25 Jun 2016 19:51:33 +0000 (UTC) (envelope-from antoine@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 18257178F; Sat, 25 Jun 2016 19:51:33 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5PJpWBY090794; Sat, 25 Jun 2016 19:51:32 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5PJpWtE090793; Sat, 25 Jun 2016 19:51:32 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201606251951.u5PJpWtE090793@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sat, 25 Jun 2016 19:51:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417484 - 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.22 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: Sat, 25 Jun 2016 19:51:33 -0000 Author: antoine Date: Sat Jun 25 19:51:32 2016 New Revision: 417484 URL: https://svnweb.freebsd.org/changeset/ports/417484 Log: Reduce a little bit foot shooting for people installing python 3 ports using PYTHON_ABIVER/PYTHON_INCLUDEDIR, when they use default options for lang/python3x, by providing a reasonable default value to PYTHON_ABIVER With hat: portmgr Modified: head/Mk/Uses/python.mk Modified: head/Mk/Uses/python.mk ============================================================================== --- head/Mk/Uses/python.mk Sat Jun 25 19:46:53 2016 (r417483) +++ head/Mk/Uses/python.mk Sat Jun 25 19:51:32 2016 (r417484) @@ -407,8 +407,13 @@ PYTHON_REL= ${PYTHON_PORTVERSION:C/^([0- # Might be overridden by calling ports PYTHON_CMD?= ${_PYTHON_BASECMD}${_PYTHON_VERSION} -.if exists(${PYTHON_CMD}-config) && ${PYTHON_VER} != 2.7 +.if ${PYTHON_VER} != 2.7 +.if exists(${PYTHON_CMD}-config) PYTHON_ABIVER!= ${PYTHON_CMD}-config --abiflags +.else +# Default ABI flags for lang/python3x ports +PYTHON_ABIVER= m +.endif .endif .if !defined(PYTHONBASE)