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 --- devel/py-vcrpy/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'devel/py-vcrpy/Makefile') diff --git a/devel/py-vcrpy/Makefile b/devel/py-vcrpy/Makefile index 09d4fc7d177f..c159e3f7358d 100644 --- a/devel/py-vcrpy/Makefile +++ b/devel/py-vcrpy/Makefile @@ -14,11 +14,11 @@ COMMENT= Automatically mock HTTP interactions to simplify and speed up testing LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt \ - ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytest-localserver>0:devel/py-pytest-localserver +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-localserver>0:devel/py-pytest-localserver@${FLAVOR} USES= python USE_PYTHON= autoplist distutils @@ -32,8 +32,8 @@ NO_ARCH= yes .include .if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${FLAVOR} .endif post-patch: -- cgit v1.2.3