Date: Thu, 3 Oct 2013 09:25:37 +0000 (UTC) From: Marcus von Appen <mva@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329164 - in head: . Mk Message-ID: <201310030925.r939Pb2A053327@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mva Date: Thu Oct 3 09:25:37 2013 New Revision: 329164 URL: http://svnweb.freebsd.org/changeset/ports/329164 Log: The default versions of lang/python* have been changed to support the new DEFAULT_VERSIONS variable. PYTHON_DEFAULT_VERSION, PYTHON2_DEFAULT_VERSION and PYTHON3_DEFAULT_VERSION are deprecated. If you have set them in your make.conf, you should change them something like DEFAULT_VERSIONS=python=2.7 python2=2.7 python3=3.3 Modified: head/Mk/bsd.default-versions.mk head/Mk/bsd.python.mk head/UPDATING Modified: head/Mk/bsd.default-versions.mk ============================================================================== --- head/Mk/bsd.default-versions.mk Thu Oct 3 09:05:53 2013 (r329163) +++ head/Mk/bsd.default-versions.mk Thu Oct 3 09:25:37 2013 (r329164) @@ -20,5 +20,8 @@ ${_l:U}_DEFAULT= ${lang:C/.*=//g} PERL5_DEFAULT?= 5.14 RUBY_DEFAULT?= 1.9 TCLTK_DEFAULT?= 8.6 +PYTHON_DEFAULT?= 2.7 +PYTHON2_DEFAULT?= 2.7 +PYTHON3_DEFAULT?= 3.3 .endif Modified: head/Mk/bsd.python.mk ============================================================================== --- head/Mk/bsd.python.mk Thu Oct 3 09:05:53 2013 (r329163) +++ head/Mk/bsd.python.mk Thu Oct 3 09:25:37 2013 (r329164) @@ -87,25 +87,15 @@ Python_Include_MAINTAINER= python@FreeBS # # PYTHON_DEFAULT_VERSION # - Version of the default python binary in your ${PATH}, in -# the format "python2.7". Set this in your /etc/make.conf -# in case you want to use a specific version as a default. -# default: python2.7 +# the format "python2.7". # # PYTHON2_DEFAULT_VERSION # - Version of the default python2 binary in your ${PATH}, in -# the format "python2.7". Set this in your /etc/make.conf -# in case you want to use a specific version as a default. -# Note that PYTHON_DEFAULT_VERSION always will have -# precedence before this value, if it matches "python2*" -# default: python2.7 +# the format "python2.7". # # PYTHON3_DEFAULT_VERSION # - Version of the default python3 binary in your ${PATH}, in -# the format "python3.2". Set this in your /etc/make.conf -# in case you want to use a specific version as a default. -# Note that PYTHON_DEFAULT_VERSION always will have -# precedence before this value, if it matches "python3*" -# default: python3.3 +# the format "python3.2". # # PYTHON_MAJOR_VER - Python version major number. 2 for python-2.x, # 3 for python-3.x and so on. @@ -227,27 +217,45 @@ _PYTHON_PORTBRANCH= 2.7 _PYTHON_ALLBRANCHES= 2.7 2.6 3.3 3.2 3.1 # preferred first # Determine version number of Python to use -.if !defined(PYTHON_DEFAULT_VERSION) -. if exists(${LOCALBASE}/bin/python) +.include "${PORTSDIR}/Mk/bsd.default-versions.mk" + +.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 exists(${LOCALBASE}/bin/python) _PYTHON_DEFAULT_VERSION!= (${LOCALBASE}/bin/python -c \ 'import sys; print(sys.version[:3])' 2> /dev/null \ || ${ECHO_CMD} ${_PYTHON_PORTBRANCH}) | ${TAIL} -1 -. else -_PYTHON_DEFAULT_VERSION= ${_PYTHON_PORTBRANCH} -. endif -PYTHON_DEFAULT_VERSION= python${_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) -.if ${PYTHON_DEFAULT_VERSION:R} == "python2" +# 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?= python2.7 +PYTHON2_DEFAULT_VERSION?= python${PYTHON2_DEFAULT} .endif -.if ${PYTHON_DEFAULT_VERSION:R} == "python3" -PYTHON3_DEFAULT_VERSION= ${PYTHON_DEFAULT_VERSION} +.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?= python3.3 +PYTHON3_DEFAULT_VERSION?= python${PYTHON3_DEFAULT} .endif .if defined(PYTHON_VERSION) Modified: head/UPDATING ============================================================================== --- head/UPDATING Thu Oct 3 09:05:53 2013 (r329163) +++ head/UPDATING Thu Oct 3 09:25:37 2013 (r329164) @@ -5,6 +5,20 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20131003: + AFFECTS: users of lang/python* and ports + AUTHOR: mva@FreeBSD.org + + The default versions of lang/python* have been changed to support the + new DEFAULT_VERSIONS variable. + + PYTHON_DEFAULT_VERSION, PYTHON2_DEFAULT_VERSION and + PYTHON3_DEFAULT_VERSION are deprecated. If you have set them in your + make.conf, you should change them something like + + DEFAULT_VERSIONS=python=2.7 python2=2.7 python3=3.3 + + 20130929: AFFECTS: users of x11/pixman AUTHOR: zeising@FreeBSD.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310030925.r939Pb2A053327>