diff options
author | Danilo G. Baio <dbaio@FreeBSD.org> | 2020-05-11 23:51:58 +0000 |
---|---|---|
committer | Danilo G. Baio <dbaio@FreeBSD.org> | 2020-05-11 23:51:58 +0000 |
commit | 75a5f7f0762c1039d83da77f699eed5f26998731 (patch) | |
tree | d08289c54ff9db139f0a17e3129c69e9b0ae39b1 /Mk | |
parent | 91dd9e62375f38dcfa9e2214347d9837b18c8810 (diff) | |
download | ports-75a5f7f0762c1039d83da77f699eed5f26998731.tar.gz ports-75a5f7f0762c1039d83da77f699eed5f26998731.zip |
Update Sphinx
- Repocopy textproc/py-sphinx to textproc/py-sphinx18
Update it to 1.8.5 (latest version from 1.8.X).
This version supports Python 2 and 3.
Add test target.
- textproc/py-sphinx: Update to 3.0.2
Python 3 only (3.5+).
Add test target.
- Mk/Uses/python.mk: Add PY_SPHINX
Shared macro to use with flavors and not break
ports with USES=python (all versions).
Python >=3.5 --> textproc/py-sphinx (v3.0.2)
Python < 3.5 --> textproc/py-sphinx18 (v1.8.5)
All ports that uses sphinx were changed to use the new variable
${PY_SPHINX} in the dependency line, exceptions:
* Ports that fails to build with sphinx 3.0.2 because of code.
They are pointing to textproc/py-sphinx18 directly.
There aren't many ports.
* Ports that doesn't know Python flavors.
- Add several patches to fix Sphinx consumers
The most common issues are related with pkg-plist, the output
files from Sphinx changes between versions, keep this dynamically
is the better approach.
This will save time in future sphinx updates.
PR: 245629
Exp-run by: antoine
Notes
Notes:
svn path=/head/; revision=534966
Diffstat (limited to 'Mk')
-rw-r--r-- | Mk/Uses/python.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 1da52645a47c..bedf07ef1c21 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -638,9 +638,11 @@ PYNUMPY= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1<1.19,1:math/py-numpy@${PY_FLAVOR} .if ${PYTHON_REL} < 3500 PY_PILLOW= ${PYTHON_PKGNAMEPREFIX}pillow6>=6.0.0:graphics/py-pillow6@${PY_FLAVOR} PY_TYPING= ${PYTHON_PKGNAMEPREFIX}typing>=3.7.4.1:devel/py-typing@${PY_FLAVOR} +PY_SPHINX= ${PYTHON_PKGNAMEPREFIX}sphinx18>=0:textproc/py-sphinx18@${PY_FLAVOR} .else PY_PILLOW= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} PY_TYPING= +PY_SPHINX= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} .endif .if ${PYTHON_REL} < 3400 |