From owner-svn-ports-head@freebsd.org Mon Feb 26 19:33:22 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E63ECF3D4EA; Mon, 26 Feb 2018 19:33:21 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9419D857E1; Mon, 26 Feb 2018 19:33:21 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8F0941FC31; Mon, 26 Feb 2018 19:33:21 +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 w1QJXLSd035135; Mon, 26 Feb 2018 19:33:21 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1QJXLis035134; Mon, 26 Feb 2018 19:33:21 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201802261933.w1QJXLis035134@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Mon, 26 Feb 2018 19:33:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r463043 - head/Mk/Uses X-SVN-Group: ports-head X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: head/Mk/Uses X-SVN-Commit-Revision: 463043 X-SVN-Commit-Repository: ports 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.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: Mon, 26 Feb 2018 19:33:22 -0000 Author: antoine Date: Mon Feb 26 19:33:21 2018 New Revision: 463043 URL: https://svnweb.freebsd.org/changeset/ports/463043 Log: Remove support for deprecated USES=python:2 and USES=python:3 PR: 225752 With hat: portmgr Modified: head/Mk/Uses/python.mk Modified: head/Mk/Uses/python.mk ============================================================================== --- head/Mk/Uses/python.mk Mon Feb 26 19:24:14 2018 (r463042) +++ head/Mk/Uses/python.mk Mon Feb 26 19:33:21 2018 (r463043) @@ -10,15 +10,13 @@ # # version If your port requires only some set of Python versions, you # can set this to [min]-[max] or min+ or -max or as an -# explicit version or as a meta port version (eg. 3.3-3.4 for -# [min]-[max], 2.7+ or -3.3 for min+ and -max, 2.7 for an -# explicit version or 3 for a meta port version). Example: +# explicit version (eg. 3.3-3.4 for [min]-[max], 2.7+ or -3.3 +# for min+ and -max, 2.7 for an explicit version). Example: # # USES=python:2.7 # Only use Python 2.7 # USES=python:3.3+ # Use Python 3.3 or newer # USES=python:3.3-3.4 # Use Python 3.3 or 3.4 # USES=python:-3.3 # Use any Python up to 3.3 -# USES=python:2 # Use the Python 2 meta port # USES=python # Use the set default Python # # version # @@ -306,15 +304,10 @@ _PYTHON_TEST_DEP= yes WARNING+= "PYTHON_DEFAULT must be a version present in PYTHON2_DEFAULT or PYTHON3_DEFAULT, if you want more Python flavors, set BUILD_ALL_PYTHON_FLAVORS in your make.conf" .endif -# Keep this before the FLAVOR selection to get the meta port dependency. .if ${_PYTHON_ARGS} == "2" -_PYTHON_ARGS= ${PYTHON2_DEFAULT} -_WANTS_META_PORT= 2 -DEV_WARNING+= "USES=python:2 is deprecated, use USES=python:2.7" +DEV_ERROR+= "USES=python:2 is no longer supported, use USES=python:2.7" .elif ${_PYTHON_ARGS} == "3" -_PYTHON_ARGS= ${PYTHON3_DEFAULT} -_WANTS_META_PORT= 3 -DEV_WARNING+= "USES=python:3 is deprecated, use USES=python:3.4+ or an appropriate version range" +DEV_ERROR+= "USES=python:3 is no longer supported, use USES=python:3.4+ or an appropriate version range" .endif # ${_PYTHON_ARGS} == "2" .if defined(PYTHON_VERSION) @@ -682,9 +675,6 @@ PY_BOOST= lib${PY_BOOST_LIB}.so:devel/boost-python-lib .for _stage in PATCH BUILD RUN TEST . if defined(_PYTHON_${_stage}_DEP) ${_stage}_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR} -. if defined(_WANTS_META_PORT) -${_stage}_DEPENDS+= python${_WANTS_META_PORT}:${_PYTHON_RELPORTDIR}${_WANTS_META_PORT} -. endif . endif .endfor