From 75a5f7f0762c1039d83da77f699eed5f26998731 Mon Sep 17 00:00:00 2001 From: "Danilo G. Baio" Date: Mon, 11 May 2020 23:51:58 +0000 Subject: 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 --- graphics/colmap/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'graphics/colmap') diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile index 9dc7814b3f03..2bf2ad616aae 100644 --- a/graphics/colmap/Makefile +++ b/graphics/colmap/Makefile @@ -47,7 +47,7 @@ CGAL_BUILD_DEPENDS= cgal>0:math/cgal CGAL_CMAKE_BOOL= CGAL_ENABLED DOCS_BUILD_DEPENDS= gmake:devel/gmake \ - sphinx-build:textproc/py-sphinx + sphinx-build:textproc/py-sphinx18 DOCS_PORTDOCS= * OPENMP_USES= compiler:openmp -- cgit v1.2.3