Index: head/audio/py-pyaudio/Makefile =================================================================== --- head/audio/py-pyaudio/Makefile +++ head/audio/py-pyaudio/Makefile @@ -26,7 +26,7 @@ OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} post-patch: @${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ Index: head/biology/py-orange3-single-cell/Makefile =================================================================== --- head/biology/py-orange3-single-cell/Makefile +++ head/biology/py-orange3-single-cell/Makefile @@ -31,7 +31,7 @@ OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= gmake:devel/gmake \ - ${PY_SPHINX} + ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} pre-build-DOCS-on: @cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${GMAKE} html htmlhelp SPHINXBUILD=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} Index: head/comms/gnuradio/Makefile =================================================================== --- head/comms/gnuradio/Makefile +++ head/comms/gnuradio/Makefile @@ -13,7 +13,7 @@ BUILD_DEPENDS= volk>0:devel/volk \ doxygen>0:devel/doxygen \ - ${PY_SPHINX} \ + ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.2,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ ${PYNUMPY} \ ${PYTHON_SITELIBDIR}/mako/__init__.py:textproc/py-mako@${PY_FLAVOR} \ @@ -96,7 +96,7 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ - ${PY_SPHINX} \ + ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.2,1:textproc/py-sphinx@${PY_FLAVOR} \ dot:graphics/graphviz \ xmlto:textproc/xmlto \ freefont-ttf>0:x11-fonts/freefont-ttf Index: head/databases/cassandra3/Makefile =================================================================== --- head/databases/cassandra3/Makefile +++ head/databases/cassandra3/Makefile @@ -51,7 +51,7 @@ OPTIONS_SUB= yes SIGAR_DESC= Use SIGAR to collect system information -DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} SIGAR_RUN_DEPENDS= java-sigar>=1.6.4:java/sigar Index: head/databases/cassandra4/Makefile =================================================================== --- head/databases/cassandra4/Makefile +++ head/databases/cassandra4/Makefile @@ -77,7 +77,7 @@ SIGAR_DESC= Use SIGAR to collect system information SIGAR_RUN_DEPENDS= java-sigar>=1.6.4:java/sigar -DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} PORTDOCS= * Index: head/databases/py-xapian/Makefile =================================================================== --- head/databases/py-xapian/Makefile +++ head/databases/py-xapian/Makefile @@ -48,7 +48,7 @@ OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} post-patch: @${REINPLACE_CMD} -e 's|-lstdc++||g' ${WRKSRC}/configure Index: head/deskutils/py-khard/Makefile =================================================================== --- head/deskutils/py-khard/Makefile +++ head/deskutils/py-khard/Makefile @@ -19,7 +19,7 @@ ${PYTHON_PKGNAMEPREFIX}vdirsyncer>=0:deskutils/py-vdirsyncer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}vobject>=0.9.5:deskutils/py-vobject@${PY_FLAVOR} BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \ - ${PY_SPHINX} \ + ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx-autoapi>0:textproc/py-sphinx-autoapi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx-autodoc-typehints>0:textproc/py-sphinx-autodoc-typehints@${PY_FLAVOR} \ ${RUN_DEPENDS} Index: head/deskutils/py-paperless/Makefile =================================================================== --- head/deskutils/py-paperless/Makefile +++ head/deskutils/py-paperless/Makefile @@ -66,7 +66,7 @@ IMAGICK7_NOX11_DESC= ImageMagick7 without X11 support IMAGICK7_X11_DESC= ImageMagick7 with X11 support -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.8.3,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_USES= gmake IMAGICK6_X11_RUN_DEPENDS= convert:graphics/ImageMagick6 Index: head/devel/bpython/Makefile =================================================================== --- head/devel/bpython/Makefile +++ head/devel/bpython/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PY_SPHINX} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3,1:textproc/py-sphinx@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}curtsies>=0.3.0:devel/py-curtsies@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet@${PY_FLAVOR} \ ${PY_PYGMENTS} \ Index: head/devel/llvm-cheri/Makefile =================================================================== --- head/devel/llvm-cheri/Makefile +++ head/devel/llvm-cheri/Makefile @@ -69,7 +69,7 @@ PLIST_FILES+= share/toolchains/llvm${LLVM_SUFFIX}.mk SUB_FILES+= xtoolchain.mk CLANG_USE= GNOME=libxml2 -DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ -DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \ Index: head/devel/llvm-devel/Makefile =================================================================== --- head/devel/llvm-devel/Makefile +++ head/devel/llvm-devel/Makefile @@ -103,7 +103,7 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} DOCS_PORTDOCS= llvm -DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ -DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \ Index: head/devel/llvm10/Makefile =================================================================== --- head/devel/llvm10/Makefile +++ head/devel/llvm10/Makefile @@ -111,7 +111,7 @@ COMPILER_RT_CMAKE_ON= -DCOMPILER_RT_INSTALL_PATH=${LLVM_PREFIX}/lib/clang/${LLVM_RELEASE} COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} -DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} DOCS_CONFLICTS_BUILD= commonmark-cmark-* DOCS_PORTDOCS= llvm Index: head/devel/llvm11/Makefile =================================================================== --- head/devel/llvm11/Makefile +++ head/devel/llvm11/Makefile @@ -109,7 +109,7 @@ COMPILER_RT_CMAKE_ON= -DCOMPILER_RT_INSTALL_PATH=${LLVM_PREFIX}/lib/clang/${LLVM_RELEASE} COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} -DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} DOCS_CONFLICTS_BUILD= commonmark-cmark-* DOCS_PORTDOCS= llvm Index: head/devel/llvm80/Makefile =================================================================== --- head/devel/llvm80/Makefile +++ head/devel/llvm80/Makefile @@ -90,7 +90,7 @@ COMPILER_RT_DISTFILES= compiler-rt-${DISTVERSION}.src${EXTRACT_SUFX} COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} -DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} DOCS_CONFLICTS_BUILD= commonmark-cmark-* DOCS_PORTDOCS= llvm Index: head/devel/llvm90/Makefile =================================================================== --- head/devel/llvm90/Makefile +++ head/devel/llvm90/Makefile @@ -96,7 +96,7 @@ COMPILER_RT_DISTFILES= compiler-rt-${DISTVERSION}.src${EXTRACT_SUFX} COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} -DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} DOCS_CONFLICTS_BUILD= commonmark-cmark-* DOCS_PORTDOCS= llvm Index: head/devel/py-boolean.py/Makefile =================================================================== --- head/devel/py-boolean.py/Makefile +++ head/devel/py-boolean.py/Makefile @@ -19,7 +19,7 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" post-install-DOCS-on: Index: head/devel/py-cysignals/Makefile =================================================================== --- head/devel/py-cysignals/Makefile +++ head/devel/py-cysignals/Makefile @@ -22,7 +22,7 @@ USE_PYTHON= distutils OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.6,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_USES= gmake PORTDOCS= * Index: head/devel/py-easyprocess/Makefile =================================================================== --- head/devel/py-easyprocess/Makefile +++ head/devel/py-easyprocess/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paver>0:devel/py-paver@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cog>=2.3:devel/py-cog@${PY_FLAVOR} \ - ${PY_SPHINX} + ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} NO_ARCH= YES USE_PYTHON= autoplist distutils Index: head/devel/py-jira/Makefile =================================================================== --- head/devel/py-jira/Makefile +++ head/devel/py-jira/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} \ - ${PY_SPHINX} + ${PYTHON_PKGNAMEPREFIX}sphinx>=1.6.5,1:textproc/py-sphinx@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.3:www/py-requests-oauthlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests@${PY_FLAVOR} \ Index: head/devel/py-molecule/Makefile =================================================================== --- head/devel/py-molecule/Makefile +++ head/devel/py-molecule/Makefile @@ -58,7 +58,7 @@ EC2_DESC= For testing on Amazon EC2 Platform GCE_DESC= For testing on Google Compute Engine Platform DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}alabaster>0:textproc/py-alabaster@${PY_FLAVOR} \ - ${PY_SPHINX} + ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} AZURE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-cli>0:sysutils/py-azure-cli@${PY_FLAVOR} DOCKER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docker>=2.0.0:sysutils/py-docker@${PY_FLAVOR} EC2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \ Index: head/devel/py-pathtools/Makefile =================================================================== --- head/devel/py-pathtools/Makefile +++ head/devel/py-pathtools/Makefile @@ -17,7 +17,7 @@ OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} Index: head/devel/py-pip/Makefile =================================================================== --- head/devel/py-pip/Makefile +++ head/devel/py-pip/Makefile @@ -54,7 +54,7 @@ OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pypa-docs-theme>=g20180622:textproc/py-pypa-docs-theme@${PY_FLAVOR} \ - ${PY_SPHINX} + ${PYTHON_PKGNAMEPREFIX}sphinx>=2.4.3,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_PORTDOCS= * DOCS_VARS= PYDISTUTILS_BUILD_TARGET=build_sphinx \ PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env" Index: head/devel/py-python-gitlab/Makefile =================================================================== --- head/devel/py-python-gitlab/Makefile +++ head/devel/py-python-gitlab/Makefile @@ -27,7 +27,7 @@ AUTOCOMPLETE_DESC= Autocompletion via argcomplete AUTOCOMPLETE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argcomplete>=1.10.0<2:devel/py-argcomplete@${PY_FLAVOR} -DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.7.6,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} DOCS_PORTDOCS= * DOCS_VARS= PYDISTUTILS_BUILD_TARGET=build_sphinx \ Index: head/devel/py-spyder/Makefile =================================================================== --- head/devel/py-spyder/Makefile +++ head/devel/py-spyder/Makefile @@ -53,7 +53,7 @@ SPHINX_DESC= Rich text help on the Object Inspector SYMPY_DESC= Symbolic mathematics in the IPython Console -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} IPYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=6.0:devel/ipython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.11:net/py-pyzmq@${PY_FLAVOR} MATPLOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.0:math/py-matplotlib@${PY_FLAVOR} Index: head/devel/py-virtualenv/Makefile =================================================================== --- head/devel/py-virtualenv/Makefile +++ head/devel/py-virtualenv/Makefile @@ -14,7 +14,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} -DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.8.0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}towncrier>0:textproc/py-towncrier@${PY_FLAVOR} DOCS_BINARY_ALIAS= towncrier=towncrier-${PYTHON_VER} Index: head/devel/py-virtualenvwrapper/Makefile =================================================================== --- head/devel/py-virtualenvwrapper/Makefile +++ head/devel/py-virtualenvwrapper/Makefile @@ -25,7 +25,7 @@ OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-bitbucket>=1.0:textproc/py-sphinxcontrib-bitbucket@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+=build_sphinx \ PYDISTUTILS_BUILDARGS="-a -E" Index: head/devel/py-watchdog/Makefile =================================================================== --- head/devel/py-watchdog/Makefile +++ head/devel/py-watchdog/Makefile @@ -21,7 +21,7 @@ USE_PYTHON= autoplist distutils DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools@${PY_FLAVOR} \ - ${PY_SPHINX} + ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} GH_ACCOUNT= gorakhargosh Index: head/graphics/py-django-easy-thumbnails/Makefile =================================================================== --- head/graphics/py-django-easy-thumbnails/Makefile +++ head/graphics/py-django-easy-thumbnails/Makefile @@ -26,7 +26,7 @@ OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.8:www/py-django22@${PY_FLAVOR} \ - ${PY_SPHINX} \ + ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PY_PILLOW} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" Index: head/graphics/py-sorl-thumbnail/Makefile =================================================================== --- head/graphics/py-sorl-thumbnail/Makefile +++ head/graphics/py-sorl-thumbnail/Makefile @@ -30,7 +30,7 @@ OPTIONS_SINGLE_IMAGELIB= GRAPHICSMAGICK IMAGEMAGICK PILLOW WAND OPTIONS_GROUP_CACHING= REDIS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" GRAPHICSMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/gm:graphics/GraphicsMagick Index: head/mail/py-afew/Makefile =================================================================== --- head/mail/py-afew/Makefile +++ head/mail/py-afew/Makefile @@ -25,8 +25,8 @@ OPTIONS_DEFINE= MANPAGES DOCS OPTIONS_DEFAULT= MANPAGES -DOCS_BUILD_DEPENDS= ${PY_SPHINX} -MANPAGES_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} +MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} MANPAGES_PLIST_FILES= man/man1/afew.1.gz PORTDOCS= * Index: head/math/py-cypari2/Makefile =================================================================== --- head/math/py-cypari2/Makefile +++ head/math/py-cypari2/Makefile @@ -25,7 +25,7 @@ USE_PYTHON= cython distutils OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_USES= gmake PORTDOCS= * Index: head/math/py-fpylll/Makefile =================================================================== --- head/math/py-fpylll/Makefile +++ head/math/py-fpylll/Makefile @@ -33,7 +33,7 @@ .endif OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.6,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_USES= gmake PORTDOCS= * Index: head/math/py-gmpy2-devel/Makefile =================================================================== --- head/math/py-gmpy2-devel/Makefile +++ head/math/py-gmpy2-devel/Makefile @@ -27,7 +27,7 @@ CONFLICTS= ${PYTHON_PKGNAMEPREFIX}gmpy2-2.0* OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_USES= gmake PORTDOCS= * Index: head/math/py-pplpy/Makefile =================================================================== --- head/math/py-pplpy/Makefile +++ head/math/py-pplpy/Makefile @@ -27,7 +27,7 @@ USE_PYTHON= cython distutils OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_USES= gmake PORTDOCS= * Index: head/net/ceph14/Makefile =================================================================== --- head/net/ceph14/Makefile +++ head/net/ceph14/Makefile @@ -22,7 +22,7 @@ git:devel/git \ gperf:devel/gperf \ yasm:devel/yasm \ - ${PY_SPHINX} \ + ${PYTHON_PKGNAMEPREFIX}sphinx>=2.1.2,1:textproc/py-sphinx@${PY_FLAVOR} \ ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops \ ${LOCALBASE}/bin/ld:devel/binutils LIB_DEPENDS= \ Index: head/net/irrd/Makefile =================================================================== --- head/net/irrd/Makefile +++ head/net/irrd/Makefile @@ -46,7 +46,7 @@ GROUPS= ${PORTNAME} OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=2.0.1,1:textproc/py-sphinx@${PY_FLAVOR} PLIST_FILES= "@sample etc/${PORTNAME}${PKGNAMESUFFIX}.yaml.sample" NO_ARCH= yes Index: head/net/py-gntp/Makefile =================================================================== --- head/net/py-gntp/Makefile +++ head/net/py-gntp/Makefile @@ -25,7 +25,7 @@ OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+=build_sphinx post-install-DOCS-on: Index: head/net/py-zeep/Makefile =================================================================== --- head/net/py-zeep/Makefile +++ head/net/py-zeep/Makefile @@ -15,7 +15,7 @@ LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PY_SPHINX} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.4.0,1:textproc/py-sphinx@${PY_FLAVOR} 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} \ Index: head/science/code_saturne/Makefile =================================================================== --- head/science/code_saturne/Makefile +++ head/science/code_saturne/Makefile @@ -91,7 +91,7 @@ BUILD_DEPENDS+= fig2dev:print/fig2dev \ doxygen:devel/doxygen \ dot:graphics/graphviz \ - ${PY_SPHINX} + ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} BINARY_ALIAS+= sphinx-build=sphinx-build-${PYTHON_VER} ALL_TARGET= all pdf DOCS= AUTHORS ChangeLog README Index: head/security/py-certbot/Makefile =================================================================== --- head/security/py-certbot/Makefile +++ head/security/py-certbot/Makefile @@ -42,7 +42,7 @@ OPTIONS_DEFAULT= MANPAGES MANPAGES_BUILD_DEPENDS= ${RUN_DEPENDS} \ - ${PY_SPHINX} \ + ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}repoze.sphinx.autointerface>0:devel/py-repoze.sphinx.autointerface@${PY_FLAVOR} \ Index: head/sysutils/py-pkginfo/Makefile =================================================================== --- head/sysutils/py-pkginfo/Makefile +++ head/sysutils/py-pkginfo/Makefile @@ -19,7 +19,7 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" post-install-DOCS-on: Index: head/textproc/py-cloud_sptheme/Makefile =================================================================== --- head/textproc/py-cloud_sptheme/Makefile +++ head/textproc/py-cloud_sptheme/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PY_SPHINX} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.6,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-fulltoc>=1.1:textproc/py-sphinxcontrib-fulltoc@${PY_FLAVOR} USES= python:3.6+ Index: head/textproc/py-docrepr/Makefile =================================================================== --- head/textproc/py-docrepr/Makefile +++ head/textproc/py-docrepr/Makefile @@ -13,7 +13,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \ - ${PY_SPHINX} + ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist distutils Index: head/textproc/py-furo/Makefile =================================================================== --- head/textproc/py-furo/Makefile +++ head/textproc/py-furo/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \ - ${PY_SPHINX} + ${PYTHON_PKGNAMEPREFIX}sphinx>=3.0,1:textproc/py-sphinx@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= autoplist concurrent distutils Index: head/textproc/py-gfm/Makefile =================================================================== --- head/textproc/py-gfm/Makefile +++ head/textproc/py-gfm/Makefile @@ -24,7 +24,7 @@ OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+=build_sphinx Index: head/textproc/py-hieroglyph/Makefile =================================================================== --- head/textproc/py-hieroglyph/Makefile +++ head/textproc/py-hieroglyph/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PY_SPHINX} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=2.0,1:textproc/py-sphinx@${PY_FLAVOR} USES= python:3.5+ shebangfix USE_PYTHON= autoplist concurrent distutils Index: head/textproc/py-m2r/Makefile =================================================================== --- head/textproc/py-m2r/Makefile +++ head/textproc/py-m2r/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mistune>0:textproc/py-mistune@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \ - ${PY_SPHINX} + ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} # Officially 3.6 USES= python:3.6+ Index: head/textproc/py-numpydoc/Makefile =================================================================== --- head/textproc/py-numpydoc/Makefile +++ head/textproc/py-numpydoc/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${PY_FLAVOR} \ - ${PY_SPHINX} + ${PYTHON_PKGNAMEPREFIX}sphinx>=1.6.5,1:textproc/py-sphinx@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} USES= python:3.6+ Index: head/textproc/py-openstackdocstheme/Makefile =================================================================== --- head/textproc/py-openstackdocstheme/Makefile +++ head/textproc/py-openstackdocstheme/Makefile @@ -15,7 +15,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dulwich>=0.15.0:devel/dulwich@${PY_FLAVOR} \ - ${PY_SPHINX} + ${PYTHON_PKGNAMEPREFIX}sphinx>=2.2,1:textproc/py-sphinx@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= distutils concurrent autoplist Index: head/textproc/py-os-api-ref/Makefile =================================================================== --- head/textproc/py-os-api-ref/Makefile +++ head/textproc/py-os-api-ref/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ - ${PY_SPHINX} \ + ${PYTHON_PKGNAMEPREFIX}sphinx>=1.7,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openstackdocstheme>=1.6.2:textproc/py-openstackdocstheme@${PY_FLAVOR} USES= python:3.6+ Index: head/textproc/py-pallets-sphinx-themes/Makefile =================================================================== --- head/textproc/py-pallets-sphinx-themes/Makefile +++ head/textproc/py-pallets-sphinx-themes/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.rst -RUN_DEPENDS= ${PY_SPHINX} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils Index: head/textproc/py-recommonmark/Makefile =================================================================== --- head/textproc/py-recommonmark/Makefile +++ head/textproc/py-recommonmark/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}CommonMark>=0.7.3:textproc/py-CommonMark@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils@${PY_FLAVOR} \ - ${PY_SPHINX} + ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.1,1:textproc/py-sphinx@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils Index: head/textproc/py-sphinx-argparse/Makefile =================================================================== --- head/textproc/py-sphinx-argparse/Makefile +++ head/textproc/py-sphinx-argparse/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PY_SPHINX} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.0,1:textproc/py-sphinx@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist distutils Index: head/textproc/py-sphinx-autoapi/Makefile =================================================================== --- head/textproc/py-sphinx-autoapi/Makefile +++ head/textproc/py-sphinx-autoapi/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.rst -RUN_DEPENDS= ${PY_SPHINX} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.6,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}astroid>=2.4:devel/py-astroid@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ Index: head/textproc/py-sphinx-autodoc-typehints/Makefile =================================================================== --- head/textproc/py-sphinx-autodoc-typehints/Makefile +++ head/textproc/py-sphinx-autodoc-typehints/Makefile @@ -12,11 +12,11 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PY_SPHINX} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=3.2.0,1:textproc/py-sphinx@${PY_FLAVOR} BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=2.0.0:devel/py-setuptools_scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=40.0.4:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0.29.0:devel/py-wheel@${PY_FLAVOR} \ - ${PY_SPHINX} + ${PYTHON_PKGNAMEPREFIX}sphinx>=3.2.0,1:textproc/py-sphinx@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= autoplist distutils Index: head/textproc/py-sphinx-intl/Makefile =================================================================== --- head/textproc/py-sphinx-intl/Makefile +++ head/textproc/py-sphinx-intl/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PY_SPHINX} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}polib>=1.0.6:devel/py-polib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${PY_FLAVOR} Index: head/textproc/py-sphinx-issues/Makefile =================================================================== --- head/textproc/py-sphinx-issues/Makefile +++ head/textproc/py-sphinx-issues/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PY_SPHINX} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist distutils Index: head/textproc/py-sphinx-tabs/Makefile =================================================================== --- head/textproc/py-sphinx-tabs/Makefile +++ head/textproc/py-sphinx-tabs/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PY_PYGMENTS} \ - ${PY_SPHINX} + ${PYTHON_PKGNAMEPREFIX}sphinx>=2,1<4,1:textproc/py-sphinx@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} Index: head/textproc/py-sphinx_wikipedia/Makefile =================================================================== --- head/textproc/py-sphinx_wikipedia/Makefile +++ head/textproc/py-sphinx_wikipedia/Makefile @@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PY_SPHINX} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= flavors Index: head/textproc/py-sphinxcontrib-adadomain/Makefile =================================================================== --- head/textproc/py-sphinxcontrib-adadomain/Makefile +++ head/textproc/py-sphinxcontrib-adadomain/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PY_SPHINX} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.0,1:textproc/py-sphinx@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils Index: head/textproc/py-sphinxcontrib-bitbucket/Makefile =================================================================== --- head/textproc/py-sphinxcontrib-bitbucket/Makefile +++ head/textproc/py-sphinxcontrib-bitbucket/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PY_SPHINX} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0.6,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}docutils>=0.6:textproc/py-docutils@${PY_FLAVOR} USES= python:3.6+ Index: head/textproc/py-sphinxcontrib-fulltoc/Makefile =================================================================== --- head/textproc/py-sphinxcontrib-fulltoc/Makefile +++ head/textproc/py-sphinxcontrib-fulltoc/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr@${PY_FLAVOR} -RUN_DEPENDS= ${PY_SPHINX} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= distutils autoplist Index: head/textproc/py-sphinxcontrib-httpdomain/Makefile =================================================================== --- head/textproc/py-sphinxcontrib-httpdomain/Makefile +++ head/textproc/py-sphinxcontrib-httpdomain/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PY_SPHINX} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.0,1:textproc/py-sphinx@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= distutils autoplist Index: head/textproc/py-sphinxcontrib-log-cabinet/Makefile =================================================================== --- head/textproc/py-sphinxcontrib-log-cabinet/Makefile +++ head/textproc/py-sphinxcontrib-log-cabinet/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.rst -RUN_DEPENDS= ${PY_SPHINX} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils Index: head/textproc/py-sphinxcontrib-newsfeed/Makefile =================================================================== --- head/textproc/py-sphinxcontrib-newsfeed/Makefile +++ head/textproc/py-sphinxcontrib-newsfeed/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PY_SPHINX} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= distutils autoplist Index: head/textproc/py-sphinxcontrib-programoutput/Makefile =================================================================== --- head/textproc/py-sphinxcontrib-programoutput/Makefile +++ head/textproc/py-sphinxcontrib-programoutput/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PY_SPHINX} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.5,1:textproc/py-sphinx@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist distutils Index: head/www/py-beautifulsoup/Makefile =================================================================== --- head/www/py-beautifulsoup/Makefile +++ head/www/py-beautifulsoup/Makefile @@ -24,7 +24,7 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" post-install-DOCS-on: Index: head/www/py-cssselect/Makefile =================================================================== --- head/www/py-cssselect/Makefile +++ head/www/py-cssselect/Makefile @@ -21,7 +21,7 @@ OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} Index: head/www/py-dj31-django-auth-ldap/Makefile =================================================================== --- head/www/py-dj31-django-auth-ldap/Makefile +++ head/www/py-dj31-django-auth-ldap/Makefile @@ -24,7 +24,7 @@ CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-auth-ldap OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" post-install-DOCS-on: Index: head/www/py-django-auth-ldap/Makefile =================================================================== --- head/www/py-django-auth-ldap/Makefile +++ head/www/py-django-auth-ldap/Makefile @@ -24,7 +24,7 @@ CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj31-django-auth-ldap OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" post-install-DOCS-on: Index: head/www/py-django-babel/Makefile =================================================================== --- head/www/py-django-babel/Makefile +++ head/www/py-django-babel/Makefile @@ -24,7 +24,7 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" post-install-DOCS-on: Index: head/www/py-django-configurations/Makefile =================================================================== --- head/www/py-django-configurations/Makefile +++ head/www/py-django-configurations/Makefile @@ -26,7 +26,7 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.4,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" post-install-DOCS-on: Index: head/www/py-django-haystack/Makefile =================================================================== --- head/www/py-django-haystack/Makefile +++ head/www/py-django-haystack/Makefile @@ -24,7 +24,7 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" post-install-DOCS-on: Index: head/www/py-django-reversion/Makefile =================================================================== --- head/www/py-django-reversion/Makefile +++ head/www/py-django-reversion/Makefile @@ -23,7 +23,7 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" post-install-DOCS-on: Index: head/www/py-django-simple-captcha/Makefile =================================================================== --- head/www/py-django-simple-captcha/Makefile +++ head/www/py-django-simple-captcha/Makefile @@ -27,7 +27,7 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS MIGRATIONS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" MIGRATIONS_DESC= Schema and data migration support (via south) MIGRATIONS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}south>0:databases/py-south@${PY_FLAVOR} Index: head/www/py-django-treebeard/Makefile =================================================================== --- head/www/py-django-treebeard/Makefile +++ head/www/py-django-treebeard/Makefile @@ -24,7 +24,7 @@ OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>0:www/py-django22@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}graphviz>0:graphics/py-graphviz@${PY_FLAVOR} \ - ${PY_SPHINX} + ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" post-install-DOCS-on: Index: head/www/py-django111/Makefile =================================================================== --- head/www/py-django111/Makefile +++ head/www/py-django111/Makefile @@ -46,7 +46,7 @@ PLIST_FILES= man/man1/django-admin.1.gz -HTMLDOCS_BUILD_DEPENDS= ${PY_SPHINX} +HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} HTMLDOCS_IMPLIES= DOCS PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR} SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} Index: head/www/py-django22/Makefile =================================================================== --- head/www/py-django22/Makefile +++ head/www/py-django22/Makefile @@ -44,7 +44,7 @@ OPTIONS_DEFAULT=SQLITE HTMLDOCS_DESC= Install HTML documentation (requires Sphinx) -HTMLDOCS_BUILD_DEPENDS= ${PY_SPHINX} +HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} HTMLDOCS_IMPLIES= DOCS PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR} MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.3.13:databases/py-mysqlclient@${PY_FLAVOR} Index: head/www/py-django30/Makefile =================================================================== --- head/www/py-django30/Makefile +++ head/www/py-django30/Makefile @@ -45,7 +45,7 @@ OPTIONS_DEFAULT=SQLITE HTMLDOCS_DESC= Install HTML documentation (requires Sphinx) -HTMLDOCS_BUILD_DEPENDS= ${PY_SPHINX} +HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} HTMLDOCS_IMPLIES= DOCS PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR} MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.3.13:databases/py-mysqlclient@${PY_FLAVOR} Index: head/www/py-django31/Makefile =================================================================== --- head/www/py-django31/Makefile +++ head/www/py-django31/Makefile @@ -45,7 +45,7 @@ OPTIONS_DEFAULT=SQLITE HTMLDOCS_DESC= Install HTML documentation (requires Sphinx) -HTMLDOCS_BUILD_DEPENDS= ${PY_SPHINX} +HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} HTMLDOCS_IMPLIES= DOCS PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR} MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.3.13:databases/py-mysqlclient@${PY_FLAVOR} Index: head/www/py-requests-mock/Makefile =================================================================== --- head/www/py-requests-mock/Makefile +++ head/www/py-requests-mock/Makefile @@ -19,7 +19,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fixtures>=0:devel/py-fixtures@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ - ${PY_SPHINX} \ + ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}testrepository>=0.0.18:devel/py-testrepository@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}testtools>=0:devel/py-testtools@${PY_FLAVOR} Index: head/www/py-requests-toolbelt/Makefile =================================================================== --- head/www/py-requests-toolbelt/Makefile +++ head/www/py-requests-toolbelt/Makefile @@ -22,7 +22,7 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" Index: head/www/py-webob/Makefile =================================================================== --- head/www/py-webob/Makefile +++ head/www/py-webob/Makefile @@ -19,7 +19,7 @@ USES= python:3.6+ DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylons-sphinx-themes>=0:textproc/py-pylons-sphinx-themes@${PY_FLAVOR} \ - ${PY_SPHINX} + ${PYTHON_PKGNAMEPREFIX}sphinx>=1.7.5,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME} Index: head/www/varnish6/Makefile =================================================================== --- head/www/varnish6/Makefile +++ head/www/varnish6/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= rst2man:textproc/py-docutils@${PY_FLAVOR} \ - ${PY_SPHINX} + ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} LIB_DEPENDS= libpcre.so:devel/pcre USES= autoreconf compiler cpe gmake libedit libtool ncurses pathfix \ Index: head/x11/py-pyvirtualdisplay/Makefile =================================================================== --- head/x11/py-pyvirtualdisplay/Makefile +++ head/x11/py-pyvirtualdisplay/Makefile @@ -18,7 +18,7 @@ ${PYTHON_PKGNAMEPREFIX}easyprocess>0:devel/py-easyprocess@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}paver>0:devel/py-paver@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyscreenshot>0:x11/py-pyscreenshot@${PY_FLAVOR} \ - ${PY_SPHINX} \ + ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PY_PILLOW} \ xauth>0:x11/xauth