From owner-svn-ports-all@freebsd.org Mon Nov 9 18:52:21 2015 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 1E4F5A2A011; Mon, 9 Nov 2015 18:52:21 +0000 (UTC) (envelope-from bdrewery@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 C427B1945; Mon, 9 Nov 2015 18:52:20 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA9IqJOU003713; Mon, 9 Nov 2015 18:52:19 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA9IqJiD003710; Mon, 9 Nov 2015 18:52:19 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201511091852.tA9IqJiD003710@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 9 Nov 2015 18:52:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r401162 - in head/Mk: Scripts 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.20 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: Mon, 09 Nov 2015 18:52:21 -0000 Author: bdrewery Date: Mon Nov 9 18:52:19 2015 New Revision: 401162 URL: https://svnweb.freebsd.org/changeset/ports/401162 Log: Fix partial tree checkouts with 'all-depends-list', 'make clean', etc, after inclusion of the ports_env feature into that handling around r399791. With hat: portmgr Reported by: ian, lev Modified: head/Mk/Scripts/functions.sh head/Mk/Uses/perl5.mk head/Mk/Uses/python.mk Modified: head/Mk/Scripts/functions.sh ============================================================================== --- head/Mk/Scripts/functions.sh Mon Nov 9 18:45:42 2015 (r401161) +++ head/Mk/Scripts/functions.sh Mon Nov 9 18:52:19 2015 (r401162) @@ -164,7 +164,7 @@ export_ports_env() { validate_env MAKE PORTSDIR - uses="perl5 python" + uses="python" make_env="\ _PORTS_ENV_CHECK=1 \ Modified: head/Mk/Uses/perl5.mk ============================================================================== --- head/Mk/Uses/perl5.mk Mon Nov 9 18:45:42 2015 (r401161) +++ head/Mk/Uses/perl5.mk Mon Nov 9 18:52:19 2015 (r401162) @@ -43,9 +43,7 @@ IGNORE= Incorrect 'USES+=perl5:${perl5_A USE_PERL5?= run build # remove when 5.20 goes away. -.if !defined(_PORTS_ENV_CHECK) .sinclude "${LOCALBASE}/etc/perl5_version" -.endif .if defined(PERL_VERSION) PERL5_DEPEND= ${PERL5} THIS_IS_OLD_PERL= yes Modified: head/Mk/Uses/python.mk ============================================================================== --- head/Mk/Uses/python.mk Mon Nov 9 18:45:42 2015 (r401161) +++ head/Mk/Uses/python.mk Mon Nov 9 18:52:19 2015 (r401162) @@ -385,10 +385,13 @@ PYTHON_MAJOR_VER= ${PYTHON_VER:R} 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}) .if !defined(PYTHON_PORTVERSION) PYTHON_PORTVERSION!= ${MAKE} -V PORTVERSION -C ${PYTHON_PORTSDIR} .endif _EXPORTED_VARS+= PYTHON_PORTVERSION +.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 # PORTVERSION to support pre-release versions (rc3, alpha4, etc) of