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 /net | |
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 'net')
-rw-r--r-- | net/ceph12/Makefile | 2 | ||||
-rw-r--r-- | net/ceph13/Makefile | 2 | ||||
-rw-r--r-- | net/ceph14/Makefile | 2 | ||||
-rw-r--r-- | net/frr5/Makefile | 3 | ||||
-rw-r--r-- | net/frr6/Makefile | 3 | ||||
-rw-r--r-- | net/frr7/Makefile | 2 | ||||
-rw-r--r-- | net/irrd/Makefile | 2 | ||||
-rw-r--r-- | net/py-gntp/Makefile | 2 | ||||
-rw-r--r-- | net/py-zeep/Makefile | 2 | ||||
-rw-r--r-- | net/savvycan/Makefile | 2 |
10 files changed, 12 insertions, 10 deletions
diff --git a/net/ceph12/Makefile b/net/ceph12/Makefile index e58fa47380a2..af51a4e49811 100644 --- a/net/ceph12/Makefile +++ b/net/ceph12/Makefile @@ -19,7 +19,7 @@ ONLY_FOR_ARCHS= amd64 BUILD_DEPENDS= \ yasm:devel/yasm \ - ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} \ + ${PY_SPHINX} \ gperf:devel/gperf \ ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops LIB_DEPENDS= \ diff --git a/net/ceph13/Makefile b/net/ceph13/Makefile index b79967635c40..2e09dcb9b3ae 100644 --- a/net/ceph13/Makefile +++ b/net/ceph13/Makefile @@ -23,7 +23,7 @@ BUILD_DEPENDS= \ bash:shells/bash \ git:devel/git \ yasm:devel/yasm \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ + ${PY_SPHINX} \ gperf:devel/gperf \ ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops LIB_DEPENDS= \ diff --git a/net/ceph14/Makefile b/net/ceph14/Makefile index 3e3c6a626007..0b941c9f6f5b 100644 --- a/net/ceph14/Makefile +++ b/net/ceph14/Makefile @@ -22,7 +22,7 @@ BUILD_DEPENDS= \ git:devel/git \ gperf:devel/gperf \ yasm:devel/yasm \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ + ${PY_SPHINX} \ ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops \ ${LOCALBASE}/bin/ld:devel/binutils LIB_DEPENDS= \ diff --git a/net/frr5/Makefile b/net/frr5/Makefile index 8a594bc13cd9..1e449e675457 100644 --- a/net/frr5/Makefile +++ b/net/frr5/Makefile @@ -64,7 +64,8 @@ CONFIGURE_ARGS= --enable-user=frr \ --disable-nhrpd \ --disable-pimd -MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx +MANPAGES_BUILD_DEPENDS= ${PY_SPHINX} +MANPAGES_MAKE_ENV= SPHINXBUILD=sphinx-build-${PYTHON_VER} MANPAGES_CONFIGURE_OFF= --disable-doc SHELLACCESS_CONFIGURE_ENABLE= shell-access FPM_CONFIGURE_ENABLE= fpm diff --git a/net/frr6/Makefile b/net/frr6/Makefile index 49375224328a..5494fb978ffd 100644 --- a/net/frr6/Makefile +++ b/net/frr6/Makefile @@ -64,7 +64,8 @@ CONFIGURE_ARGS= --enable-user=frr \ --disable-nhrpd \ --disable-pimd -MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx +MANPAGES_BUILD_DEPENDS= ${PY_SPHINX} +MANPAGES_BINARY_ALIAS= sphinx-build=sphinx-build-${PYTHON_VER} MANPAGES_CONFIGURE_OFF= --disable-doc SHELLACCESS_CONFIGURE_ENABLE= shell-access FPM_CONFIGURE_ENABLE= fpm diff --git a/net/frr7/Makefile b/net/frr7/Makefile index a97c529a63e5..971967061b96 100644 --- a/net/frr7/Makefile +++ b/net/frr7/Makefile @@ -69,7 +69,7 @@ CONFIGURE_ARGS= --enable-user=frr \ --disable-vrrpd \ --with-vtysh-pager=cat -MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} +MANPAGES_BUILD_DEPENDS= ${PY_SPHINX} MANPAGES_CONFIGURE_OFF= --disable-doc CONFIGROLLBACKS_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 CONFIGROLLBACKS_CONFIGURE_ENABLE= config-rollbacks diff --git a/net/irrd/Makefile b/net/irrd/Makefile index 16bc5ff73e98..1482ea4b1083 100644 --- a/net/irrd/Makefile +++ b/net/irrd/Makefile @@ -46,7 +46,7 @@ USERS= ${PORTNAME} GROUPS= ${PORTNAME} OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} +DOCS_BUILD_DEPENDS= ${PY_SPHINX} PLIST_FILES= "@sample etc/${PORTNAME}${PKGNAMESUFFIX}.yaml.sample" NO_ARCH= yes diff --git a/net/py-gntp/Makefile b/net/py-gntp/Makefile index 3ff3dd842cd0..c738fb16c7af 100644 --- a/net/py-gntp/Makefile +++ b/net/py-gntp/Makefile @@ -25,7 +25,7 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} +DOCS_BUILD_DEPENDS= ${PY_SPHINX} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+=build_sphinx post-install-DOCS-on: diff --git a/net/py-zeep/Makefile b/net/py-zeep/Makefile index 2cfacead7401..e6674bf6fb37 100644 --- a/net/py-zeep/Makefile +++ b/net/py-zeep/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE MIT LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} +BUILD_DEPENDS= ${PY_SPHINX} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}attrs>=16.0.0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cached-property>=1.3.0:devel/py-cached-property@${PY_FLAVOR} \ diff --git a/net/savvycan/Makefile b/net/savvycan/Makefile index 619dafcb275c..6715e3f8f832 100644 --- a/net/savvycan/Makefile +++ b/net/savvycan/Makefile @@ -10,7 +10,7 @@ COMMENT= CAN bus reverse engineering and capture tool LICENSE= MIT -BUILD_DEPENDS= sphinx-build:textproc/py-sphinx@${PY_FLAVOR} +BUILD_DEPENDS= ${PY_SPHINX} USES= compiler:c++11-lang gmake python:build qmake qt:5 USE_QT= buildtools_build core gui help printsupport serialbus \ |