From owner-svn-ports-head@freebsd.org Sun Jan 21 10:51:31 2018 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 23C26EC5783; Sun, 21 Jan 2018 10:51:31 +0000 (UTC) (envelope-from mat@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 F21AC2A07; Sun, 21 Jan 2018 10:51:30 +0000 (UTC) (envelope-from mat@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 3B97626B5; Sun, 21 Jan 2018 10:51:30 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0LApUMx059936; Sun, 21 Jan 2018 10:51:30 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0LApTpq059930; Sun, 21 Jan 2018 10:51:29 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201801211051.w0LApTpq059930@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Sun, 21 Jan 2018 10:51:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459584 - in head: . Mk Mk/Uses devel/py-setuptools lang/python2 lang/python3 X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head: . Mk Mk/Uses devel/py-setuptools lang/python2 lang/python3 X-SVN-Commit-Revision: 459584 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: Sun, 21 Jan 2018 10:51:31 -0000 Author: mat Date: Sun Jan 21 10:51:29 2018 New Revision: 459584 URL: https://svnweb.freebsd.org/changeset/ports/459584 Log: Remove PYTHON*_DEFAULT_VERSION. Modified: head/CHANGES head/Mk/Uses/python.mk head/Mk/bsd.sanity.mk (contents, props changed) head/devel/py-setuptools/Makefile (contents, props changed) head/lang/python2/Makefile (contents, props changed) head/lang/python3/Makefile (contents, props changed) Modified: head/CHANGES ============================================================================== --- head/CHANGES Sun Jan 21 10:08:40 2018 (r459583) +++ head/CHANGES Sun Jan 21 10:51:29 2018 (r459584) @@ -10,6 +10,12 @@ in the release notes and/or placed into UPDATING. All ports committers are allowed to commit to this file. +20180116: +AUTHOR: mat@FreeBSD.org + + The deprecated PYTHON_DEFAULT_VERSION, PYTHON2_DEFAULT_VERSION, and + PYTHON3_DEFAULT_VERSION have been removed. + 20180106: AUTHOR: kde@FreeBSD.org Modified: head/Mk/Uses/python.mk ============================================================================== --- head/Mk/Uses/python.mk Sun Jan 21 10:08:40 2018 (r459583) +++ head/Mk/Uses/python.mk Sun Jan 21 10:51:29 2018 (r459584) @@ -225,15 +225,6 @@ # PYTHON2="" PYTHON3="@comment " for Python 2.x # PYTHON2="@comment " PYTHON3="" for Python 3.x # -# Deprecated variables, which exist for compatibility and will be removed -# soon: -# -# PYTHON_DEFAULT_VERSION -# PYTHON2_DEFAULT_VERSION -# PYTHON3_DEFAULT_VERSION -# - Deprecated, use PYTHON[2,3]_DEFAULT instead, -# see bsd.default-versions.mk -# # PYTHON_PKGNAMESUFFIX # - Deprecated, use PYTHON_PKGNAMEPREFIX instead # default: -py${PYTHON_SUFFIX} @@ -301,58 +292,17 @@ _PYTHON_RUN_DEP= yes _PYTHON_TEST_DEP= yes .endif -.if defined(PYTHON_DEFAULT_VERSION) -WARNING+= "PYTHON_DEFAULT_VERSION is defined, consider using DEFAULT_VERSIONS=python=${PYTHON_DEFAULT_VERSION:S/^python//} instead" -.endif -.if defined(PYTHON2_DEFAULT_VERSION) -WARNING+= "PYTHON2_DEFAULT_VERSION is defined, consider using DEFAULT_VERSIONS=python2=${PYTHON2_DEFAULT_VERSION:S/^python//} instead" -.endif -.if defined(PYTHON3_DEFAULT_VERSION) -WARNING+= "PYTHON3_DEFAULT_VERSION is defined, consider using DEFAULT_VERSIONS=python3=${PYTHON3_DEFAULT_VERSION:S/^python//} instead" -.endif - .if ${PYTHON2_DEFAULT} != ${PYTHON_DEFAULT} && ${PYTHON3_DEFAULT} != ${PYTHON_DEFAULT} 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 -.if exists(${LOCALBASE}/bin/python) -.if !defined(_PYTHON_DEFAULT_VERSION) -_PYTHON_DEFAULT_VERSION!= (${LOCALBASE}/bin/python -c \ - 'import sys; print("%d.%d" % sys.version_info[:2])' 2> /dev/null \ - || ${ECHO_CMD} ${_PYTHON_PORTBRANCH}) | ${TAIL} -1 -.endif -_EXPORTED_VARS+= _PYTHON_DEFAULT_VERSION -.if defined(PYTHON_DEFAULT) && (${PYTHON_DEFAULT} != ${_PYTHON_DEFAULT_VERSION}) -WARNING+= "Your requested default python version ${PYTHON_DEFAULT} is different from the installed default python interpreter version ${_PYTHON_DEFAULT_VERSION}" -.endif -PYTHON_DEFAULT_VERSION= python${_PYTHON_DEFAULT_VERSION} -.else -PYTHON_DEFAULT_VERSION= python${PYTHON_DEFAULT} -.endif # exists(${LOCALBASE}/bin/python) - -# Is only a meta-port version defined? -.if ${PYTHON_DEFAULT_VERSION} == "python2" -PYTHON2_DEFAULT_VERSION?= python${PYTHON2_DEFAULT} -.elif ${PYTHON_DEFAULT_VERSION:R} == "python2" -PYTHON2_DEFAULT_VERSION= ${PYTHON_DEFAULT_VERSION} -.else -PYTHON2_DEFAULT_VERSION?= python${PYTHON2_DEFAULT} -.endif -.if ${PYTHON_DEFAULT_VERSION} == "python3" -PYTHON3_DEFAULT_VERSION?= python${PYTHON3_DEFAULT} -.elif ${PYTHON_DEFAULT_VERSION:R} == "python3" - PYTHON3_DEFAULT_VERSION= ${PYTHON_DEFAULT_VERSION} -.else -PYTHON3_DEFAULT_VERSION?= python${PYTHON3_DEFAULT} -.endif - # Keep this before the FLAVOR selection to get the meta port dependency. .if ${_PYTHON_ARGS} == "2" -_PYTHON_ARGS= ${PYTHON2_DEFAULT_VERSION:S/^python//} +_PYTHON_ARGS= ${PYTHON2_DEFAULT} _WANTS_META_PORT= 2 DEV_WARNING+= "USES=python:2 is deprecated, use USES=python:2.7" .elif ${_PYTHON_ARGS} == "3" -_PYTHON_ARGS= ${PYTHON3_DEFAULT_VERSION:S/^python//} +_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" .endif # ${_PYTHON_ARGS} == "2" @@ -375,7 +325,7 @@ DEV_WARNING+= "USES=python:3 is deprecated, use USES= # (_PYTHON_VERSION_NONSUPPORTED). _PYTHON_VERSION:= ${PYTHON_VERSION:S/^python//} .else -_PYTHON_VERSION:= ${PYTHON_DEFAULT_VERSION:S/^python//} +_PYTHON_VERSION:= ${PYTHON_DEFAULT} .endif # defined(PYTHON_VERSION) # Validate Python version whether it meets the version restriction. @@ -476,7 +426,7 @@ PY_FLAVOR= py${_PYTHON_VERSION:S/.//} # the supported version range. PYTHON_VERSION?= python${_PYTHON_VERSION} .if !defined(PYTHON_NO_DEPENDS) && \ - ${PYTHON_VERSION} != ${PYTHON_DEFAULT_VERSION} + ${PYTHON_VERSION} != python${PYTHON_DEFAULT} DEPENDS_ARGS+= PYTHON_VERSION=${PYTHON_VERSION} .endif @@ -573,7 +523,7 @@ DEV_WARNING+= "USE_PYTHON=concurrent when only one of _USES_POST+= uniquefiles:dirs .if defined(_PYTHON_FEATURE_FLAVORS) && ${FLAVOR} == ${FLAVORS:[1]} UNIQUE_DEFAULT_LINKS= yes -.elif !defined(_PYTHON_FEATURE_FLAVORS) && ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +.elif !defined(_PYTHON_FEATURE_FLAVORS) && ${PYTHON_VERSION} == python${PYTHON_DEFAULT} UNIQUE_DEFAULT_LINKS= yes .else UNIQUE_DEFAULT_LINKS= no Modified: head/Mk/bsd.sanity.mk ============================================================================== --- head/Mk/bsd.sanity.mk Sun Jan 21 10:08:40 2018 (r459583) +++ head/Mk/bsd.sanity.mk Sun Jan 21 10:51:29 2018 (r459584) @@ -16,7 +16,8 @@ WARNING+= "WITHOUT_${opt} is unsupported, use WITH ALL_UNSUPPORTED= WITHOUT_NLS NOPORTDOCS NOPORTEXAMPLES WITH_BDB_VER \ OVERRIDE_LINUX_BASE_PORT WITH_OPENSSL_PORT \ - WITH_OPENSSL_BASE + WITH_OPENSSL_BASE PYTHON_DEFAULT_VERSION \ + PYTHON2_DEFAULT_VERSION PYTHON3_DEFAULT_VERSION ALL_DEPRECATED= ALL_NOTNEEDED= WITH_NEW_XORG WITHOUT_NEW_XORG WITH_KMS WITHOUT_KMS @@ -31,6 +32,9 @@ WITH_NEW_XORG_ALT= "removed and has no effect" WITHOUT_NEW_XORG_ALT= ${WITH_NEW_XORG_ALT} WITH_MKS_ALT= "removed and has no effect" WITHOUT_MKS_ALT= ${WITH_MKS_ALT} +PYTHON_DEFAULT_VERSION_ALT= "DEFAULT_VERSIONS=python=${PYTHON_DEFAULT_VERSION:S/^python//}" +PYTHON2_DEFAULT_VERSION_ALT= "DEFAULT_VERSIONS=python2=${PYTHON2_DEFAULT_VERSION:S/^python//}" +PYTHON3_DEFAULT_VERSION_ALT= "DEFAULT_VERSIONS=python3=${PYTHON3_DEFAULT_VERSION:S/^python//}" .for a in ${ALL_DEPRECATED} .if defined(${a}) Modified: head/devel/py-setuptools/Makefile ============================================================================== --- head/devel/py-setuptools/Makefile Sun Jan 21 10:08:40 2018 (r459583) +++ head/devel/py-setuptools/Makefile Sun Jan 21 10:51:29 2018 (r459584) @@ -25,7 +25,7 @@ PLIST_FILES= "@sample %%PYTHON_SITELIBDIR%%/easy-insta .include -.if ${PYTHON_VERSION} != ${PYTHON_DEFAULT_VERSION} +.if ${FLAVOR} != ${FLAVORS:[1]} SUB_FILES+= pkg-message SUB_LIST+= PYTHON_VER=${PYTHON_VER} .endif Modified: head/lang/python2/Makefile ============================================================================== --- head/lang/python2/Makefile Sun Jan 21 10:08:40 2018 (r459583) +++ head/lang/python2/Makefile Sun Jan 21 10:51:29 2018 (r459584) @@ -12,7 +12,7 @@ MAINTAINER= python@FreeBSD.org COMMENT= The "meta-port" for version 2 of the Python interpreter USES= python:run -PYTHON_VERSION= ${PYTHON2_DEFAULT_VERSION} +PYTHON_VERSION= python${PYTHON2_DEFAULT} NO_BUILD= yes PLIST_FILES= bin/2to3-${PYTHON_MAJOR_VER} \ Modified: head/lang/python3/Makefile ============================================================================== --- head/lang/python3/Makefile Sun Jan 21 10:08:40 2018 (r459583) +++ head/lang/python3/Makefile Sun Jan 21 10:51:29 2018 (r459584) @@ -12,7 +12,7 @@ MAINTAINER= python@FreeBSD.org COMMENT= The "meta-port" for version 3 of the Python interpreter USES= python:run -PYTHON_VERSION= ${PYTHON3_DEFAULT_VERSION} +PYTHON_VERSION= python${PYTHON3_DEFAULT} NO_BUILD= yes PLIST_FILES= bin/2to3-${PYTHON_MAJOR_VER} \