From owner-svn-ports-all@freebsd.org Thu Apr 28 12:17:10 2016 Return-Path: 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 61A73B1D508; Thu, 28 Apr 2016 12:17:10 +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 317C1184B; Thu, 28 Apr 2016 12:17:10 +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 u3SCH9d2014528; Thu, 28 Apr 2016 12:17:09 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3SCH94p014527; Thu, 28 Apr 2016 12:17:09 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201604281217.u3SCH94p014527@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 28 Apr 2016 12:17:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414168 - 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-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Apr 2016 12:17:10 -0000 Author: antoine Date: Thu Apr 28 12:17:09 2016 New Revision: 414168 URL: https://svnweb.freebsd.org/changeset/ports/414168 Log: Remove ${PORTSDIR} from python _DEPENDS Modified: head/Mk/Uses/python.mk Modified: head/Mk/Uses/python.mk ============================================================================== --- head/Mk/Uses/python.mk Thu Apr 28 12:06:27 2016 (r414167) +++ head/Mk/Uses/python.mk Thu Apr 28 12:17:09 2016 (r414168) @@ -225,7 +225,7 @@ _INCLUDE_USES_PYTHON_MK= yes _PYTHON_VERSIONS= 2.7 3.4 3.5 3.3 # preferred first _PYTHON_PORTBRANCH= 2.7 # ${_PYTHON_VERSIONS:[1]} _PYTHON_BASECMD= ${LOCALBASE}/bin/python -_PYTHON_RELPORTDIR= ${PORTSDIR}/lang/python +_PYTHON_RELPORTDIR= lang/python # Make each individual feature available as _PYTHON_FEATURE_ .for var in ${USE_PYTHON} @@ -396,8 +396,8 @@ PYTHON_REL= # empty PYTHON_ABIVER= # empty PYTHON_PORTSDIR= ${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX} # Protect partial checkouts from Mk/Scripts/functions.sh:export_ports_env(). -.if !defined(_PORTS_ENV_CHECK) || exists(${PYTHON_PORTSDIR}) -.include "${PYTHON_PORTSDIR}/Makefile.version" +.if !defined(_PORTS_ENV_CHECK) || exists(${PORTSDIR}/${PYTHON_PORTSDIR}) +.include "${PORTSDIR}/${PYTHON_PORTSDIR}/Makefile.version" .endif # Create a 4 integer version string, prefixing 0 to the last token if # it's a single character. Only use the the first 3 tokens of