summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/py-beautifulsoup/Makefile2
-rw-r--r--www/py-cssselect/Makefile20
-rw-r--r--www/py-cssselect/pkg-plist29
-rw-r--r--www/py-dj22-django-auth-ldap/Makefile2
-rw-r--r--www/py-django-auth-ldap/Makefile2
-rw-r--r--www/py-django-babel/Makefile2
-rw-r--r--www/py-django-configurations/Makefile2
-rw-r--r--www/py-django-haystack/Makefile2
-rw-r--r--www/py-django-reversion/Makefile2
-rw-r--r--www/py-django-simple-captcha/Makefile2
-rw-r--r--www/py-django-treebeard/Makefile2
-rw-r--r--www/py-django111/Makefile2
-rw-r--r--www/py-django22/Makefile2
-rw-r--r--www/py-django30/Makefile2
-rw-r--r--www/py-pyquery/Makefile12
-rw-r--r--www/py-pyquery/pkg-plist56
-rw-r--r--www/py-requests-mock/Makefile2
-rw-r--r--www/py-requests-toolbelt/Makefile2
-rw-r--r--www/py-webob/Makefile2
-rw-r--r--www/varnish6/Makefile2
20 files changed, 34 insertions, 115 deletions
diff --git a/www/py-beautifulsoup/Makefile b/www/py-beautifulsoup/Makefile
index 049035522bd6..2cc809ab3b3f 100644
--- a/www/py-beautifulsoup/Makefile
+++ b/www/py-beautifulsoup/Makefile
@@ -24,7 +24,7 @@ NO_ARCH= yes
PORTDOCS= *
OPTIONS_DEFINE= DOCS
-DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR}
+DOCS_BUILD_DEPENDS= ${PY_SPHINX}
DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
post-install-DOCS-on:
diff --git a/www/py-cssselect/Makefile b/www/py-cssselect/Makefile
index 295f5ac4e06c..698b11594e72 100644
--- a/www/py-cssselect/Makefile
+++ b/www/py-cssselect/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cssselect
PORTVERSION= 1.0.3
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= www python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -21,19 +21,19 @@ NO_ARCH= yes
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
+DOCS_BUILD_DEPENDS= ${PY_SPHINX}
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-SPHINX_BUILD= sphinx-build-${PYTHON_VER}
-post-install::
- ${SETENV} PYTHONPATH="${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}" \
- ${SPHINX_BUILD} -N -a -b html ${WRKSRC}/docs ${WRKSRC}/docs.html
+PORTDOCS= *
+
+post-build-DOCS-on:
+ (cd ${WRKSRC} && \
+ PYTHONPATH=${WRKSRC} sphinx-build-${PYTHON_VER} -N -a docs docs.html)
+
+post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
(cd ${WRKSRC}/docs.html && \
- ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name .buildinfo -and ! -path *doctrees*")
-.endif
+ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name .buildinfo -and ! -path *doctrees*")
.include <bsd.port.mk>
diff --git a/www/py-cssselect/pkg-plist b/www/py-cssselect/pkg-plist
deleted file mode 100644
index 2713497e49cb..000000000000
--- a/www/py-cssselect/pkg-plist
+++ /dev/null
@@ -1,29 +0,0 @@
-%%PORTDOCS%%%%DOCSDIR%%/_sources/index.rst.txt
-%%PORTDOCS%%%%DOCSDIR%%/_static/ajax-loader.gif
-%%PORTDOCS%%%%DOCSDIR%%/_static/basic.css
-%%PORTDOCS%%%%DOCSDIR%%/_static/classic.css
-%%PORTDOCS%%%%DOCSDIR%%/_static/comment-bright.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/comment-close.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/comment.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/doctools.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/down-pressed.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/down.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/file.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/jquery-3.1.0.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/jquery.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/minus.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/plus.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/pygments.css
-%%PORTDOCS%%%%DOCSDIR%%/_static/searchtools.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/sidebar.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/underscore-1.3.1.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/underscore.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/up-pressed.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/up.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/websupport.js
-%%PORTDOCS%%%%DOCSDIR%%/genindex.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/objects.inv
-%%PORTDOCS%%%%DOCSDIR%%/py-modindex.html
-%%PORTDOCS%%%%DOCSDIR%%/search.html
-%%PORTDOCS%%%%DOCSDIR%%/searchindex.js
diff --git a/www/py-dj22-django-auth-ldap/Makefile b/www/py-dj22-django-auth-ldap/Makefile
index 903326c47f29..dcf4d268a1c7 100644
--- a/www/py-dj22-django-auth-ldap/Makefile
+++ b/www/py-dj22-django-auth-ldap/Makefile
@@ -27,7 +27,7 @@ CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}django-auth-ldap \
${PYTHON_PKGNAMEPREFIX}dj21-django-auth-ldap
OPTIONS_DEFINE= DOCS
-DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR}
+DOCS_BUILD_DEPENDS= ${PY_SPHINX}
DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
post-install-DOCS-on:
diff --git a/www/py-django-auth-ldap/Makefile b/www/py-django-auth-ldap/Makefile
index 4844f0e59be5..9baa07284726 100644
--- a/www/py-django-auth-ldap/Makefile
+++ b/www/py-django-auth-ldap/Makefile
@@ -26,7 +26,7 @@ CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}dj21-django-auth-ldap \
${PYTHON_PKGNAMEPREFIX}dj22-django-auth-ldap
OPTIONS_DEFINE= DOCS
-DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR}
+DOCS_BUILD_DEPENDS= ${PY_SPHINX}
DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
post-install-DOCS-on:
diff --git a/www/py-django-babel/Makefile b/www/py-django-babel/Makefile
index 3d9fdbc4cd4d..803f69e28a8e 100644
--- a/www/py-django-babel/Makefile
+++ b/www/py-django-babel/Makefile
@@ -24,7 +24,7 @@ NO_ARCH= yes
PORTDOCS= *
OPTIONS_DEFINE= DOCS
-DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR}
+DOCS_BUILD_DEPENDS= ${PY_SPHINX}
DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
post-install-DOCS-on:
diff --git a/www/py-django-configurations/Makefile b/www/py-django-configurations/Makefile
index 1b9d5d798f69..a14d106e4ee8 100644
--- a/www/py-django-configurations/Makefile
+++ b/www/py-django-configurations/Makefile
@@ -26,7 +26,7 @@ NO_ARCH= yes
PORTDOCS= *
OPTIONS_DEFINE= DOCS
-DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
+DOCS_BUILD_DEPENDS= ${PY_SPHINX}
DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
post-install-DOCS-on:
diff --git a/www/py-django-haystack/Makefile b/www/py-django-haystack/Makefile
index ce1dee532939..798fcbe97ffc 100644
--- a/www/py-django-haystack/Makefile
+++ b/www/py-django-haystack/Makefile
@@ -22,7 +22,7 @@ NO_ARCH= yes
PORTDOCS= *
OPTIONS_DEFINE= DOCS
-DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
+DOCS_BUILD_DEPENDS= ${PY_SPHINX}
DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
post-install-DOCS-on:
diff --git a/www/py-django-reversion/Makefile b/www/py-django-reversion/Makefile
index a262fd7e6dd4..53f48d3ffee9 100644
--- a/www/py-django-reversion/Makefile
+++ b/www/py-django-reversion/Makefile
@@ -23,7 +23,7 @@ NO_ARCH= yes
PORTDOCS= *
OPTIONS_DEFINE= DOCS
-DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR}
+DOCS_BUILD_DEPENDS= ${PY_SPHINX}
DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
post-install-DOCS-on:
diff --git a/www/py-django-simple-captcha/Makefile b/www/py-django-simple-captcha/Makefile
index 6852e223e7ea..b918c4341cbb 100644
--- a/www/py-django-simple-captcha/Makefile
+++ b/www/py-django-simple-captcha/Makefile
@@ -27,7 +27,7 @@ NO_ARCH= yes
PORTDOCS= *
OPTIONS_DEFINE= DOCS MIGRATIONS
-DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
+DOCS_BUILD_DEPENDS= ${PY_SPHINX}
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}
diff --git a/www/py-django-treebeard/Makefile b/www/py-django-treebeard/Makefile
index d50fff7407ce..40debad646e5 100644
--- a/www/py-django-treebeard/Makefile
+++ b/www/py-django-treebeard/Makefile
@@ -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} \
- ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
+ ${PY_SPHINX}
DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
post-install-DOCS-on:
diff --git a/www/py-django111/Makefile b/www/py-django111/Makefile
index 8e7ff3105e34..c8ee51471de3 100644
--- a/www/py-django111/Makefile
+++ b/www/py-django111/Makefile
@@ -45,7 +45,7 @@ HTMLDOCS_DESC= Install HTML documentation (requires Sphinx)
PLIST_FILES= man/man1/django-admin.1.gz
-HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
+HTMLDOCS_BUILD_DEPENDS= ${PY_SPHINX}
HTMLDOCS_IMPLIES= DOCS
PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${PY_FLAVOR}
diff --git a/www/py-django22/Makefile b/www/py-django22/Makefile
index c90cb7af1f20..9a1984c14e8f 100644
--- a/www/py-django22/Makefile
+++ b/www/py-django22/Makefile
@@ -44,7 +44,7 @@ HTMLDOCS_DESC= Install HTML documentation (requires Sphinx)
PLIST_FILES= man/man1/django-admin.1.gz
-HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
+HTMLDOCS_BUILD_DEPENDS= ${PY_SPHINX}
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}
diff --git a/www/py-django30/Makefile b/www/py-django30/Makefile
index b1ebafdf9e76..4cea35617b84 100644
--- a/www/py-django30/Makefile
+++ b/www/py-django30/Makefile
@@ -45,7 +45,7 @@ HTMLDOCS_DESC= Install HTML documentation (requires Sphinx)
PLIST_FILES= man/man1/django-admin.1.gz
-HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
+HTMLDOCS_BUILD_DEPENDS= ${PY_SPHINX}
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}
diff --git a/www/py-pyquery/Makefile b/www/py-pyquery/Makefile
index e67bf9f1ea87..5feff9fd9a83 100644
--- a/www/py-pyquery/Makefile
+++ b/www/py-pyquery/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pyquery
PORTVERSION= 1.2.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -31,13 +31,17 @@ USES= python:2.7 zip
USE_PYTHON= autoplist distutils
NO_ARCH= yes
-DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR}
+DOCS_BUILD_DEPENDS= ${PY_SPHINX}
DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
+PORTDOCS= *
+
+post-build-DOCS-on:
+ @${RM} ${WRKSRC}/build/sphinx/html/.buildinfo
+
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
@(cd ${WRKSRC}/build/sphinx/html && \
- ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
- "! -name .buildinfo -or ! -name objects.inv")
+ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name objects.inv")
.include <bsd.port.mk>
diff --git a/www/py-pyquery/pkg-plist b/www/py-pyquery/pkg-plist
deleted file mode 100644
index ec23f9bee20c..000000000000
--- a/www/py-pyquery/pkg-plist
+++ /dev/null
@@ -1,56 +0,0 @@
-%%PORTDOCS%%%%DOCSDIR%%/.buildinfo
-%%PORTDOCS%%%%DOCSDIR%%/_modules/index.html
-%%PORTDOCS%%%%DOCSDIR%%/_modules/pyquery/ajax.html
-%%PORTDOCS%%%%DOCSDIR%%/_modules/pyquery/pyquery.html
-%%PORTDOCS%%%%DOCSDIR%%/_sources/ajax.rst.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/api.rst.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/attributes.rst.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/changes.rst.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/css.rst.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/future.rst.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/index.rst.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/manipulating.rst.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/pseudo_classes.rst.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/scrap.rst.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/testing.rst.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/tips.rst.txt
-%%PORTDOCS%%%%DOCSDIR%%/_sources/traversing.rst.txt
-%%PORTDOCS%%%%DOCSDIR%%/_static/ajax-loader.gif
-%%PORTDOCS%%%%DOCSDIR%%/_static/basic.css
-%%PORTDOCS%%%%DOCSDIR%%/_static/comment-bright.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/comment-close.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/comment.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/doctools.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/down-pressed.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/down.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/file.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/jquery-3.1.0.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/jquery.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/minus.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/nature.css
-%%PORTDOCS%%%%DOCSDIR%%/_static/plus.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/pygments.css
-%%PORTDOCS%%%%DOCSDIR%%/_static/searchtools.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/underscore-1.3.1.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/underscore.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/up-pressed.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/up.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/websupport.js
-%%PORTDOCS%%%%DOCSDIR%%/ajax.html
-%%PORTDOCS%%%%DOCSDIR%%/api.html
-%%PORTDOCS%%%%DOCSDIR%%/attributes.html
-%%PORTDOCS%%%%DOCSDIR%%/changes.html
-%%PORTDOCS%%%%DOCSDIR%%/css.html
-%%PORTDOCS%%%%DOCSDIR%%/future.html
-%%PORTDOCS%%%%DOCSDIR%%/genindex.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/manipulating.html
-%%PORTDOCS%%%%DOCSDIR%%/objects.inv
-%%PORTDOCS%%%%DOCSDIR%%/pseudo_classes.html
-%%PORTDOCS%%%%DOCSDIR%%/py-modindex.html
-%%PORTDOCS%%%%DOCSDIR%%/scrap.html
-%%PORTDOCS%%%%DOCSDIR%%/search.html
-%%PORTDOCS%%%%DOCSDIR%%/searchindex.js
-%%PORTDOCS%%%%DOCSDIR%%/testing.html
-%%PORTDOCS%%%%DOCSDIR%%/tips.html
-%%PORTDOCS%%%%DOCSDIR%%/traversing.html
diff --git a/www/py-requests-mock/Makefile b/www/py-requests-mock/Makefile
index f3b939064d66..266ef9a38d25 100644
--- a/www/py-requests-mock/Makefile
+++ b/www/py-requests-mock/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.3<3:www/py-requests@${PY_FLAVOR}
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} \
- ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} \
+ ${PY_SPHINX} \
${PYTHON_PKGNAMEPREFIX}testrepository>=0.0.18:devel/py-testrepository@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}testtools>=0:devel/py-testtools@${PY_FLAVOR}
diff --git a/www/py-requests-toolbelt/Makefile b/www/py-requests-toolbelt/Makefile
index 6779a4d0e020..8c65f135aaec 100644
--- a/www/py-requests-toolbelt/Makefile
+++ b/www/py-requests-toolbelt/Makefile
@@ -21,7 +21,7 @@ NO_ARCH= yes
PORTDOCS= *
OPTIONS_DEFINE= DOCS
-DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
+DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx18>0:textproc/py-sphinx18@${PY_FLAVOR}
DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
post-install-DOCS-on:
diff --git a/www/py-webob/Makefile b/www/py-webob/Makefile
index 6d2057a1ebe2..988b4602bf3a 100644
--- a/www/py-webob/Makefile
+++ b/www/py-webob/Makefile
@@ -17,7 +17,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR}
${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylons-sphinx-themes>=0:textproc/py-pylons-sphinx-themes@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx@${PY_FLAVOR}
+ ${PY_SPHINX}
DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
diff --git a/www/varnish6/Makefile b/www/varnish6/Makefile
index b01a33e97d77..a2e9ad2ed11e 100644
--- a/www/varnish6/Makefile
+++ b/www/varnish6/Makefile
@@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= rst2man:textproc/py-docutils \
- ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
+ ${PY_SPHINX}
LIB_DEPENDS= libpcre.so:devel/pcre
CONFLICTS= varnish-2.* varnish-3.* varnish4-4.* varnish5-5.*