From owner-svn-ports-head@FreeBSD.ORG Mon Oct 21 23:28:11 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 001039FD for ; Mon, 21 Oct 2013 23:28:10 +0000 (UTC) (envelope-from pgollucci@p6m7g8.com) Received: from mail-ie0-f170.google.com (mail-ie0-f170.google.com [209.85.223.170]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C2D682EA9 for ; Mon, 21 Oct 2013 23:28:10 +0000 (UTC) Received: by mail-ie0-f170.google.com with SMTP id at1so390733iec.15 for ; Mon, 21 Oct 2013 16:28:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=y8lLEDSvIvXgWXJuzCZGeMiqE9g2Z0CVP0/k6Wo7cDI=; b=MeGFRIdX3/ARFJ8yOWIFii3UCU3vEyGsYA3DprrWuSdqWuJIaDkR/uXm6G0PzpflOc dNFX8Ca1e2Opo9d/blikxQspriiNQXZYK/7ftCnA4a1Ae56WaBpiyh5FyDlhfAAmVJQa 07aRVG8Uy14jvn9/dCT1U74NoBf4DI2y4q6ARKmaEoMVuuivrkQpcR2tS0A+kjhfj5EY CS8EYUPnnLgthW4Exu94TS9vXHaNwscrDVyZcZ0H1gPJ74OVI6cRUqFkLu3UR3z1NDC9 rWvfwhB3OvwsvxF25jVYhfoO0quuogC/2OT+HZlgUaHEHCYsl41gmcFXUK8Zyr60KwMO ifNg== X-Gm-Message-State: ALoCoQkcK1r2JQ8WYd5IgUqUa80zXTg4d8fknT8RsHmYHgCrTeJV/gYVvhOMyMf+izz5thc7tTqo MIME-Version: 1.0 X-Received: by 10.43.154.18 with SMTP id lc18mr354199icc.41.1382398084547; Mon, 21 Oct 2013 16:28:04 -0700 (PDT) Received: by 10.50.39.46 with HTTP; Mon, 21 Oct 2013 16:28:04 -0700 (PDT) X-Originating-IP: [199.108.71.41] In-Reply-To: <201310030925.r939Pb2A053327@svn.freebsd.org> References: <201310030925.r939Pb2A053327@svn.freebsd.org> Date: Mon, 21 Oct 2013 19:28:04 -0400 Message-ID: Subject: Re: svn commit: r329164 - in head: . Mk From: "Philip M. Gollucci" To: Marcus von Appen Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 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, 21 Oct 2013 23:28:11 -0000 Nice! On Thu, Oct 3, 2013 at 5:25 AM, Marcus von Appen wrote: > 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 > -- --------------------------------------------------------------------------------------------- 4096R/D1EAB94D 2081 E230 3001 6508 8847 1BBF A0A8 DB0F D1EA B94D Philip M. Gollucci (pgollucci@p6m7g8.com) c: 703.336.9354 Member, Apache Software Foundation Committer, FreeBSD Foundation Consultant, P6M7G8 Inc. Director IT Operations, RideCharge Inc. Work like you don't need the money, love like you'll never get hurt, and dance like nobody's watching.