Date: Mon, 11 May 2020 23:51:58 +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: r534966 - in head: Mk/Uses audio/aubio audio/musicpc audio/ncmpc audio/py-pyaudio biology/py-orange3-single-cell comms/gnuradio databases/cassandra3 databases/cassandra4 databases/py-xa... Message-ID: <202005112351.04BNpwRn036290@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbaio Date: Mon May 11 23:51:58 2020 New Revision: 534966 URL: https://svnweb.freebsd.org/changeset/ports/534966 Log: Update Sphinx - Repocopy textproc/py-sphinx to textproc/py-sphinx18 Update it to 1.8.5 (latest version from 1.8.X). This version supports Python 2 and 3. Add test target. - textproc/py-sphinx: Update to 3.0.2 Python 3 only (3.5+). Add test target. - Mk/Uses/python.mk: Add PY_SPHINX Shared macro to use with flavors and not break ports with USES=python (all versions). Python >=3.5 --> textproc/py-sphinx (v3.0.2) Python < 3.5 --> textproc/py-sphinx18 (v1.8.5) All ports that uses sphinx were changed to use the new variable ${PY_SPHINX} in the dependency line, exceptions: * Ports that fails to build with sphinx 3.0.2 because of code. They are pointing to textproc/py-sphinx18 directly. There aren't many ports. * Ports that doesn't know Python flavors. - Add several patches to fix Sphinx consumers The most common issues are related with pkg-plist, the output files from Sphinx changes between versions, keep this dynamically is the better approach. This will save time in future sphinx updates. PR: 245629 Exp-run by: antoine Added: head/devel/py-noseofyeti/files/ head/devel/py-noseofyeti/files/patch-docs___ext_options.py (contents, props changed) head/devel/py-noseofyeti/files/patch-docs___ext_show__tests.py (contents, props changed) head/textproc/py-sphinx18/ - copied from r534964, head/textproc/py-sphinx/ Deleted: head/devel/py-pathtools/pkg-plist head/devel/py-virtualenvwrapper/pkg-plist head/textproc/py-sphinx/files/ head/textproc/py-sphinx18/files/ head/www/py-cssselect/pkg-plist head/www/py-pyquery/pkg-plist Modified: head/Mk/Uses/python.mk head/audio/aubio/Makefile head/audio/aubio/pkg-plist head/audio/musicpc/Makefile head/audio/musicpc/pkg-plist head/audio/ncmpc/Makefile head/audio/ncmpc/pkg-plist 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/deskutils/py-paperless/pkg-plist head/devel/ahven/Makefile head/devel/ahven/pkg-plist head/devel/bpython/Makefile head/devel/cmake-doc/Makefile head/devel/cmake-doc/pkg-plist head/devel/gearmand-devel/Makefile head/devel/gearmand/Makefile head/devel/kf5-extra-cmake-modules/Makefile head/devel/kf5-extra-cmake-modules/pkg-plist head/devel/llvm-cheri/Makefile head/devel/llvm-devel/Makefile head/devel/llvm10/Makefile head/devel/llvm60/Makefile head/devel/llvm70/Makefile head/devel/llvm80/Makefile head/devel/llvm90/Makefile head/devel/py-Jinja2/Makefile head/devel/py-boolean.py/Makefile head/devel/py-delfick_error/Makefile head/devel/py-easyprocess/Makefile head/devel/py-jira/Makefile head/devel/py-molecule/Makefile head/devel/py-noseofyeti/Makefile head/devel/py-oslotest/Makefile head/devel/py-osprofiler/Makefile head/devel/py-pathlib/Makefile head/devel/py-pathtools/Makefile head/devel/py-pip/Makefile head/devel/py-pyinstaller/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/dns/knot-resolver/Makefile head/graphics/colmap/Makefile head/graphics/py-django-easy-thumbnails/Makefile head/graphics/py-mayavi/Makefile head/graphics/py-sorl-thumbnail/Makefile head/graphics/zathura/Makefile head/lang/pocl/Makefile head/mail/py-afew/Makefile head/math/ceres-solver/Makefile head/math/py-networkx/Makefile head/net/ceph12/Makefile head/net/ceph13/Makefile head/net/ceph14/Makefile head/net/frr5/Makefile head/net/frr6/Makefile head/net/frr7/Makefile head/net/irrd/Makefile head/net/py-gntp/Makefile head/net/py-zeep/Makefile head/net/savvycan/Makefile head/science/code_saturne/Makefile head/security/libscep/Makefile head/security/py-certbot-dns-cloudflare/Makefile head/security/py-certbot-dns-cloudxns/Makefile head/security/py-certbot-dns-digitalocean/Makefile head/security/py-certbot-dns-dnsimple/Makefile head/security/py-certbot-dns-dnsmadeeasy/Makefile head/security/py-certbot-dns-gehirn/Makefile head/security/py-certbot-dns-google/Makefile head/security/py-certbot-dns-linode/Makefile head/security/py-certbot-dns-luadns/Makefile head/security/py-certbot-dns-nsone/Makefile head/security/py-certbot-dns-ovh/Makefile head/security/py-certbot-dns-rfc2136/Makefile head/security/py-certbot-dns-sakuracloud/Makefile head/security/py-certbot-nginx/Makefile head/security/py-keystone/Makefile head/shells/fish/Makefile head/shells/fish/pkg-plist head/sysutils/py-pkginfo/Makefile head/sysutils/zrepl/Makefile head/textproc/Makefile head/textproc/py-cloud_sptheme/Makefile head/textproc/py-gfm/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-recommonmark/Makefile head/textproc/py-sphinx-hieroglyph/Makefile head/textproc/py-sphinx-intl/Makefile head/textproc/py-sphinx-tabs/Makefile head/textproc/py-sphinx/Makefile head/textproc/py-sphinx/distinfo head/textproc/py-sphinx18/Makefile head/textproc/py-sphinx18/distinfo head/textproc/py-sphinx_numfig/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-newsfeed/Makefile head/textproc/py-sphinxcontrib-programoutput/Makefile head/www/py-beautifulsoup/Makefile head/www/py-cssselect/Makefile head/www/py-dj22-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-pyquery/Makefile head/www/py-requests-mock/Makefile head/www/py-requests-toolbelt/Makefile head/www/py-webob/Makefile head/www/varnish6/Makefile head/x11-toolkits/gtkada/Makefile head/x11/py-pyvirtualdisplay/Makefile Modified: head/Mk/Uses/python.mk ============================================================================== --- head/Mk/Uses/python.mk Mon May 11 23:39:43 2020 (r534965) +++ head/Mk/Uses/python.mk Mon May 11 23:51:58 2020 (r534966) @@ -638,9 +638,11 @@ PYNUMPY= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1<1.19,1:m .if ${PYTHON_REL} < 3500 PY_PILLOW= ${PYTHON_PKGNAMEPREFIX}pillow6>=6.0.0:graphics/py-pillow6@${PY_FLAVOR} PY_TYPING= ${PYTHON_PKGNAMEPREFIX}typing>=3.7.4.1:devel/py-typing@${PY_FLAVOR} +PY_SPHINX= ${PYTHON_PKGNAMEPREFIX}sphinx18>=0:textproc/py-sphinx18@${PY_FLAVOR} .else PY_PILLOW= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} PY_TYPING= +PY_SPHINX= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} .endif .if ${PYTHON_REL} < 3400 Modified: head/audio/aubio/Makefile ============================================================================== --- head/audio/aubio/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/audio/aubio/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -3,7 +3,7 @@ PORTNAME= aubio PORTVERSION= 0.4.7 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES?= audio MASTER_SITES= http://aubio.org/pub/ @@ -28,7 +28,7 @@ OPTIONS_SUB= yes COMPLEX_DESC= Compile with C99 complex.h COMPLEX_CONFIGURE_ENABLE= complex -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} +DOCS_BUILD_DEPENDS= ${PY_SPHINX} DOCS_CONFIGURE_ENABLE= sphinx DOCS_BINARY_ALIAS= sphinx-build=sphinx-build-${PYTHON_VER} @@ -58,6 +58,8 @@ SNDFILE_CONFIGURE_ENABLE= sndfile TEST_MAKE_ARGS= --enable-tests TEST_MAKE_ARGS_OFF= --disable-tests + +PORTDOCS= * post-patch: @${REINPLACE_CMD} -e \ Modified: head/audio/aubio/pkg-plist ============================================================================== --- head/audio/aubio/pkg-plist Mon May 11 23:39:43 2020 (r534965) +++ head/audio/aubio/pkg-plist Mon May 11 23:51:58 2020 (r534966) @@ -346,63 +346,3 @@ libdata/pkgconfig/aubio.pc %%DOXYGEN%%%%DOCSDIR%%/html/vecutils_8h_source.html %%DOXYGEN%%%%DOCSDIR%%/html/wavetable_8h.html %%DOXYGEN%%%%DOCSDIR%%/html/wavetable_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/sphinx/.buildinfo -%%PORTDOCS%%%%DOCSDIR%%/sphinx/.doctrees/about.doctree -%%PORTDOCS%%%%DOCSDIR%%/sphinx/.doctrees/cli.doctree -%%PORTDOCS%%%%DOCSDIR%%/sphinx/.doctrees/develop.doctree -%%PORTDOCS%%%%DOCSDIR%%/sphinx/.doctrees/environment.pickle -%%PORTDOCS%%%%DOCSDIR%%/sphinx/.doctrees/index.doctree -%%PORTDOCS%%%%DOCSDIR%%/sphinx/.doctrees/installing.doctree -%%PORTDOCS%%%%DOCSDIR%%/sphinx/.doctrees/python_module.doctree -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_downloads/demo_filter.py -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_downloads/demo_source_simple.py -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_downloads/test-phasevoc.c -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_downloads/test-source.c -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_sources/about.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_sources/cli.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_sources/develop.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_sources/index.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_sources/installing.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_sources/python_module.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/ajax-loader.gif -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/basic.css -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/comment-bright.png -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/comment-close.png -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/comment.png -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/dialog-note.png -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/dialog-seealso.png -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/dialog-todo.png -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/dialog-topic.png -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/dialog-warning.png -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/doctools.js -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/down-pressed.png -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/down.png -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/epub.css -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/file.png -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/footerbg.png -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/headerbg.png -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/ie6.css -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/jquery-3.1.0.js -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/jquery.js -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/middlebg.png -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/minus.png -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/plus.png -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/pygments.css -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/pyramid.css -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/searchtools.js -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/transparent.gif -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/underscore-1.3.1.js -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/underscore.js -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/up-pressed.png -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/up.png -%%PORTDOCS%%%%DOCSDIR%%/sphinx/_static/websupport.js -%%PORTDOCS%%%%DOCSDIR%%/sphinx/about.html -%%PORTDOCS%%%%DOCSDIR%%/sphinx/cli.html -%%PORTDOCS%%%%DOCSDIR%%/sphinx/develop.html -%%PORTDOCS%%%%DOCSDIR%%/sphinx/genindex.html -%%PORTDOCS%%%%DOCSDIR%%/sphinx/index.html -%%PORTDOCS%%%%DOCSDIR%%/sphinx/installing.html -%%PORTDOCS%%%%DOCSDIR%%/sphinx/objects.inv -%%PORTDOCS%%%%DOCSDIR%%/sphinx/python_module.html -%%PORTDOCS%%%%DOCSDIR%%/sphinx/search.html -%%PORTDOCS%%%%DOCSDIR%%/sphinx/searchindex.js Modified: head/audio/musicpc/Makefile ============================================================================== --- head/audio/musicpc/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/audio/musicpc/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -3,6 +3,7 @@ PORTNAME= musicpc DISTVERSION= 0.33 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://www.musicpd.org/download/mpc/0/ DISTNAME= mpc-${PORTVERSION} @@ -23,13 +24,13 @@ OPTIONS_DEFINE= DOCS ICONV OPTIONS_DEFAULT= DOCS ICONV DOCS_USES= python:env -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} +DOCS_BUILD_DEPENDS= ${PY_SPHINX} DOCS_MESON_ENABLED= documentation ICONV_USES= iconv ICONV_LDFLAGS= -L${ICONV_PREFIX}/lib ${ICONV_LIB} ICONV_MESON_ENABLED= iconv -PORTDOCS= AUTHORS README.rst NEWS +PORTDOCS= * .include <bsd.port.mk> Modified: head/audio/musicpc/pkg-plist ============================================================================== --- head/audio/musicpc/pkg-plist Mon May 11 23:39:43 2020 (r534965) +++ head/audio/musicpc/pkg-plist Mon May 11 23:51:58 2020 (r534966) @@ -1,30 +1,2 @@ bin/mpc -%%PORTDOCS%%%%DOCSDIR%%/html/.buildinfo -%%PORTDOCS%%%%DOCSDIR%%/html/_sources/index.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/html/_static/ajax-loader.gif -%%PORTDOCS%%%%DOCSDIR%%/html/_static/alabaster.css -%%PORTDOCS%%%%DOCSDIR%%/html/_static/basic.css -%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-bright.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-close.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/doctools.js -%%PORTDOCS%%%%DOCSDIR%%/html/_static/down-pressed.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/down.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/file.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery-3.1.0.js -%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery.js -%%PORTDOCS%%%%DOCSDIR%%/html/_static/minus.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/plus.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/pygments.css -%%PORTDOCS%%%%DOCSDIR%%/html/_static/searchtools.js -%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore-1.3.1.js -%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore.js -%%PORTDOCS%%%%DOCSDIR%%/html/_static/up-pressed.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/up.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/websupport.js -%%PORTDOCS%%%%DOCSDIR%%/html/genindex.html -%%PORTDOCS%%%%DOCSDIR%%/html/index.html -%%PORTDOCS%%%%DOCSDIR%%/html/objects.inv -%%PORTDOCS%%%%DOCSDIR%%/html/search.html -%%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js %%PORTDOCS%%man/man1/mpc.1.gz Modified: head/audio/ncmpc/Makefile ============================================================================== --- head/audio/ncmpc/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/audio/ncmpc/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -3,7 +3,7 @@ PORTNAME= ncmpc PORTVERSION= 0.34 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= http://www.musicpd.org/download/ncmpc/0/ @@ -34,7 +34,7 @@ DOCS_MESON_TRUE= html_manual LYRICS_MESON_TRUE= lyrics_screen -MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} +MANPAGES_BUILD_DEPENDS= ${PY_SPHINX} MANPAGES_MAKE_ENV= PYTHON=${PYTHON_CMD} \ SPHINX=sphinx-build-${PYTHON_VER} MANPAGES_MESON_TRUE= manual @@ -43,5 +43,7 @@ MANPAGES_USES= python:build NLS_LDFLAGS= -lintl NLS_MESON_ENABLED= nls NLS_USES= gettext + +PORTDOCS= * .include <bsd.port.mk> Modified: head/audio/ncmpc/pkg-plist ============================================================================== --- head/audio/ncmpc/pkg-plist Mon May 11 23:39:43 2020 (r534965) +++ head/audio/ncmpc/pkg-plist Mon May 11 23:51:58 2020 (r534966) @@ -2,41 +2,6 @@ bin/ncmpc %%LYRICS%%lib/ncmpc/lyrics/10-hd.sh %%LYRICS%%lib/ncmpc/lyrics/20-lyricwiki.rb %%MANPAGES%%man/man1/ncmpc.1.gz -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README.rst -%%PORTDOCS%%%%DOCSDIR%%/config.sample -%%PORTDOCS%%%%DOCSDIR%%/html/.buildinfo -%%PORTDOCS%%%%DOCSDIR%%/html/_sources/index.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/html/_static/ajax-loader.gif -%%PORTDOCS%%%%DOCSDIR%%/html/_static/alabaster.css -%%PORTDOCS%%%%DOCSDIR%%/html/_static/basic.css -%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-bright.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-close.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/doctools.js -%%PORTDOCS%%%%DOCSDIR%%/html/_static/down-pressed.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/down.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/file.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery-3.1.0.js -%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery.js -%%PORTDOCS%%%%DOCSDIR%%/html/_static/minus.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/plus.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/pygments.css -%%PORTDOCS%%%%DOCSDIR%%/html/_static/searchtools.js -%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore-1.3.1.js -%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore.js -%%PORTDOCS%%%%DOCSDIR%%/html/_static/up-pressed.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/up.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/websupport.js -%%PORTDOCS%%%%DOCSDIR%%/html/genindex.html -%%PORTDOCS%%%%DOCSDIR%%/html/index.html -%%PORTDOCS%%%%DOCSDIR%%/html/objects.inv -%%PORTDOCS%%%%DOCSDIR%%/html/search.html -%%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js -%%PORTDOCS%%%%DOCSDIR%%/keys.sample -%%PORTDOCS%%%%DOCSDIR%%/ncmpc.lirc %%NLS%%share/locale/cs/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/da/LC_MESSAGES/ncmpc.mo %%NLS%%share/locale/de/LC_MESSAGES/ncmpc.mo Modified: head/audio/py-pyaudio/Makefile ============================================================================== --- head/audio/py-pyaudio/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/audio/py-pyaudio/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -26,7 +26,7 @@ WRKSRC= ${WRKDIR}/PyAudio-${PORTVERSION} OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} +DOCS_BUILD_DEPENDS= ${PY_SPHINX} 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 Mon May 11 23:39:43 2020 (r534965) +++ head/biology/py-orange3-single-cell/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -31,7 +31,7 @@ USE_PYTHON= distutils autoplist OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= gmake:devel/gmake \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} + ${PY_SPHINX} 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 Mon May 11 23:39:43 2020 (r534965) +++ head/comms/gnuradio/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -12,7 +12,7 @@ LICENSE= GPLv3 BUILD_DEPENDS= volk>0:devel/volk \ doxygen>0:devel/doxygen \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ + ${PY_SPHINX} \ ${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 \ - sphinx-apidoc:textproc/py-sphinx@${PY_FLAVOR} \ + ${PY_SPHINX} \ dot:graphics/graphviz \ xmlto:textproc/xmlto \ freefont-ttf>0:x11-fonts/freefont-ttf Modified: head/databases/cassandra3/Makefile ============================================================================== --- head/databases/cassandra3/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/databases/cassandra3/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -70,7 +70,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= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} PORTDOCS= * Modified: head/databases/cassandra4/Makefile ============================================================================== --- head/databases/cassandra4/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/databases/cassandra4/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -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= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ ${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 Mon May 11 23:39:43 2020 (r534965) +++ head/databases/py-xapian/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -45,7 +45,7 @@ PORTSCOUT= limitw:1,even OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.4.8:textproc/py-sphinx@${PY_FLAVOR} +DOCS_BUILD_DEPENDS= ${PY_SPHINX} .include <bsd.port.pre.mk> Modified: head/deskutils/py-khard/Makefile ============================================================================== --- head/deskutils/py-khard/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/deskutils/py-khard/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -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} \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ + ${PY_SPHINX} \ ${RUN_DEPENDS} USES= python:3.5+ gmake @@ -34,6 +34,12 @@ PLIST_FILES= share/zsh/site-functions/_khard \ man/man5/khard.conf.5.gz SUB_FILES= pkg-message + +post-patch: + @${REINPLACE_CMD} \ + -e 's|sphinx-build|${LOCALBASE}/bin/sphinx-build-${PYTHON_VER}|g' \ + -e 's|sphinx-apidoc|${LOCALBASE}/bin/sphinx-apidoc-${PYTHON_VER}|g' \ + ${WRKSRC}/doc/Makefile do-build: (cd ${WRKSRC}/doc && ${MAKE_CMD} man) Modified: head/deskutils/py-paperless/Makefile ============================================================================== --- head/deskutils/py-paperless/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/deskutils/py-paperless/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -2,7 +2,7 @@ PORTNAME= paperless PORTVERSION= 2.7.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -63,7 +63,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= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} +DOCS_BUILD_DEPENDS= ${PY_SPHINX} DOCS_USES= gmake IMAGICK6_X11_RUN_DEPENDS= convert:graphics/ImageMagick6 @@ -71,6 +71,8 @@ IMAGICK6_NOX11_RUN_DEPENDS= convert:graphics/ImageMagi IMAGICK7_X11_RUN_DEPENDS= convert:graphics/ImageMagick7 IMAGICK7_NOX11_RUN_DEPENDS= convert:graphics/ImageMagick7-nox11 +PORTDOCS= * + PAPERLESS_STATICDIR= ${WRKSRC}/static do-build: @@ -88,6 +90,9 @@ do-build: do-build-DOCS-on: cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_ARGS} html SPHINXBUILD=sphinx-build-${PYTHON_VER} + +post-build-DOCS-on: + @${RM} ${WRKSRC}/docs/_build/html/.buildinfo do-install: @${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/paperless Modified: head/deskutils/py-paperless/pkg-plist ============================================================================== --- head/deskutils/py-paperless/pkg-plist Mon May 11 23:39:43 2020 (r534965) +++ head/deskutils/py-paperless/pkg-plist Mon May 11 23:51:58 2020 (r534966) @@ -329,212 +329,6 @@ bin/paperless %%PYTHON_SITELIBDIR%%/paperless/setup.cfg %%PYTHON_SITELIBDIR%%/paperless/tox.ini man/man7/paperless.7.gz -%%PORTDOCS%%%%DOCSDIR%%/.buildinfo -%%PORTDOCS%%%%DOCSDIR%%/_sources/api.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/changelog.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/consumption.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/contributing.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/customising.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/extending.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/guesswork.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/index.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/migrating.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/requirements.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/scanners.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/setup.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/troubleshooting.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/utilities.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/css/badge_only.css -%%PORTDOCS%%%%DOCSDIR%%/_static/css/theme.css -%%PORTDOCS%%%%DOCSDIR%%/_static/custom.css -%%PORTDOCS%%%%DOCSDIR%%/_static/doctools.js -%%PORTDOCS%%%%DOCSDIR%%/_static/down-pressed.png -%%PORTDOCS%%%%DOCSDIR%%/_static/down.png -%%PORTDOCS%%%%DOCSDIR%%/_static/file.png -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/Lato/lato-bold.eot -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/Lato/lato-bold.ttf -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/Lato/lato-bold.woff -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/Lato/lato-bold.woff2 -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/Lato/lato-bolditalic.eot -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/Lato/lato-bolditalic.ttf -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/Lato/lato-bolditalic.woff -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/Lato/lato-bolditalic.woff2 -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/Lato/lato-italic.eot -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/Lato/lato-italic.ttf -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/Lato/lato-italic.woff -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/Lato/lato-italic.woff2 -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/Lato/lato-regular.eot -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/Lato/lato-regular.ttf -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/Lato/lato-regular.woff -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/Lato/lato-regular.woff2 -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/RobotoSlab/roboto-slab-v7-bold.eot -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/RobotoSlab/roboto-slab-v7-bold.ttf -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/RobotoSlab/roboto-slab-v7-bold.woff -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/RobotoSlab/roboto-slab-v7-bold.woff2 -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/RobotoSlab/roboto-slab-v7-regular.eot -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/RobotoSlab/roboto-slab-v7-regular.ttf -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/RobotoSlab/roboto-slab-v7-regular.woff -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/RobotoSlab/roboto-slab-v7-regular.woff2 -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/fontawesome-webfont.eot -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/fontawesome-webfont.svg -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/fontawesome-webfont.ttf -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/fontawesome-webfont.woff -%%PORTDOCS%%%%DOCSDIR%%/_static/fonts/fontawesome-webfont.woff2 -%%PORTDOCS%%%%DOCSDIR%%/_static/jquery-3.1.0.js -%%PORTDOCS%%%%DOCSDIR%%/_static/jquery.js -%%PORTDOCS%%%%DOCSDIR%%/_static/js/modernizr.min.js -%%PORTDOCS%%%%DOCSDIR%%/_static/js/theme.js -%%PORTDOCS%%%%DOCSDIR%%/_static/minus.png -%%PORTDOCS%%%%DOCSDIR%%/_static/plus.png -%%PORTDOCS%%%%DOCSDIR%%/_static/pygments.css -%%PORTDOCS%%%%DOCSDIR%%/_static/screenshot.png -%%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%%/api.html -%%PORTDOCS%%%%DOCSDIR%%/changelog.html -%%PORTDOCS%%%%DOCSDIR%%/consumption.html -%%PORTDOCS%%%%DOCSDIR%%/contributing.html -%%PORTDOCS%%%%DOCSDIR%%/customising.html -%%PORTDOCS%%%%DOCSDIR%%/extending.html -%%PORTDOCS%%%%DOCSDIR%%/genindex.html -%%PORTDOCS%%%%DOCSDIR%%/guesswork.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/migrating.html -%%PORTDOCS%%%%DOCSDIR%%/objects.inv -%%PORTDOCS%%%%DOCSDIR%%/presentation/README.md -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/css/font-awesome.css -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/css/font-awesome.min.css -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/fonts/FontAwesome.otf -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/fonts/fontawesome-webfont.eot -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/fonts/fontawesome-webfont.svg -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/fonts/fontawesome-webfont.ttf -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/fonts/fontawesome-webfont.woff -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/fonts/fontawesome-webfont.woff2 -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/less/animated.less -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/less/bordered-pulled.less -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/less/core.less -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/less/fixed-width.less -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/less/font-awesome.less -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/less/icons.less -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/less/larger.less -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/less/list.less -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/less/mixins.less -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/less/path.less -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/less/rotated-flipped.less -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/less/stacked.less -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/less/variables.less -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/scss/_animated.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/scss/_bordered-pulled.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/scss/_core.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/scss/_fixed-width.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/scss/_icons.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/scss/_larger.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/scss/_list.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/scss/_mixins.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/scss/_path.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/scss/_rotated-flipped.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/scss/_stacked.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/scss/_variables.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/font-awesome-4.3.0/scss/font-awesome.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/google/css/lato.css -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/google/fonts/DvlFBScY1r-FMtZSYIYoYw.ttf -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/google/fonts/HkF_qI1x_noxlxhrhMQYEKCWcynf_cDxXwCLxiixG1c.ttf -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/google/fonts/LqowQDslGv4DmUBAfWa2Vw.ttf -%%PORTDOCS%%%%DOCSDIR%%/presentation/contrib/google/fonts/v0SdcGFAl2aezM9Vq_aFTQ.ttf -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/print/paper.css -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/print/pdf.css -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/reveal.css -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/reveal.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/README.md -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/beige.css -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/black.css -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/blood.css -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/league.css -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/moon.css -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/night.css -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/serif.css -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/simple.css -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/sky.css -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/solarized.css -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/source/beige.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/source/black.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/source/blood.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/source/league.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/source/moon.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/source/night.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/source/serif.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/source/simple.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/source/sky.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/source/solarized.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/source/white.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/template/mixins.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/template/settings.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/template/theme.scss -%%PORTDOCS%%%%DOCSDIR%%/presentation/css/theme/white.css -%%PORTDOCS%%%%DOCSDIR%%/presentation/img/kitten.jpg -%%PORTDOCS%%%%DOCSDIR%%/presentation/img/pony.png -%%PORTDOCS%%%%DOCSDIR%%/presentation/img/repo.svg -%%PORTDOCS%%%%DOCSDIR%%/presentation/img/stack.jpg -%%PORTDOCS%%%%DOCSDIR%%/presentation/index.html -%%PORTDOCS%%%%DOCSDIR%%/presentation/js/reveal.js -%%PORTDOCS%%%%DOCSDIR%%/presentation/lib/css/zenburn.css -%%PORTDOCS%%%%DOCSDIR%%/presentation/lib/font/league-gothic/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/presentation/lib/font/league-gothic/league-gothic.css -%%PORTDOCS%%%%DOCSDIR%%/presentation/lib/font/league-gothic/league-gothic.eot -%%PORTDOCS%%%%DOCSDIR%%/presentation/lib/font/league-gothic/league-gothic.ttf -%%PORTDOCS%%%%DOCSDIR%%/presentation/lib/font/league-gothic/league-gothic.woff -%%PORTDOCS%%%%DOCSDIR%%/presentation/lib/font/source-sans-pro/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/presentation/lib/font/source-sans-pro/source-sans-pro-italic.eot -%%PORTDOCS%%%%DOCSDIR%%/presentation/lib/font/source-sans-pro/source-sans-pro-italic.ttf -%%PORTDOCS%%%%DOCSDIR%%/presentation/lib/font/source-sans-pro/source-sans-pro-italic.woff -%%PORTDOCS%%%%DOCSDIR%%/presentation/lib/font/source-sans-pro/source-sans-pro-regular.eot -%%PORTDOCS%%%%DOCSDIR%%/presentation/lib/font/source-sans-pro/source-sans-pro-regular.ttf -%%PORTDOCS%%%%DOCSDIR%%/presentation/lib/font/source-sans-pro/source-sans-pro-regular.woff -%%PORTDOCS%%%%DOCSDIR%%/presentation/lib/font/source-sans-pro/source-sans-pro-semibold.eot -%%PORTDOCS%%%%DOCSDIR%%/presentation/lib/font/source-sans-pro/source-sans-pro-semibold.ttf -%%PORTDOCS%%%%DOCSDIR%%/presentation/lib/font/source-sans-pro/source-sans-pro-semibold.woff -%%PORTDOCS%%%%DOCSDIR%%/presentation/lib/font/source-sans-pro/source-sans-pro-semibolditalic.eot -%%PORTDOCS%%%%DOCSDIR%%/presentation/lib/font/source-sans-pro/source-sans-pro-semibolditalic.ttf -%%PORTDOCS%%%%DOCSDIR%%/presentation/lib/font/source-sans-pro/source-sans-pro-semibolditalic.woff -%%PORTDOCS%%%%DOCSDIR%%/presentation/lib/font/source-sans-pro/source-sans-pro.css -%%PORTDOCS%%%%DOCSDIR%%/presentation/lib/js/classList.js -%%PORTDOCS%%%%DOCSDIR%%/presentation/lib/js/head.min.js -%%PORTDOCS%%%%DOCSDIR%%/presentation/lib/js/html5shiv.js -%%PORTDOCS%%%%DOCSDIR%%/presentation/plugin/highlight/highlight.js -%%PORTDOCS%%%%DOCSDIR%%/presentation/plugin/leap/leap.js -%%PORTDOCS%%%%DOCSDIR%%/presentation/plugin/markdown/example.html -%%PORTDOCS%%%%DOCSDIR%%/presentation/plugin/markdown/example.md -%%PORTDOCS%%%%DOCSDIR%%/presentation/plugin/markdown/markdown.js -%%PORTDOCS%%%%DOCSDIR%%/presentation/plugin/markdown/marked.js -%%PORTDOCS%%%%DOCSDIR%%/presentation/plugin/math/math.js -%%PORTDOCS%%%%DOCSDIR%%/presentation/plugin/multiplex/client.js -%%PORTDOCS%%%%DOCSDIR%%/presentation/plugin/multiplex/index.js -%%PORTDOCS%%%%DOCSDIR%%/presentation/plugin/multiplex/master.js -%%PORTDOCS%%%%DOCSDIR%%/presentation/plugin/notes-server/client.js -%%PORTDOCS%%%%DOCSDIR%%/presentation/plugin/notes-server/index.js -%%PORTDOCS%%%%DOCSDIR%%/presentation/plugin/notes-server/notes.html -%%PORTDOCS%%%%DOCSDIR%%/presentation/plugin/notes/notes.html -%%PORTDOCS%%%%DOCSDIR%%/presentation/plugin/notes/notes.js -%%PORTDOCS%%%%DOCSDIR%%/presentation/plugin/print-pdf/print-pdf.js -%%PORTDOCS%%%%DOCSDIR%%/presentation/plugin/remotes/remotes.js -%%PORTDOCS%%%%DOCSDIR%%/presentation/plugin/search/search.js -%%PORTDOCS%%%%DOCSDIR%%/presentation/plugin/zoom-js/zoom.js -%%PORTDOCS%%%%DOCSDIR%%/requirements.html -%%PORTDOCS%%%%DOCSDIR%%/scanners.html -%%PORTDOCS%%%%DOCSDIR%%/search.html -%%PORTDOCS%%%%DOCSDIR%%/searchindex.js -%%PORTDOCS%%%%DOCSDIR%%/setup.html -%%PORTDOCS%%%%DOCSDIR%%/troubleshooting.html -%%PORTDOCS%%%%DOCSDIR%%/utilities.html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/nginx.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sshd_config Modified: head/devel/ahven/Makefile ============================================================================== --- head/devel/ahven/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/devel/ahven/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -3,7 +3,7 @@ PORTNAME= ahven PORTVERSION= 2.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= http://www.ahven-framework.com/releases/ @@ -23,9 +23,11 @@ NO_OPTIONS_SORT= yes TRACE_DESC= Build with GNAT-specific symbolic tracing functionality DOCS_USES= python:2.7,build -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-adadomain>0:textproc/py-sphinxcontrib-adadomain@${PY_FLAVOR} TRACE_EXTRA_PATCHES= ${FILESDIR}/extra-src_ahven-framework.adb + +PORTDOCS= * post-patch: @${REINPLACE_CMD} -e 's|sphinx-build|&-${PYTHON_VER}|' ${WRKSRC}/doc/manual/en/Makefile Modified: head/devel/ahven/pkg-plist ============================================================================== --- head/devel/ahven/pkg-plist Mon May 11 23:39:43 2020 (r534965) +++ head/devel/ahven/pkg-plist Mon May 11 23:51:58 2020 (r534966) @@ -43,45 +43,3 @@ lib/ahven/ahven.ali lib/ahven/ahven_compat.ali lib/ahven/libahven.a lib/gnat/ahven.gpr -%%PORTDOCS%%%%DOCSDIR%%/html/_static/ajax-loader.gif -%%PORTDOCS%%%%DOCSDIR%%/html/_static/basic.css -%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-bright.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-close.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/doctools.js -%%PORTDOCS%%%%DOCSDIR%%/html/_static/down-pressed.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/down.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/file.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery-3.1.0.js -%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery.js -%%PORTDOCS%%%%DOCSDIR%%/html/_static/minus.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/nature.css -%%PORTDOCS%%%%DOCSDIR%%/html/_static/plus.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/pygments.css -%%PORTDOCS%%%%DOCSDIR%%/html/_static/searchtools.js -%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore-1.3.1.js -%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore.js -%%PORTDOCS%%%%DOCSDIR%%/html/_static/up-pressed.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/up.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/websupport.js -%%PORTDOCS%%%%DOCSDIR%%/html/ada-modindex.html -%%PORTDOCS%%%%DOCSDIR%%/html/api-ahven-framework.html -%%PORTDOCS%%%%DOCSDIR%%/html/api-ahven-listeners-basic.html -%%PORTDOCS%%%%DOCSDIR%%/html/api-ahven-listeners.html -%%PORTDOCS%%%%DOCSDIR%%/html/api-ahven-parameters.html -%%PORTDOCS%%%%DOCSDIR%%/html/api-ahven-results.html -%%PORTDOCS%%%%DOCSDIR%%/html/api-ahven-runner.html -%%PORTDOCS%%%%DOCSDIR%%/html/api-ahven-slist.html -%%PORTDOCS%%%%DOCSDIR%%/html/api-ahven-tap_runner.html -%%PORTDOCS%%%%DOCSDIR%%/html/api-ahven-temporary_output.html -%%PORTDOCS%%%%DOCSDIR%%/html/api-ahven-text_runner.html -%%PORTDOCS%%%%DOCSDIR%%/html/api-ahven-xml_runner.html -%%PORTDOCS%%%%DOCSDIR%%/html/api-ahven.html -%%PORTDOCS%%%%DOCSDIR%%/html/api.html -%%PORTDOCS%%%%DOCSDIR%%/html/design.html -%%PORTDOCS%%%%DOCSDIR%%/html/genindex.html -%%PORTDOCS%%%%DOCSDIR%%/html/index.html -%%PORTDOCS%%%%DOCSDIR%%/html/manual.html -%%PORTDOCS%%%%DOCSDIR%%/html/objects.inv -%%PORTDOCS%%%%DOCSDIR%%/html/search.html -%%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js Modified: head/devel/bpython/Makefile ============================================================================== --- head/devel/bpython/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/devel/bpython/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -14,7 +14,7 @@ COMMENT= Fancy interface to the Python interpreter LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${PY_FLAVOR} +BUILD_DEPENDS= ${PY_SPHINX} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}curtsies>=0.1.18:devel/py-curtsies@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \ Modified: head/devel/cmake-doc/Makefile ============================================================================== --- head/devel/cmake-doc/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/devel/cmake-doc/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -2,6 +2,7 @@ PORTNAME= cmake DISTVERSION= 3.17.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/ PKGNAMESUFFIX= -doc Modified: head/devel/cmake-doc/pkg-plist ============================================================================== --- head/devel/cmake-doc/pkg-plist Mon May 11 23:39:43 2020 (r534965) +++ head/devel/cmake-doc/pkg-plist Mon May 11 23:51:58 2020 (r534966) @@ -1621,21 +1621,14 @@ %%DOCSDIR%%/html/_sources/variable/WINDOWS_STORE.rst.txt %%DOCSDIR%%/html/_sources/variable/XCODE.rst.txt %%DOCSDIR%%/html/_sources/variable/XCODE_VERSION.rst.txt -%%DOCSDIR%%/html/_static/ajax-loader.gif %%DOCSDIR%%/html/_static/basic.css %%DOCSDIR%%/html/_static/classic.css %%DOCSDIR%%/html/_static/cmake-favicon.ico %%DOCSDIR%%/html/_static/cmake-logo-16.png %%DOCSDIR%%/html/_static/cmake.css -%%DOCSDIR%%/html/_static/comment-bright.png -%%DOCSDIR%%/html/_static/comment-close.png -%%DOCSDIR%%/html/_static/comment.png %%DOCSDIR%%/html/_static/default.css %%DOCSDIR%%/html/_static/doctools.js -%%DOCSDIR%%/html/_static/down-pressed.png -%%DOCSDIR%%/html/_static/down.png %%DOCSDIR%%/html/_static/file.png -%%DOCSDIR%%/html/_static/jquery-3.1.0.js %%DOCSDIR%%/html/_static/jquery.js %%DOCSDIR%%/html/_static/minus.png %%DOCSDIR%%/html/_static/plus.png @@ -1644,9 +1637,6 @@ %%DOCSDIR%%/html/_static/sidebar.js %%DOCSDIR%%/html/_static/underscore-1.3.1.js %%DOCSDIR%%/html/_static/underscore.js -%%DOCSDIR%%/html/_static/up-pressed.png -%%DOCSDIR%%/html/_static/up.png -%%DOCSDIR%%/html/_static/websupport.js %%DOCSDIR%%/html/command/add_compile_definitions.html %%DOCSDIR%%/html/command/add_compile_options.html %%DOCSDIR%%/html/command/add_custom_command.html Modified: head/devel/gearmand-devel/Makefile ============================================================================== --- head/devel/gearmand-devel/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/devel/gearmand-devel/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -12,7 +12,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Gearman C Server and Library BUILD_DEPENDS= boost-libs>=0:devel/boost-libs \ - ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} + ${PY_SPHINX} LIB_DEPENDS= libevent.so:devel/libevent \ libuuid.so:misc/e2fsprogs-libuuid \ libboost_program_options.so:devel/boost-libs Modified: head/devel/gearmand/Makefile ============================================================================== --- head/devel/gearmand/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/devel/gearmand/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -10,7 +10,7 @@ MASTER_SITES= http://launchpad.net/gearmand/1.0/${PORT MAINTAINER= ports@FreeBSD.org COMMENT= Gearman C Server and Library -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} +BUILD_DEPENDS= ${PY_SPHINX} LIB_DEPENDS= libboost_program_options.so:devel/boost-libs \ libevent.so:devel/libevent \ libuuid.so:misc/e2fsprogs-libuuid Modified: head/devel/kf5-extra-cmake-modules/Makefile ============================================================================== --- head/devel/kf5-extra-cmake-modules/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/devel/kf5-extra-cmake-modules/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -3,6 +3,7 @@ PORTNAME= extra-cmake-modules DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org Modified: head/devel/kf5-extra-cmake-modules/pkg-plist ============================================================================== --- head/devel/kf5-extra-cmake-modules/pkg-plist Mon May 11 23:39:43 2020 (r534965) +++ head/devel/kf5-extra-cmake-modules/pkg-plist Mon May 11 23:51:58 2020 (r534966) @@ -156,20 +156,17 @@ share/ECM/toolchain/specifydependencies.cmake %%PORTDOCS%%%%DOCSDIR%%/html/_sources/module/ECMUseFindModules.rst.txt %%PORTDOCS%%%%DOCSDIR%%/html/_sources/module/ECMWinResolveSymlinks.rst.txt %%PORTDOCS%%%%DOCSDIR%%/html/_sources/toolchain/Android.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/html/_static/ajax-loader.gif %%PORTDOCS%%%%DOCSDIR%%/html/_static/basic.css %%PORTDOCS%%%%DOCSDIR%%/html/_static/classic.css -%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-bright.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-close.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment.png +%%PORTDOCS%%%%DOCSDIR%%/html/_static/default.css %%PORTDOCS%%%%DOCSDIR%%/html/_static/doctools.js -%%PORTDOCS%%%%DOCSDIR%%/html/_static/down-pressed.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/down.png +%%PORTDOCS%%%%DOCSDIR%%/html/_static/documentation_options.js %%PORTDOCS%%%%DOCSDIR%%/html/_static/ecm.css %%PORTDOCS%%%%DOCSDIR%%/html/_static/file.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery-3.1.0.js +%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery-3.4.1.js %%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery.js %%PORTDOCS%%%%DOCSDIR%%/html/_static/kde-favicon.ico +%%PORTDOCS%%%%DOCSDIR%%/html/_static/language_data.js %%PORTDOCS%%%%DOCSDIR%%/html/_static/minus.png %%PORTDOCS%%%%DOCSDIR%%/html/_static/plus.png %%PORTDOCS%%%%DOCSDIR%%/html/_static/pygments.css @@ -177,9 +174,6 @@ share/ECM/toolchain/specifydependencies.cmake %%PORTDOCS%%%%DOCSDIR%%/html/_static/sidebar.js %%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore-1.3.1.js %%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore.js -%%PORTDOCS%%%%DOCSDIR%%/html/_static/up-pressed.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/up.png -%%PORTDOCS%%%%DOCSDIR%%/html/_static/websupport.js %%PORTDOCS%%%%DOCSDIR%%/html/find-module/FindCanberra.html %%PORTDOCS%%%%DOCSDIR%%/html/find-module/FindEGL.html %%PORTDOCS%%%%DOCSDIR%%/html/find-module/FindFontconfig.html Modified: head/devel/llvm-cheri/Makefile ============================================================================== --- head/devel/llvm-cheri/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/devel/llvm-cheri/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -73,7 +73,7 @@ OPTIONS_SUB= yes CLANG_DESC= Build clang CLANG_PORTDOCS= clang CLANG_USE= GNOME=libxml2 -DOCS_BUILD_DEPENDS= sphinx-build-${PYTHON_VER}:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ ${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 Mon May 11 23:39:43 2020 (r534965) +++ head/devel/llvm-devel/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -100,7 +100,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= sphinx-build-${PYTHON_VER}:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx18>=0:textproc/py-sphinx18@${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 Mon May 11 23:39:43 2020 (r534965) +++ head/devel/llvm10/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -105,7 +105,7 @@ COMPILER_RT_DISTFILES= compiler-rt-${DISTVERSION}.src$ COMPILER_RT_EXTRA_PATCHES= ${PATCHDIR}/compiler-rt COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} -DOCS_BUILD_DEPENDS= sphinx-build-${PYTHON_VER}:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx18>=0:textproc/py-sphinx18@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} DOCS_CONFLICTS_BUILD= commonmark-cmark-* DOCS_PORTDOCS= llvm Modified: head/devel/llvm60/Makefile ============================================================================== --- head/devel/llvm60/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/devel/llvm60/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -67,7 +67,7 @@ CLANG_USE= GNOME=libxml2 COMPILER_RT_DESC= Sanitizer libraries COMPILER_RT_DISTFILES= compiler-rt-${DISTVERSION}.src${EXTRACT_SUFX} COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} -DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx +DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx18 DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ -DSPHINX_WARNINGS_AS_ERRORS=OFF \ Modified: head/devel/llvm70/Makefile ============================================================================== --- head/devel/llvm70/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/devel/llvm70/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -69,7 +69,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= sphinx-build:textproc/py-sphinx +DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx18 DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ -DSPHINX_WARNINGS_AS_ERRORS=OFF \ Modified: head/devel/llvm80/Makefile ============================================================================== --- head/devel/llvm80/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/devel/llvm80/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -85,7 +85,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= sphinx-build-${PYTHON_VER}:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx18>=0:textproc/py-sphinx18@${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 Mon May 11 23:39:43 2020 (r534965) +++ head/devel/llvm90/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -93,7 +93,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= sphinx-build-${PYTHON_VER}:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx18>=0:textproc/py-sphinx18@${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-Jinja2/Makefile ============================================================================== --- head/devel/py-Jinja2/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/devel/py-Jinja2/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -40,7 +40,7 @@ PY2TO3_ARGS= --fix=all --no-diffs --nobackups --verbos .include <bsd.port.pre.mk> .if ${PKGNAMESUFFIX} == "-doc" -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${PY_FLAVOR} +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sphinx18>=1.1.3:textproc/py-sphinx18@${PY_FLAVOR} DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} PORTDOCS= * PORT_OPTIONS:= ${PORT_OPTIONS:NEXAMPLES} Modified: head/devel/py-boolean.py/Makefile ============================================================================== --- head/devel/py-boolean.py/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/devel/py-boolean.py/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -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= ${PY_SPHINX} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" post-install-DOCS-on: Modified: head/devel/py-delfick_error/Makefile ============================================================================== --- head/devel/py-delfick_error/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/devel/py-delfick_error/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -18,7 +18,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-m OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ + ${PY_SPHINX} \ ${PYTHON_PKGNAMEPREFIX}cloud_sptheme>0:textproc/py-cloud_sptheme@${PY_FLAVOR} NO_ARCH= yes Modified: head/devel/py-easyprocess/Makefile ============================================================================== --- head/devel/py-easyprocess/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/devel/py-easyprocess/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -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} \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} + ${PY_SPHINX} NO_ARCH= YES USE_PYTHON= autoplist distutils Modified: head/devel/py-jira/Makefile ============================================================================== --- head/devel/py-jira/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/devel/py-jira/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sphinx>=1.6.5:textproc/py-sphinx@${PY_FLAVOR} + ${PY_SPHINX} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.3:www/py-requests-oauthlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tlslite>=0.4.4:security/py-tlslite@${PY_FLAVOR} \ Modified: head/devel/py-molecule/Makefile ============================================================================== --- head/devel/py-molecule/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/devel/py-molecule/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -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} \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} + ${PY_SPHINX} 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-noseofyeti/Makefile ============================================================================== --- head/devel/py-noseofyeti/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/devel/py-noseofyeti/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -3,6 +3,7 @@ PORTNAME= noseofyeti PORTVERSION= 1.8 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -24,7 +25,7 @@ OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ + ${PY_SPHINX} \ ${PYTHON_PKGNAMEPREFIX}pinocchio>0:devel/py-pinocchio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}should_dsl>0:devel/py-should_dsl@${PY_FLAVOR} Added: head/devel/py-noseofyeti/files/patch-docs___ext_options.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-noseofyeti/files/patch-docs___ext_options.py Mon May 11 23:51:58 2020 (r534966) @@ -0,0 +1,8 @@ +--- docs/_ext/options.py.orig 2018-10-30 11:37:40 UTC ++++ docs/_ext/options.py +@@ -1,4 +1,4 @@ +-from sphinx.util.compat import Directive ++from docutils.parsers.rst import Directive + from docutils import nodes + + from noseOfYeti.plugins.support.spec_options import spec_options Added: head/devel/py-noseofyeti/files/patch-docs___ext_show__tests.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-noseofyeti/files/patch-docs___ext_show__tests.py Mon May 11 23:51:58 2020 (r534966) @@ -0,0 +1,10 @@ +--- docs/_ext/show_tests.py.orig 2018-10-30 11:37:40 UTC ++++ docs/_ext/show_tests.py +@@ -1,6 +1,6 @@ + from docutils.nodes import fully_normalize_name as normalize_name + from sphinx.directives.code import LiteralInclude +-from sphinx.util.compat import Directive ++from docutils.parsers.rst import Directive + from pinocchio.spec import testName + from docutils import nodes + import inspect Modified: head/devel/py-oslotest/Makefile ============================================================================== --- head/devel/py-oslotest/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/devel/py-oslotest/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -33,7 +33,7 @@ NO_ARCH= yes PORTDOCS= * OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.6.2:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx18>=1.6.2:textproc/py-sphinx18@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openstackdocstheme>=1.18.1:textproc/py-openstackdocstheme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}fixtures>=3.0.0:devel/py-fixtures@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \ Modified: head/devel/py-osprofiler/Makefile ============================================================================== --- head/devel/py-osprofiler/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/devel/py-osprofiler/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -29,7 +29,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} \ ${PYTHON_PKGNAMEPREFIX}openstackdocstheme>=0:textproc/py-openstackdocstheme@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" Modified: head/devel/py-pathlib/Makefile ============================================================================== --- head/devel/py-pathlib/Makefile Mon May 11 23:39:43 2020 (r534965) +++ head/devel/py-pathlib/Makefile Mon May 11 23:51:58 2020 (r534966) @@ -19,7 +19,7 @@ NO_ARCH= yes *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005112351.04BNpwRn036290>