From 551be3c7231225ed9c26479af2b8914fb2ef0ea8 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Thu, 30 Nov 2017 15:50:30 +0000 Subject: Convert Python ports to FLAVORS. Ports using USE_PYTHON=distutils are now flavored. They will automatically get flavors (py27, py34, py35, py36) depending on what versions they support. There is also a USE_PYTHON=flavors for ports that do not use distutils but need FLAVORS to be set. A USE_PYTHON=noflavors can be set if using distutils but flavors are not wanted. A new USE_PYTHON=optsuffix that will add PYTHON_PKGNAMESUFFIX has been added to cope with Python ports that did not have the Python PKGNAMEPREFIX but are flavored. USES=python now also exports a PY_FLAVOR variable that contains the current python flavor. It can be used in dependency lines when the port itself is not python flavored. For example, deskutils/calibre. By default, all the flavors are generated. To only generate flavors for the versions in PYTHON2_DEFAULT and PYTHON3_DEFAULT, define BUILD_DEFAULT_PYTHON_FLAVORS in your make.conf. In all the ports with Python dependencies, the *_DEPENDS entries MUST end with the flavor so that the framework knows which to build/use. This is done by appending '@${PY_FLAVOR}' after the origin (or @${FLAVOR} if in a Python module with Python flavors, as the content will be the same). For example: RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} PR: 223071 Reviewed by: portmgr, python Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D12464 --- french/aster/Makefile | 2 +- french/trytond28_account_fr/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'french') diff --git a/french/aster/Makefile b/french/aster/Makefile index 175b5a8ca093..aeda99fa77d6 100644 --- a/french/aster/Makefile +++ b/french/aster/Makefile @@ -46,7 +46,7 @@ LIB_DEPENDS+= libhdf5-18.so:science/hdf5-18 \ libmed.so:french/med # libAsterInterface.so:science/mfront # libAsterInterface.so:science/tfel -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gnuplot>0:math/py-gnuplot\ +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gnuplot>0:math/py-gnuplot@${PY_FLAVOR} \ ${SHELL_INSTALL_ASTER}:shells/${SHIADEP} \ astk-serveur>0:cad/astk-serveur diff --git a/french/trytond28_account_fr/Makefile b/french/trytond28_account_fr/Makefile index 0713f3701a2e..0550729982eb 100644 --- a/french/trytond28_account_fr/Makefile +++ b/french/trytond28_account_fr/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= trytond28_account>=2.8.1:finance/trytond28_account CONFLICTS= trytond_account_fr-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include -- cgit v1.2.3