Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 14 Jan 2021 14:34:38 +0000 (UTC)
From:      "Danilo G. Baio" <dbaio@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r561562 - in head: audio/py-pyaudio biology/py-orange3-single-cell comms/gnuradio databases/cassandra3 databases/cassandra4 databases/py-xapian deskutils/py-khard deskutils/py-paperless...
Message-ID:  <202101141434.10EEYcSq040778@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dbaio
Date: Thu Jan 14 14:34:38 2021
New Revision: 561562
URL: https://svnweb.freebsd.org/changeset/ports/561562

Log:
  Remove PY_SPHINX from ports using Python 3
  
  Approved by:	 portmgr blanket
  Differential Revision:	https://reviews.freebsd.org/D28093

Modified:
  head/audio/py-pyaudio/Makefile
  head/biology/py-orange3-single-cell/Makefile
  head/comms/gnuradio/Makefile
  head/databases/cassandra3/Makefile
  head/databases/cassandra4/Makefile
  head/databases/py-xapian/Makefile
  head/deskutils/py-khard/Makefile
  head/deskutils/py-paperless/Makefile
  head/devel/bpython/Makefile
  head/devel/llvm-cheri/Makefile
  head/devel/llvm-devel/Makefile
  head/devel/llvm10/Makefile
  head/devel/llvm11/Makefile
  head/devel/llvm80/Makefile
  head/devel/llvm90/Makefile
  head/devel/py-boolean.py/Makefile
  head/devel/py-cysignals/Makefile
  head/devel/py-easyprocess/Makefile
  head/devel/py-jira/Makefile
  head/devel/py-molecule/Makefile
  head/devel/py-pathtools/Makefile
  head/devel/py-pip/Makefile
  head/devel/py-python-gitlab/Makefile
  head/devel/py-spyder/Makefile
  head/devel/py-virtualenv/Makefile
  head/devel/py-virtualenvwrapper/Makefile
  head/devel/py-watchdog/Makefile
  head/graphics/py-django-easy-thumbnails/Makefile
  head/graphics/py-sorl-thumbnail/Makefile
  head/mail/py-afew/Makefile
  head/math/py-cypari2/Makefile
  head/math/py-fpylll/Makefile
  head/math/py-gmpy2-devel/Makefile
  head/math/py-pplpy/Makefile
  head/net/ceph14/Makefile
  head/net/irrd/Makefile
  head/net/py-gntp/Makefile
  head/net/py-zeep/Makefile
  head/science/code_saturne/Makefile
  head/security/py-certbot/Makefile
  head/sysutils/py-pkginfo/Makefile
  head/textproc/py-cloud_sptheme/Makefile
  head/textproc/py-docrepr/Makefile
  head/textproc/py-furo/Makefile
  head/textproc/py-gfm/Makefile
  head/textproc/py-hieroglyph/Makefile
  head/textproc/py-m2r/Makefile
  head/textproc/py-numpydoc/Makefile
  head/textproc/py-openstackdocstheme/Makefile
  head/textproc/py-os-api-ref/Makefile
  head/textproc/py-pallets-sphinx-themes/Makefile
  head/textproc/py-recommonmark/Makefile
  head/textproc/py-sphinx-argparse/Makefile
  head/textproc/py-sphinx-autoapi/Makefile
  head/textproc/py-sphinx-autodoc-typehints/Makefile
  head/textproc/py-sphinx-intl/Makefile
  head/textproc/py-sphinx-issues/Makefile
  head/textproc/py-sphinx-tabs/Makefile
  head/textproc/py-sphinx_wikipedia/Makefile
  head/textproc/py-sphinxcontrib-adadomain/Makefile
  head/textproc/py-sphinxcontrib-bitbucket/Makefile
  head/textproc/py-sphinxcontrib-fulltoc/Makefile
  head/textproc/py-sphinxcontrib-httpdomain/Makefile
  head/textproc/py-sphinxcontrib-log-cabinet/Makefile
  head/textproc/py-sphinxcontrib-newsfeed/Makefile
  head/textproc/py-sphinxcontrib-programoutput/Makefile
  head/www/py-beautifulsoup/Makefile
  head/www/py-cssselect/Makefile
  head/www/py-dj31-django-auth-ldap/Makefile
  head/www/py-django-auth-ldap/Makefile
  head/www/py-django-babel/Makefile
  head/www/py-django-configurations/Makefile
  head/www/py-django-haystack/Makefile
  head/www/py-django-reversion/Makefile
  head/www/py-django-simple-captcha/Makefile
  head/www/py-django-treebeard/Makefile
  head/www/py-django111/Makefile
  head/www/py-django22/Makefile
  head/www/py-django30/Makefile
  head/www/py-django31/Makefile
  head/www/py-requests-mock/Makefile
  head/www/py-requests-toolbelt/Makefile
  head/www/py-webob/Makefile
  head/www/varnish6/Makefile
  head/x11/py-pyvirtualdisplay/Makefile

Modified: head/audio/py-pyaudio/Makefile
==============================================================================
--- head/audio/py-pyaudio/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/audio/py-pyaudio/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -26,7 +26,7 @@ WRKSRC=		${WRKDIR}/PyAudio-${PORTVERSION}
 
 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/=/%%!/} \

Modified: head/biology/py-orange3-single-cell/Makefile
==============================================================================
--- head/biology/py-orange3-single-cell/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/biology/py-orange3-single-cell/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -31,7 +31,7 @@ USE_PYTHON=	distutils autoplist
 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}

Modified: head/comms/gnuradio/Makefile
==============================================================================
--- head/comms/gnuradio/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/comms/gnuradio/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -13,7 +13,7 @@ LICENSE=	GPLv3
 
 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 @@ INSTALLS_ICONS=		yes
 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

Modified: head/databases/cassandra3/Makefile
==============================================================================
--- head/databases/cassandra3/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/databases/cassandra3/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -51,7 +51,7 @@ OPTIONS_DEFAULT=	SIGAR
 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
 

Modified: head/databases/cassandra4/Makefile
==============================================================================
--- head/databases/cassandra4/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/databases/cassandra4/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -77,7 +77,7 @@ OPTIONS_SUB=		yes
 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=		*

Modified: head/databases/py-xapian/Makefile
==============================================================================
--- head/databases/py-xapian/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/databases/py-xapian/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -48,7 +48,7 @@ PORTSCOUT=	limitw:1,even
 
 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

Modified: head/deskutils/py-khard/Makefile
==============================================================================
--- head/deskutils/py-khard/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/deskutils/py-khard/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.
 		${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}

Modified: head/deskutils/py-paperless/Makefile
==============================================================================
--- head/deskutils/py-paperless/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/deskutils/py-paperless/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -66,7 +66,7 @@ IMAGICK6_X11_DESC=	ImageMagick6 with X11 support
 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

Modified: head/devel/bpython/Makefile
==============================================================================
--- head/devel/bpython/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/devel/bpython/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -14,7 +14,7 @@ COMMENT=	Fancy interface to the Python interpreter
 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} \

Modified: head/devel/llvm-cheri/Makefile
==============================================================================
--- head/devel/llvm-cheri/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/devel/llvm-cheri/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -69,7 +69,7 @@ CLANG_PORTDOCS=		clang
 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} \

Modified: head/devel/llvm-devel/Makefile
==============================================================================
--- head/devel/llvm-devel/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/devel/llvm-devel/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -103,7 +103,7 @@ COMPILER_RT_IMPLIES=	CLANG
 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} \

Modified: head/devel/llvm10/Makefile
==============================================================================
--- head/devel/llvm10/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/devel/llvm10/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -111,7 +111,7 @@ COMPILER_RT_EXTRA_PATCHES=	${PATCHDIR}/compiler-rt
 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

Modified: head/devel/llvm11/Makefile
==============================================================================
--- head/devel/llvm11/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/devel/llvm11/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -109,7 +109,7 @@ COMPILER_RT_EXTRA_PATCHES=	${PATCHDIR}/compiler-rt
 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

Modified: head/devel/llvm80/Makefile
==============================================================================
--- head/devel/llvm80/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/devel/llvm80/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -90,7 +90,7 @@ COMPILER_RT_DESC=	Sanitizer libraries
 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

Modified: head/devel/llvm90/Makefile
==============================================================================
--- head/devel/llvm90/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/devel/llvm90/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -96,7 +96,7 @@ COMPILER_RT_DESC=	Sanitizer libraries
 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

Modified: head/devel/py-boolean.py/Makefile
==============================================================================
--- head/devel/py-boolean.py/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/devel/py-boolean.py/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -19,7 +19,7 @@ NO_ARCH=	yes
 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:

Modified: head/devel/py-cysignals/Makefile
==============================================================================
--- head/devel/py-cysignals/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/devel/py-cysignals/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -22,7 +22,7 @@ USES=		autoreconf:build compiler:c++11-lang gettext lo
 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=		*
 

Modified: head/devel/py-easyprocess/Makefile
==============================================================================
--- head/devel/py-easyprocess/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/devel/py-easyprocess/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 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

Modified: head/devel/py-jira/Makefile
==============================================================================
--- head/devel/py-jira/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/devel/py-jira/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 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} \

Modified: head/devel/py-molecule/Makefile
==============================================================================
--- head/devel/py-molecule/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/devel/py-molecule/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -58,7 +58,7 @@ DOCKER_DESC=	For testing on Docker Platform(Remote)
 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} \

Modified: head/devel/py-pathtools/Makefile
==============================================================================
--- head/devel/py-pathtools/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/devel/py-pathtools/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -17,7 +17,7 @@ USE_PYTHON=	distutils autoplist
 
 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}
 

Modified: head/devel/py-pip/Makefile
==============================================================================
--- head/devel/py-pip/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/devel/py-pip/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -54,7 +54,7 @@ SHEBANG_FILES=	src/pip/__init__.py
 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"

Modified: head/devel/py-python-gitlab/Makefile
==============================================================================
--- head/devel/py-python-gitlab/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/devel/py-python-gitlab/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -27,7 +27,7 @@ OPTIONS_DEFINE=	AUTOCOMPLETE DOCS YAML
 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 \

Modified: head/devel/py-spyder/Makefile
==============================================================================
--- head/devel/py-spyder/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/devel/py-spyder/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -53,7 +53,7 @@ SCIPY_DESC=	Signal/image processing
 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}

Modified: head/devel/py-virtualenv/Makefile
==============================================================================
--- head/devel/py-virtualenv/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/devel/py-virtualenv/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -14,7 +14,7 @@ LICENSE=	MIT
 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}

Modified: head/devel/py-virtualenvwrapper/Makefile
==============================================================================
--- head/devel/py-virtualenvwrapper/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/devel/py-virtualenvwrapper/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -25,7 +25,7 @@ USE_PYTHON=	autoplist concurrent distutils
 
 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"

Modified: head/devel/py-watchdog/Makefile
==============================================================================
--- head/devel/py-watchdog/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/devel/py-watchdog/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -21,7 +21,7 @@ USE_GITHUB=	yes
 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

Modified: head/graphics/py-django-easy-thumbnails/Makefile
==============================================================================
--- head/graphics/py-django-easy-thumbnails/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/graphics/py-django-easy-thumbnails/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -26,7 +26,7 @@ PORTDOCS=	*
 
 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"
 

Modified: head/graphics/py-sorl-thumbnail/Makefile
==============================================================================
--- head/graphics/py-sorl-thumbnail/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/graphics/py-sorl-thumbnail/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -30,7 +30,7 @@ OPTIONS_GROUP=		CACHING
 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

Modified: head/mail/py-afew/Makefile
==============================================================================
--- head/mail/py-afew/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/mail/py-afew/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -25,8 +25,8 @@ NO_ARCH=	yes
 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=	*

Modified: head/math/py-cypari2/Makefile
==============================================================================
--- head/math/py-cypari2/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/math/py-cypari2/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -25,7 +25,7 @@ USE_PERL5=	build
 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=		*
 

Modified: head/math/py-fpylll/Makefile
==============================================================================
--- head/math/py-fpylll/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/math/py-fpylll/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -33,7 +33,7 @@ LDFLAGS+=	-s
 .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=		*
 

Modified: head/math/py-gmpy2-devel/Makefile
==============================================================================
--- head/math/py-gmpy2-devel/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/math/py-gmpy2-devel/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -27,7 +27,7 @@ USE_PYTHON=	distutils
 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=		*
 

Modified: head/math/py-pplpy/Makefile
==============================================================================
--- head/math/py-pplpy/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/math/py-pplpy/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -27,7 +27,7 @@ USES=		compiler:c++11-lang localbase python:3.6+
 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=		*
 

Modified: head/net/ceph14/Makefile
==============================================================================
--- head/net/ceph14/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/net/ceph14/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	\
 	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=	\

Modified: head/net/irrd/Makefile
==============================================================================
--- head/net/irrd/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/net/irrd/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -46,7 +46,7 @@ USERS=		${PORTNAME}
 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

Modified: head/net/py-gntp/Makefile
==============================================================================
--- head/net/py-gntp/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/net/py-gntp/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -25,7 +25,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
 
 post-install-DOCS-on:

Modified: head/net/py-zeep/Makefile
==============================================================================
--- head/net/py-zeep/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/net/py-zeep/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -15,7 +15,7 @@ LICENSE=	BSD3CLAUSE MIT
 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} \

Modified: head/science/code_saturne/Makefile
==============================================================================
--- head/science/code_saturne/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/science/code_saturne/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -91,7 +91,7 @@ USE_TEX=	tex:build
 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

Modified: head/security/py-certbot/Makefile
==============================================================================
--- head/security/py-certbot/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/security/py-certbot/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -42,7 +42,7 @@ OPTIONS_DEFINE=	MANPAGES
 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} \
 

Modified: head/sysutils/py-pkginfo/Makefile
==============================================================================
--- head/sysutils/py-pkginfo/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/sysutils/py-pkginfo/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -19,7 +19,7 @@ NO_ARCH=	yes
 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:

Modified: head/textproc/py-cloud_sptheme/Makefile
==============================================================================
--- head/textproc/py-cloud_sptheme/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-cloud_sptheme/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -14,7 +14,7 @@ COMMENT=	Sphinx theme
 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+

Modified: head/textproc/py-docrepr/Makefile
==============================================================================
--- head/textproc/py-docrepr/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-docrepr/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -13,7 +13,7 @@ LICENSE=	BSD3CLAUSE
 
 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

Modified: head/textproc/py-furo/Makefile
==============================================================================
--- head/textproc/py-furo/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-furo/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -14,7 +14,7 @@ LICENSE=	MIT
 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

Modified: head/textproc/py-gfm/Makefile
==============================================================================
--- head/textproc/py-gfm/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-gfm/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -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} \
 			${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR}
 DOCS_VARS=		PYDISTUTILS_BUILD_TARGET+=build_sphinx
 

Modified: head/textproc/py-hieroglyph/Makefile
==============================================================================
--- head/textproc/py-hieroglyph/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-hieroglyph/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -12,7 +12,7 @@ COMMENT=	Sphinx extension which builds HTML presentati
 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

Modified: head/textproc/py-m2r/Makefile
==============================================================================
--- head/textproc/py-m2r/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-m2r/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 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+

Modified: head/textproc/py-numpydoc/Makefile
==============================================================================
--- head/textproc/py-numpydoc/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-numpydoc/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -14,7 +14,7 @@ LICENSE=	BSD2CLAUSE
 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+

Modified: head/textproc/py-openstackdocstheme/Makefile
==============================================================================
--- head/textproc/py-openstackdocstheme/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-openstackdocstheme/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 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

Modified: head/textproc/py-os-api-ref/Makefile
==============================================================================
--- head/textproc/py-os-api-ref/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-os-api-ref/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel
 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+

Modified: head/textproc/py-pallets-sphinx-themes/Makefile
==============================================================================
--- head/textproc/py-pallets-sphinx-themes/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-pallets-sphinx-themes/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -13,7 +13,7 @@ COMMENT=	Sphinx themes for Pallets and related project
 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

Modified: head/textproc/py-recommonmark/Makefile
==============================================================================
--- head/textproc/py-recommonmark/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-recommonmark/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/license.md
 
 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

Modified: head/textproc/py-sphinx-argparse/Makefile
==============================================================================
--- head/textproc/py-sphinx-argparse/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-sphinx-argparse/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -11,7 +11,7 @@ COMMENT=	Sphinx extension that automatically documents
 
 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

Modified: head/textproc/py-sphinx-autoapi/Makefile
==============================================================================
--- head/textproc/py-sphinx-autoapi/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-sphinx-autoapi/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -12,7 +12,7 @@ COMMENT=	Sphinx API documentation generator
 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} \

Modified: head/textproc/py-sphinx-autodoc-typehints/Makefile
==============================================================================
--- head/textproc/py-sphinx-autodoc-typehints/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-sphinx-autodoc-typehints/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -12,11 +12,11 @@ COMMENT=	Type hints (PEP 484) support for the Sphinx a
 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

Modified: head/textproc/py-sphinx-intl/Makefile
==============================================================================
--- head/textproc/py-sphinx-intl/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-sphinx-intl/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -14,7 +14,7 @@ COMMENT=	Sphinx-intl translation features
 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}
 

Modified: head/textproc/py-sphinx-issues/Makefile
==============================================================================
--- head/textproc/py-sphinx-issues/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-sphinx-issues/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -13,7 +13,7 @@ COMMENT=	Sphinx extension for linking to your project'
 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

Modified: head/textproc/py-sphinx-tabs/Makefile
==============================================================================
--- head/textproc/py-sphinx-tabs/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-sphinx-tabs/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -14,7 +14,7 @@ LICENSE=	MIT
 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}
 

Modified: head/textproc/py-sphinx_wikipedia/Makefile
==============================================================================
--- head/textproc/py-sphinx_wikipedia/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-sphinx_wikipedia/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -11,7 +11,7 @@ COMMENT=	Sphinx extension which adds role to create li
 
 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

Modified: head/textproc/py-sphinxcontrib-adadomain/Makefile
==============================================================================
--- head/textproc/py-sphinxcontrib-adadomain/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-sphinxcontrib-adadomain/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -13,7 +13,7 @@ COMMENT=	Sphinx Adadomain Extension
 
 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

Modified: head/textproc/py-sphinxcontrib-bitbucket/Makefile
==============================================================================
--- head/textproc/py-sphinxcontrib-bitbucket/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-sphinxcontrib-bitbucket/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -14,7 +14,7 @@ COMMENT=	Sphinx/BitBucket integration
 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+

Modified: head/textproc/py-sphinxcontrib-fulltoc/Makefile
==============================================================================
--- head/textproc/py-sphinxcontrib-fulltoc/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-sphinxcontrib-fulltoc/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -13,7 +13,7 @@ LICENSE=	APACHE20
 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

Modified: head/textproc/py-sphinxcontrib-httpdomain/Makefile
==============================================================================
--- head/textproc/py-sphinxcontrib-httpdomain/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-sphinxcontrib-httpdomain/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -13,7 +13,7 @@ COMMENT=	Sphinx domain for HTTP APIs
 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

Modified: head/textproc/py-sphinxcontrib-log-cabinet/Makefile
==============================================================================
--- head/textproc/py-sphinxcontrib-log-cabinet/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-sphinxcontrib-log-cabinet/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -13,7 +13,7 @@ COMMENT=	Organize changelog directives in Sphinx docs
 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

Modified: head/textproc/py-sphinxcontrib-newsfeed/Makefile
==============================================================================
--- head/textproc/py-sphinxcontrib-newsfeed/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-sphinxcontrib-newsfeed/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -12,7 +12,7 @@ COMMENT=	News Feed extension for Sphinx
 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

Modified: head/textproc/py-sphinxcontrib-programoutput/Makefile
==============================================================================
--- head/textproc/py-sphinxcontrib-programoutput/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/textproc/py-sphinxcontrib-programoutput/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -13,7 +13,7 @@ COMMENT=	Sphinx extension to include program output
 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

Modified: head/www/py-beautifulsoup/Makefile
==============================================================================
--- head/www/py-beautifulsoup/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/www/py-beautifulsoup/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -24,7 +24,7 @@ NO_ARCH=	yes
 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:

Modified: head/www/py-cssselect/Makefile
==============================================================================
--- head/www/py-cssselect/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/www/py-cssselect/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -21,7 +21,7 @@ NO_ARCH=	yes
 
 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}
 

Modified: head/www/py-dj31-django-auth-ldap/Makefile
==============================================================================
--- head/www/py-dj31-django-auth-ldap/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/www/py-dj31-django-auth-ldap/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -24,7 +24,7 @@ PORTDOCS=	*
 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:

Modified: head/www/py-django-auth-ldap/Makefile
==============================================================================
--- head/www/py-django-auth-ldap/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/www/py-django-auth-ldap/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -24,7 +24,7 @@ PORTDOCS=	*
 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:

Modified: head/www/py-django-babel/Makefile
==============================================================================
--- head/www/py-django-babel/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/www/py-django-babel/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -24,7 +24,7 @@ NO_ARCH=	yes
 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:

Modified: head/www/py-django-configurations/Makefile
==============================================================================
--- head/www/py-django-configurations/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/www/py-django-configurations/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -26,7 +26,7 @@ NO_ARCH=	yes
 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:

Modified: head/www/py-django-haystack/Makefile
==============================================================================
--- head/www/py-django-haystack/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/www/py-django-haystack/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -24,7 +24,7 @@ NO_ARCH=	yes
 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:

Modified: head/www/py-django-reversion/Makefile
==============================================================================
--- head/www/py-django-reversion/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/www/py-django-reversion/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -23,7 +23,7 @@ NO_ARCH=	yes
 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:

Modified: head/www/py-django-simple-captcha/Makefile
==============================================================================
--- head/www/py-django-simple-captcha/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/www/py-django-simple-captcha/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -27,7 +27,7 @@ NO_ARCH=	yes
 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}

Modified: head/www/py-django-treebeard/Makefile
==============================================================================
--- head/www/py-django-treebeard/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/www/py-django-treebeard/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -24,7 +24,7 @@ PORTDOCS=	*
 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:

Modified: head/www/py-django111/Makefile
==============================================================================
--- head/www/py-django111/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/www/py-django111/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -46,7 +46,7 @@ HTMLDOCS_DESC=	Install HTML documentation (requires Sp
 
 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}

Modified: head/www/py-django22/Makefile
==============================================================================
--- head/www/py-django22/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/www/py-django22/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -44,7 +44,7 @@ OPTIONS_GROUP_DATABASE=	PGSQL MYSQL SQLITE
 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}

Modified: head/www/py-django30/Makefile
==============================================================================
--- head/www/py-django30/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/www/py-django30/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -45,7 +45,7 @@ OPTIONS_GROUP_DATABASE=	PGSQL MYSQL SQLITE
 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}

Modified: head/www/py-django31/Makefile
==============================================================================
--- head/www/py-django31/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/www/py-django31/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -45,7 +45,7 @@ OPTIONS_GROUP_DATABASE=	PGSQL MYSQL SQLITE
 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}

Modified: head/www/py-requests-mock/Makefile
==============================================================================
--- head/www/py-requests-mock/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/www/py-requests-mock/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.3<3:ww
 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}
 

Modified: head/www/py-requests-toolbelt/Makefile
==============================================================================
--- head/www/py-requests-toolbelt/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/www/py-requests-toolbelt/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -22,7 +22,7 @@ NO_ARCH=	yes
 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"
 

Modified: head/www/py-webob/Makefile
==============================================================================
--- head/www/py-webob/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/www/py-webob/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -19,7 +19,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=0:devel
 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}
 

Modified: head/www/varnish6/Makefile
==============================================================================
--- head/www/varnish6/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/www/varnish6/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -14,7 +14,7 @@ LICENSE=	BSD2CLAUSE
 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 \

Modified: head/x11/py-pyvirtualdisplay/Makefile
==============================================================================
--- head/x11/py-pyvirtualdisplay/Makefile	Thu Jan 14 14:19:06 2021	(r561561)
+++ head/x11/py-pyvirtualdisplay/Makefile	Thu Jan 14 14:34:38 2021	(r561562)
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cog>=2.3:devel/py-
 		${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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101141434.10EEYcSq040778>