Index: textproc/py-sphinx/Makefile =================================================================== --- textproc/py-sphinx/Makefile (revision 484274) +++ textproc/py-sphinx/Makefile (working copy) @@ -1,9 +1,7 @@ -# Created by: Li-Wen Hsu # $FreeBSD$ PORTNAME= sphinx -PORTVERSION= 1.6.5 -PORTREVISION= 1 +PORTVERSION= 1.8.1 PORTEPOCH= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP @@ -11,7 +9,7 @@ DISTNAME= Sphinx-${PORTVERSION} DIST_SUBDIR= python -MAINTAINER= araujo@FreeBSD.org +MAINTAINER= python@FreeBSD.org COMMENT= Python documentation generator LICENSE= BSD2CLAUSE @@ -19,18 +17,19 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-websupport>=1.0.1:textproc/py-sphinxcontrib-websupport@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-websupport>0:textproc/py-sphinxcontrib-websupport@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>=0.1:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}alabaster>=0.7:textproc/py-alabaster@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}snowballstemmer>=1.1:textproc/py-snowballstemmer@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.18.1:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}imagesize>=0.7.1:graphics/py-imagesize@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}imagesize>0:graphics/py-imagesize@${PY_FLAVOR} \ ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>=0:www/py-html5lib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ @@ -39,6 +38,7 @@ USES= python USE_PYTHON= autoplist distutils concurrent + NO_ARCH= yes .include Index: textproc/py-sphinx/distinfo =================================================================== --- textproc/py-sphinx/distinfo (revision 484274) +++ textproc/py-sphinx/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1514980036 -SHA256 (python/Sphinx-1.6.5.tar.gz) = c6de5dbdbb7a0d7d2757f4389cc00e8f6eb3c49e1772378967a12cfcf2cfe098 -SIZE (python/Sphinx-1.6.5.tar.gz) = 4680974 +TIMESTAMP = 1541442316 +SHA256 (python/Sphinx-1.8.1.tar.gz) = 652eb8c566f18823a022bb4b6dbc868d366df332a11a0226b5bc3a798a479f17 +SIZE (python/Sphinx-1.8.1.tar.gz) = 5754240 Index: textproc/py-sphinx/files/patch-sphinx_writers_html.py =================================================================== --- textproc/py-sphinx/files/patch-sphinx_writers_html.py (revision 484274) +++ textproc/py-sphinx/files/patch-sphinx_writers_html.py (nonexistent) @@ -1,27 +0,0 @@ ---- sphinx/writers/html.py.orig 2016-10-01 15:14:37 UTC -+++ sphinx/writers/html.py -@@ -16,6 +16,7 @@ import copy - import warnings - - from six import string_types -+import docutils - from docutils import nodes - from docutils.writers.html4css1 import Writer, HTMLTranslator as BaseTranslator - -@@ -497,6 +498,16 @@ class HTMLTranslator(BaseTranslator): - if 'height' not in node: - node['height'] = str(size[1]) - BaseTranslator.visit_image(self, node) -+ -+ # overwritten -+ def depart_image(self, node): -+ if docutils.__version__ >= "0.13": -+ # since docutils-0.13, HTMLWriter does not push context data on visit_image() -+ if node['uri'].lower().endswith(('svg', 'svgz')): -+ self.body.append(self.context.pop()) -+ else: -+ # docutils-0.12 or below, HTML Writer always push context data on visit_image() -+ self.body.append(self.context.pop()) - - def visit_toctree(self, node): - # this only happens when formatting a toc from env.tocs -- in this Property changes on: textproc/py-sphinx/files/patch-sphinx_writers_html.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: textproc/py-sphinxcontrib-websupport/Makefile =================================================================== --- textproc/py-sphinxcontrib-websupport/Makefile (revision 484274) +++ textproc/py-sphinxcontrib-websupport/Makefile (working copy) @@ -1,12 +1,12 @@ # $FreeBSD$ PORTNAME= sphinxcontrib-websupport -PORTVERSION= 1.0.1 +PORTVERSION= 1.1.0 CATEGORIES= textproc MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= araujo@FreeBSD.org +MAINTAINER= python@FreeBSD.org COMMENT= Sphinx API for Web Apps LICENSE= BSD2CLAUSE Index: textproc/py-sphinxcontrib-websupport/distinfo =================================================================== --- textproc/py-sphinxcontrib-websupport/distinfo (revision 484274) +++ textproc/py-sphinxcontrib-websupport/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1504058132 -SHA256 (sphinxcontrib-websupport-1.0.1.tar.gz) = 7a85961326aa3a400cd4ad3c816d70ed6f7c740acd7ce5d78cd0a67825072eb9 -SIZE (sphinxcontrib-websupport-1.0.1.tar.gz) = 590480 +TIMESTAMP = 1541442908 +SHA256 (sphinxcontrib-websupport-1.1.0.tar.gz) = 9de47f375baf1ea07cdb3436ff39d7a9c76042c10a769c52353ec46e4e8fc3b9 +SIZE (sphinxcontrib-websupport-1.1.0.tar.gz) = 587947