diff options
| author | Danilo G. Baio <dbaio@FreeBSD.org> | 2020-05-11 23:51:58 +0000 |
|---|---|---|
| committer | Danilo G. Baio <dbaio@FreeBSD.org> | 2020-05-11 23:51:58 +0000 |
| commit | 75a5f7f0762c1039d83da77f699eed5f26998731 (patch) | |
| tree | d08289c54ff9db139f0a17e3129c69e9b0ae39b1 | |
| parent | 91dd9e62375f38dcfa9e2214347d9837b18c8810 (diff) | |
| download | freebsd-ports-75a5f7f0762c1039d83da77f699eed5f26998731.zip | |
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
142 files changed, 295 insertions, 998 deletions
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 1da52645a47c..bedf07ef1c21 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -638,9 +638,11 @@ PYNUMPY= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1<1.19,1:math/py-numpy@${PY_FLAVOR} .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 diff --git a/audio/aubio/Makefile b/audio/aubio/Makefile index b32ea5f8fd17..94c8eea50e06 100644 --- a/audio/aubio/Makefile +++ b/audio/aubio/Makefile @@ -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} @@ -59,6 +59,8 @@ SNDFILE_CONFIGURE_ENABLE= sndfile TEST_MAKE_ARGS= --enable-tests TEST_MAKE_ARGS_OFF= --disable-tests +PORTDOCS= * + post-patch: @${REINPLACE_CMD} -e \ '/pkgconfig/s|$${LIBDIR}|&data|' ${WRKSRC}/waflib/TaskGen.py diff --git a/audio/aubio/pkg-plist b/audio/aubio/pkg-plist index 586bbfd3d85c..4ad01d40deb8 100644 --- a/audio/aubio/pkg-plist +++ b/audio/aubio/pkg-plist @@ -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 diff --git a/audio/musicpc/Makefile b/audio/musicpc/Makefile index 596b344d9ca1..d7d38e342a6b 100644 --- a/audio/musicpc/Makefile +++ b/audio/musicpc/Makefile @@ -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> diff --git a/audio/musicpc/pkg-plist b/audio/musicpc/pkg-plist index 19c202a2102e..c1992ce4a394 100644 --- a/audio/musicpc/pkg-plist +++ b/audio/musicpc/pkg-plist @@ -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 diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile index 4501e5fcfffc..54077510ef9f 100644 --- a/audio/ncmpc/Makefile +++ b/audio/ncmpc/Makefile @@ -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 @@ -44,4 +44,6 @@ NLS_LDFLAGS= -lintl NLS_MESON_ENABLED= nls NLS_USES= gettext +PORTDOCS= * + .include <bsd.port.mk> diff --git a/audio/ncmpc/pkg-plist b/audio/ncmpc/pkg-plist index 25396675a654..ee4a759d29ab 100644 --- a/audio/ncmpc/pkg-plist +++ b/audio/ncmpc/pkg-plist @@ -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 diff --git a/audio/py-pyaudio/Makefile b/audio/py-pyaudio/Makefile index d0a54c5090be..223b55b38203 100644 --- a/audio/py-pyaudio/Makefile +++ b/audio/py-pyaudio/Makefile @@ -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/=/%%!/} \ diff --git a/biology/py-orange3-single-cell/Makefile b/biology/py-orange3-single-cell/Makefile index 06d7ca887c37..93965364e7ae 100644 --- a/biology/py-orange3-single-cell/Makefile +++ b/biology/py-orange3-single-cell/Makefile @@ -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} diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile index ed3b36be460c..1b37cefcca86 100644 --- a/comms/gnuradio/Makefile +++ b/comms/gnuradio/Makefile @@ -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 diff --git a/databases/cassandra3/Makefile b/databases/cassandra3/Makefile index f3b0fc91b98a..245f66f367a0 100644 --- a/databases/cassandra3/Makefile +++ b/databases/cassandra3/Makefile @@ -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= * diff --git a/databases/cassandra4/Makefile b/databases/cassandra4/Makefile index 29345d305ef4..88b736c634b6 100644 --- a/databases/cassandra4/Makefile +++ b/databases/cassandra4/Makefile @@ -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= * diff --git a/databases/py-xapian/Makefile b/databases/py-xapian/Makefile index 4d6dd828499c..4c443a61c67e 100644 --- a/databases/py-xapian/Makefile +++ b/databases/py-xapian/Makefile @@ -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> diff --git a/deskutils/py-khard/Makefile b/deskutils/py-khard/Makefile index 71f92fa84f05..eaf9fc8b2648 100644 --- a/deskutils/py-khard/Makefile +++ b/deskutils/py-khard/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites@${ ${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 @@ -35,6 +35,12 @@ PLIST_FILES= share/zsh/site-functions/_khard \ 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) diff --git a/deskutils/py-paperless/Makefile b/deskutils/py-paperless/Makefile index ffe9d111481b..3c37df20b9ed 100644 --- a/deskutils/py-paperless/Makefile +++ b/deskutils/py-paperless/Makefile @@ -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/ImageMagick6-nox11 IMAGICK7_X11_RUN_DEPENDS= convert:graphics/ImageMagick7 IMAGICK7_NOX11_RUN_DEPENDS= convert:graphics/ImageMagick7-nox11 +PORTDOCS= * + PAPERLESS_STATICDIR= ${WRKSRC}/static do-build: @@ -89,6 +91,9 @@ 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 @cd ${WRKSRC}/resources && \ diff --git a/deskutils/py-paperless/pkg-plist b/deskutils/py-paperless/pkg-plist index 06eb6e5a7c73..e5f30cf530c9 100644 --- a/deskutils/py-paperless/pkg-plist +++ b/deskutils/py-paperless/pkg-plist @@ -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 diff --git a/devel/ahven/Makefile b/devel/ahven/Makefile index 96821bfd4442..c7a71604c041 100644 --- a/devel/ahven/Makefile +++ b/devel/ahven/Makefile @@ -3,7 +3,7 @@ PORTNAME= ahven PORTVERSION= 2.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= http://www.ahven-framework.com/releases/ @@ -23,10 +23,12 @@ 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 diff --git a/devel/ahven/pkg-plist b/devel/ahven/pkg-plist index fbf9900d297c..9da739b61b7c 100644 --- a/devel/ahven/pkg-plist +++ b/devel/ahven/pkg-plist @@ -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 diff --git a/devel/bpython/Makefile b/devel/bpython/Makefile index 41d8b98b9a00..95c725dab94e 100644 --- a/devel/bpython/Makefile +++ b/devel/bpython/Makefile @@ -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} \ diff --git a/devel/cmake-doc/Makefile b/devel/cmake-doc/Makefile index be12f4f1c49c..60591bd6006f 100644 --- a/devel/cmake-doc/Makefile +++ b/devel/cmake-doc/Makefile @@ -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 diff --git a/devel/cmake-doc/pkg-plist b/devel/cmake-doc/pkg-plist index 0344b696f21c..412e1680ee69 100644 --- a/devel/cmake-doc/pkg-plist +++ b/devel/cmake-doc/pkg-plist @@ -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 diff --git a/devel/gearmand-devel/Makefile b/devel/gearmand-devel/Makefile index ec3902bbbf70..89d691518ae4 100644 --- a/devel/gearmand-devel/Makefile +++ b/devel/gearmand-devel/Makefile @@ -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 diff --git a/devel/gearmand/Makefile b/devel/gearmand/Makefile index 91f373577cd6..6a3490fa81a6 100644 --- a/devel/gearmand/Makefile +++ b/devel/gearmand/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= http://launchpad.net/gearmand/1.0/${PORTVERSION}/+download/ 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 diff --git a/devel/kf5-extra-cmake-modules/Makefile b/devel/kf5-extra-cmake-modules/Makefile index f124300d9981..c5099ae961cb 100644 --- a/devel/kf5-extra-cmake-modules/Makefile +++ b/devel/kf5-extra-cmake-modules/Makefile @@ -3,6 +3,7 @@ PORTNAME= extra-cmake-modules DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/devel/kf5-extra-cmake-modules/pkg-plist b/devel/kf5-extra-cmake-modules/pkg-plist index d9d04cd984a7..a4f94b7f155c 100644 --- a/devel/kf5-extra-cmake-modules/pkg-plist +++ b/devel/kf5-extra-cmake-modules/pkg-plist @@ -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 diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile index 72265d6fc5e0..5a02a7e8351d 100644 --- a/devel/llvm-cheri/Makefile +++ b/devel/llvm-cheri/Makefile @@ -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} \ diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index cf1a6ca7a19e..63783cd1c2a3 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -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} \ diff --git a/devel/llvm10/Makefile b/devel/llvm10/Makefile index 0d15faf43fb7..048e80552c04 100644 --- a/devel/llvm10/Makefile +++ b/devel/llvm10/Makefile @@ -105,7 +105,7 @@ COMPILER_RT_DISTFILES= compiler-rt-${DISTVERSION}.src${EXTRACT_SUFX} 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 diff --git a/devel/llvm60/Makefile b/devel/llvm60/Makefile index 3ddf20b12ff2..9c0cf9731d2e 100644 --- a/devel/llvm60/Makefile +++ b/devel/llvm60/Makefile @@ -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 \ diff --git a/devel/llvm70/Makefile b/devel/llvm70/Makefile index 7e2109235cf1..a285578a823e 100644 --- a/devel/llvm70/Makefile +++ b/devel/llvm70/Makefile @@ -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 \ diff --git a/devel/llvm80/Makefile b/devel/llvm80/Makefile index 9ce90d0b8be9..c0c4adbc441a 100644 --- a/devel/llvm80/Makefile +++ b/devel/llvm80/Makefile @@ -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 diff --git a/devel/llvm90/Makefile b/devel/llvm90/Makefile index 0126e24c090c..245e196f42a9 100644 --- a/devel/llvm90/Makefile +++ b/devel/llvm90/Makefile @@ -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 diff --git a/devel/py-Jinja2/Makefile b/devel/py-Jinja2/Makefile index 04d33adcb8d3..95f05733d7f0 100644 --- a/devel/py-Jinja2/Makefile +++ b/devel/py-Jinja2/Makefile @@ -40,7 +40,7 @@ PY2TO3_ARGS= --fix=all --no-diffs --nobackups --verbose --write .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} diff --git a/devel/py-boolean.py/Makefile b/devel/py-boolean.py/Makefile index ccec03b38c5d..faa571c70756 100644 --- a/devel/py-boolean.py/Makefile +++ b/devel/py-boolean.py/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= ${PY_SPHINX} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" post-install-DOCS-on: diff --git a/devel/py-delfick_error/Makefile b/devel/py-delfick_error/Makefile index 379b6f965a65..dd7c7b6d02c1 100644 --- a/devel/py-delfick_error/Makefile +++ b/devel/py-delfick_error/Makefile @@ -18,7 +18,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ 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 diff --git a/devel/py-easyprocess/Makefile b/devel/py-easyprocess/Makefile index 8aa5ab377349..c24dfbf01e1a 100644 --- a/devel/py-easyprocess/Makefile +++ b/devel/py-easyprocess/Makefile @@ -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 diff --git a/devel/py-jira/Makefile b/devel/py-jira/Makefile index cbff9b31cb34..e1fe8da0c491 100644 --- a/devel/py-jira/Makefile +++ b/devel/py-jira/Makefile @@ -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} \ diff --git a/devel/py-molecule/Makefile b/devel/py-molecule/Makefile index d782cc71a51c..553742fb96cd 100644 --- a/devel/py-molecule/Makefile +++ b/devel/py-molecule/Makefile @@ -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} \ diff --git a/devel/py-noseofyeti/Makefile b/devel/py-noseofyeti/Makefile index 47e3056db926..760d2be8483a 100644 --- a/devel/py-noseofyeti/Makefile +++ b/devel/py-noseofyeti/Makefile @@ -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} diff --git a/devel/py-noseofyeti/files/patch-docs___ext_options.py b/devel/py-noseofyeti/files/patch-docs___ext_options.py new file mode 100644 index 000000000000..8ce3466fe8e6 --- /dev/null +++ b/devel/py-noseofyeti/files/patch-docs___ext_options.py @@ -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 diff --git a/devel/py-noseofyeti/files/patch-docs___ext_show__tests.py b/devel/py-noseofyeti/files/patch-docs___ext_show__tests.py new file mode 100644 index 000000000000..aa002ecc964f --- /dev/null +++ b/devel/py-noseofyeti/files/patch-docs___ext_show__tests.py @@ -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 diff --git a/devel/py-oslotest/Makefile b/devel/py-oslotest/Makefile index f3e5f97c7804..e50ae98ce22c 100644 --- a/devel/py-oslotest/Makefile +++ b/devel/py-oslotest/Makefile @@ -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} \ diff --git a/devel/py-osprofiler/Makefile b/devel/py-osprofiler/Makefile index 8fd2068a8c16..b3ba36cca168 100644 --- a/devel/py-osprofiler/Makefile +++ b/devel/py-osprofiler/Makefile @@ -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" diff --git a/devel/py-pathlib/Makefile b/devel/py-pathlib/Makefile index 4790b3b65f28..98974a0cf242 100644 --- a/devel/py-pathlib/Makefile +++ b/devel/py-pathlib/Makefile @@ -19,7 +19,7 @@ NO_ARCH= yes OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} +DOCS_BUILD_DEPENDS= ${PY_SPHINX} DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} PORTDOCS= * DOCS_VARS= PYDISTUTILS_BUILD_TARGET+=build_sphinx diff --git a/devel/py-pathtools/Makefile b/devel/py-pathtools/Makefile index e719a14e4cfb..54d7694527ad 100644 --- a/devel/py-pathtools/Makefile +++ b/devel/py-pathtools/Makefile @@ -2,7 +2,7 @@ PORTNAME= pathtools PORTVERSION= 0.1.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,18 +17,17 @@ OPTIONS_DEFINE= DOCS USES= python USE_PYTHON= distutils autoplist -.include <bsd.port.options.mk> +DOCS_BUILD_DEPENDS= ${PY_SPHINX} -.if ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${PY_FLAVOR} DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} +PORTDOCS= * + post-build: @(cd ${WRKSRC}/docs ; ${MAKE} SPHINXBUILD=sphinx-build-${PYTHON_VER} html) post-install: @(cd ${WRKSRC}/docs/build/html ; ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \ "! -name .buildinfo -and ! -name objects.inv") -.endif .include <bsd.port.mk> diff --git a/devel/py-pathtools/pkg-plist b/devel/py-pathtools/pkg-plist deleted file mode 100644 index c65e4cc2c7e8..000000000000 --- a/devel/py-pathtools/pkg-plist +++ /dev/null @@ -1,34 +0,0 @@ -%%PORTDOCS%%%%DOCSDIR%%/_modules/index.html -%%PORTDOCS%%%%DOCSDIR%%/_modules/pathtools/path.html -%%PORTDOCS%%%%DOCSDIR%%/_modules/pathtools/patterns.html -%%PORTDOCS%%%%DOCSDIR%%/_sources/api.rst.txt -%%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/default.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/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%%/api.html -%%PORTDOCS%%%%DOCSDIR%%/genindex.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/py-modindex.html -%%PORTDOCS%%%%DOCSDIR%%/search.html -%%PORTDOCS%%%%DOCSDIR%%/searchindex.js diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile index 304b92ef4d34..6e3fc485e68c 100644 --- a/devel/py-pip/Makefile +++ b/devel/py-pip/Makefile @@ -42,7 +42,7 @@ USES= python shebangfix OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pypa-docs-theme>=g20180622:textproc/py-pypa-docs-theme@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} + ${PY_SPHINX} DOCS_PORTDOCS= * DOCS_VARS= PYDISTUTILS_BUILD_TARGET=build_sphinx \ PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env" diff --git a/devel/py-pyinstaller/Makefile b/devel/py-pyinstaller/Makefile index ea6ab98b9dfe..959a757d184a 100644 --- a/devel/py-pyinstaller/Makefile +++ b/devel/py-pyinstaller/Makefile @@ -28,7 +28,7 @@ OPTIONS_DEFINE= DOCS MANPAGES OPTIONS_DEFAULT= MANPAGES OPTIONS_SUB= yes -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_MAKE_ARGS= SPHINXBUILD=sphinx-build-${PYTHON_VER} DOCS_USES= gmake MANPAGES_BUILD_DEPENDS= ${DOCS_BUILD_DEPENDS} diff --git a/devel/py-python-gitlab/Makefile b/devel/py-python-gitlab/Makefile index bb158e6e6915..4b2b98a73031 100644 --- a/devel/py-python-gitlab/Makefile +++ b/devel/py-python-gitlab/Makefile @@ -21,7 +21,7 @@ USES= python:3.6+ #OPTIONS_DEFINE= DOCS -#DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.7.6,1:textproc/py-sphinx@${PY_FLAVOR} +#DOCS_BUILD_DEPENDS= ${PY_SPHINX} #DOCS_PORTDOCS= * #DOCS_VARS= PYDISTUTILS_BUILD_TARGET=build_sphinx \ PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env" diff --git a/devel/py-spyder/Makefile b/devel/py-spyder/Makefile index dacc7451f3b6..49dfacbbcc6f 100644 --- a/devel/py-spyder/Makefile +++ b/devel/py-spyder/Makefile @@ -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= ${PYTHON_PKGNAMEPREFIX}sphinx>=0.6:textproc/py-sphinx@${PY_FLAVOR} +DOCS_BUILD_DEPENDS= ${PY_SPHINX} 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} diff --git a/devel/py-virtualenv/Makefile b/devel/py-virtualenv/Makefile index 827bd252e52c..224e8381e2bf 100644 --- a/devel/py-virtualenv/Makefile +++ b/devel/py-virtualenv/Makefile @@ -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= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}towncrier>0:textproc/py-towncrier@${PY_FLAVOR} .if ${FLAVOR:U:Mpy27} diff --git a/devel/py-virtualenvwrapper/Makefile b/devel/py-virtualenvwrapper/Makefile index aae2be57eb2f..f9a541015d72 100644 --- a/devel/py-virtualenvwrapper/Makefile +++ b/devel/py-virtualenvwrapper/Makefile @@ -3,6 +3,7 @@ PORTNAME= virtualenvwrapper PORTVERSION= 4.8.4 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -24,11 +25,13 @@ USE_PYTHON= autoplist concurrent distutils OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-bitbucket>=1.0:textproc/py-sphinxcontrib-bitbucket@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+=build_sphinx \ PYDISTUTILS_BUILDARGS="-a -E" +PORTDOCS= * + NO_ARCH= yes post-patch: @@ -45,6 +48,9 @@ post-patch-DOCS-on: @${REINPLACE_CMD} -e 's|python setup.py|${PYTHON_CMD} setup.py|' \ ${WRKSRC}/docs/source/conf.py +post-build-DOCS-on: + @${RM} ${WRKSRC}/docs/build/html/.buildinfo + post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC}/docs/build/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} diff --git a/devel/py-virtualenvwrapper/pkg-plist b/devel/py-virtualenvwrapper/pkg-plist deleted file mode 100644 index f1bea1ceb84b..000000000000 --- a/devel/py-virtualenvwrapper/pkg-plist +++ /dev/null @@ -1,52 +0,0 @@ -%%PORTDOCS%%%%DOCSDIR%%/.buildinfo -%%PORTDOCS%%%%DOCSDIR%%/_sources/command_ref.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/design.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/developers.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/extensions.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/glossary.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/history.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/hooks.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/index.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/install.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/plugins.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/projects.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/scripts.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/tips.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%%/command_ref.html -%%PORTDOCS%%%%DOCSDIR%%/design.html -%%PORTDOCS%%%%DOCSDIR%%/developers.html -%%PORTDOCS%%%%DOCSDIR%%/extensions.html -%%PORTDOCS%%%%DOCSDIR%%/glossary.html -%%PORTDOCS%%%%DOCSDIR%%/history.html -%%PORTDOCS%%%%DOCSDIR%%/hooks.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/install.html -%%PORTDOCS%%%%DOCSDIR%%/objects.inv -%%PORTDOCS%%%%DOCSDIR%%/plugins.html -%%PORTDOCS%%%%DOCSDIR%%/projects.html -%%PORTDOCS%%%%DOCSDIR%%/scripts.html -%%PORTDOCS%%%%DOCSDIR%%/search.html -%%PORTDOCS%%%%DOCSDIR%%/searchindex.js -%%PORTDOCS%%%%DOCSDIR%%/tips.html diff --git a/devel/py-watchdog/Makefile b/devel/py-watchdog/Makefile index dcb420d4aa99..3d270c2f7997 100644 --- a/devel/py-watchdog/Makefile +++ b/devel/py-watchdog/Makefile @@ -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} \ - ${PYTHON_PKGNAMEPREFIX}sphinx>=1.4.4:textproc/py-sphinx@${PY_FLAVOR} + ${PY_SPHINX} DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} GH_ACCOUNT= gorakhargosh diff --git a/dns/knot-resolver/Makefile b/dns/knot-resolver/Makefile index 6f6a81c04952..4f0b176c2633 100644 --- a/dns/knot-resolver/Makefile +++ b/dns/knot-resolver/Makefile @@ -91,7 +91,7 @@ DNSTAP_MESON_OFF= -Ddnstap=disabled DOXYGEN_IMPLIES= DOCS DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ + ${PY_SPHINX} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} TRUSTANCHOR_DESC= Trust anchor bootstrapping and stats diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile index 9dc7814b3f03..2bf2ad616aae 100644 --- a/graphics/colmap/Makefile +++ b/graphics/colmap/Makefile @@ -47,7 +47,7 @@ CGAL_BUILD_DEPENDS= cgal>0:math/cgal CGAL_CMAKE_BOOL= CGAL_ENABLED DOCS_BUILD_DEPENDS= gmake:devel/gmake \ - sphinx-build:textproc/py-sphinx + sphinx-build:textproc/py-sphinx18 DOCS_PORTDOCS= * OPENMP_USES= compiler:openmp diff --git a/graphics/py-django-easy-thumbnails/Makefile b/graphics/py-django-easy-thumbnails/Makefile index 2514daf1496a..dcb82401d9fe 100644 --- a/graphics/py-django-easy-thumbnails/Makefile +++ b/graphics/py-django-easy-thumbnails/Makefile @@ -26,7 +26,7 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.8:www/py-django22@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ + ${PY_SPHINX} \ ${PY_PILLOW} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" diff --git a/graphics/py-mayavi/Makefile b/graphics/py-mayavi/Makefile index 3d8723403112..95431f9c3a30 100644 --- a/graphics/py-mayavi/Makefile +++ b/graphics/py-mayavi/Makefile @@ -23,7 +23,7 @@ LICENSE_FILE_APACHE11= ${WRKSRC}/LICENSE_COLORBREWER.txt # See ${WRKSRC}/image_LICENSE.txt for per file license information BUILD_DEPENDS= vtk6>=6.1.0_8:math/vtk6 \ - ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.1_2:textproc/py-sphinx@${PY_FLAVOR} + ${PY_SPHINX} RUN_DEPENDS= vtk6>=6.1.0_8:math/vtk6 \ ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}envisage>=4.4.0:devel/py-envisage@${PY_FLAVOR} \ diff --git a/graphics/py-sorl-thumbnail/Makefile b/graphics/py-sorl-thumbnail/Makefile index 50c154d05bd6..d5be26a7a10e 100644 --- a/graphics/py-sorl-thumbnail/Makefile +++ b/graphics/py-sorl-thumbnail/Makefile @@ -30,7 +30,7 @@ OPTIONS_GROUP= CACHING OPTIONS_SINGLE_IMAGELIB= GRAPHICSMAGICK IMAGEMAGICK PILLOW WAND OPTIONS_GROUP_CACHING= REDIS -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" GRAPHICSMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/gm:graphics/GraphicsMagick diff --git a/graphics/zathura/Makefile b/graphics/zathura/Makefile index 08f8f47393ce..dbac081d0e26 100644 --- a/graphics/zathura/Makefile +++ b/graphics/zathura/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libcairo.so:graphics/cairo \ libgirara-gtk3.so:x11-toolkits/girara \ libsynctex.so:devel/tex-synctex -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PY_SPHINX} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} USES= compiler:c11 gettext-tools:build gnome meson ninja pkgconfig \ diff --git a/lang/pocl/Makefile b/lang/pocl/Makefile index 8affe213aeac..bdf81df9ea71 100644 --- a/lang/pocl/Makefile +++ b/lang/pocl/Makefile @@ -41,6 +41,6 @@ DOCS_DESC= Build documentation (needs sphinx) DOCS_CMAKE_OFF= -DENABLE_DOCS=OFF DOCS_CMAKE_ON= -DENABLE_DOCS=ON DOCS_USES= python -DOCS_BUILD_DEPENDS= ${PY_FLAVOR}-sphinx>0:textproc/py-sphinx@${PY_FLAVOR} +DOCS_BUILD_DEPENDS= ${PY_SPHINX} .include <bsd.port.mk> diff --git a/mail/py-afew/Makefile b/mail/py-afew/Makefile index 0a42cfc11aa8..3c975dd7fe2a 100644 --- a/mail/py-afew/Makefile +++ b/mail/py-afew/Makefile @@ -29,8 +29,8 @@ NO_ARCH= yes OPTIONS_DEFINE= MANPAGES DOCS OPTIONS_DEFAULT= MANPAGES -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} -MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} +DOCS_BUILD_DEPENDS= ${PY_SPHINX} +MANPAGES_BUILD_DEPENDS= ${PY_SPHINX} MANPAGES_PLIST_FILES= man/man1/afew.1.gz PORTDOCS= * diff --git a/math/ceres-solver/Makefile b/math/ceres-solver/Makefile index d4d8792ea840..8d4b4f8665ff 100644 --- a/math/ceres-solver/Makefile +++ b/math/ceres-solver/Makefile @@ -39,7 +39,7 @@ OPTIONS_GROUP_SPARSE= CXSPARSE EIGENSPARSE SUITESPARSE CUSTOM_BLAS_DESC= Handcoded BLAS routines instead of Eigen CUSTOM_BLAS_CMAKE_BOOL= CUSTOM_BLAS -DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx +DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx18 DOCS_USES= python:build DOCS_CMAKE_BOOL= BUILD_DOCUMENTATION diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile index 0816601a1006..7a1ee009cc92 100644 --- a/math/py-networkx/Makefile +++ b/math/py-networkx/Makefile @@ -15,7 +15,7 @@ LICENSE= BSD3CLAUSE RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}decorator>=4.1.0:devel/py-decorator@${PY_FLAVOR} -# ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py-sphinx@${PY_FLAVOR} \ +# ${PY_SPHINX} \ # ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils@${PY_FLAVOR} USES= python shebangfix zip diff --git a/net/ceph12/Makefile b/net/ceph12/Makefile index e58fa47380a2..af51a4e49811 100644 --- a/net/ceph12/Makefile +++ b/net/ceph12/Makefile @@ -19,7 +19,7 @@ ONLY_FOR_ARCHS= amd64 BUILD_DEPENDS= \ yasm:devel/yasm \ - ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} \ + ${PY_SPHINX} \ gperf:devel/gperf \ ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops LIB_DEPENDS= \ diff --git a/net/ceph13/Makefile b/net/ceph13/Makefile index b79967635c40..2e09dcb9b3ae 100644 --- a/net/ceph13/Makefile +++ b/net/ceph13/Makefile @@ -23,7 +23,7 @@ BUILD_DEPENDS= \ bash:shells/bash \ git:devel/git \ yasm:devel/yasm \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ + ${PY_SPHINX} \ gperf:devel/gperf \ ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops LIB_DEPENDS= \ diff --git a/net/ceph14/Makefile b/net/ceph14/Makefile index 3e3c6a626007..0b941c9f6f5b 100644 --- a/net/ceph14/Makefile +++ b/net/ceph14/Makefile @@ -22,7 +22,7 @@ BUILD_DEPENDS= \ git:devel/git \ gperf:devel/gperf \ yasm:devel/yasm \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ + ${PY_SPHINX} \ ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops \ ${LOCALBASE}/bin/ld:devel/binutils LIB_DEPENDS= \ diff --git a/net/frr5/Makefile b/net/frr5/Makefile index 8a594bc13cd9..1e449e675457 100644 --- a/net/frr5/Makefile +++ b/net/frr5/Makefile @@ -64,7 +64,8 @@ CONFIGURE_ARGS= --enable-user=frr \ --disable-nhrpd \ --disable-pimd -MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx +MANPAGES_BUILD_DEPENDS= ${PY_SPHINX} +MANPAGES_MAKE_ENV= SPHINXBUILD=sphinx-build-${PYTHON_VER} MANPAGES_CONFIGURE_OFF= --disable-doc SHELLACCESS_CONFIGURE_ENABLE= shell-access FPM_CONFIGURE_ENABLE= fpm diff --git a/net/frr6/Makefile b/net/frr6/Makefile index 49375224328a..5494fb978ffd 100644 --- a/net/frr6/Makefile +++ b/net/frr6/Makefile @@ -64,7 +64,8 @@ CONFIGURE_ARGS= --enable-user=frr \ --disable-nhrpd \ --disable-pimd -MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx +MANPAGES_BUILD_DEPENDS= ${PY_SPHINX} +MANPAGES_BINARY_ALIAS= sphinx-build=sphinx-build-${PYTHON_VER} MANPAGES_CONFIGURE_OFF= --disable-doc SHELLACCESS_CONFIGURE_ENABLE= shell-access FPM_CONFIGURE_ENABLE= fpm diff --git a/net/frr7/Makefile b/net/frr7/Makefile index a97c529a63e5..971967061b96 100644 --- a/net/frr7/Makefile +++ b/net/frr7/Makefile @@ -69,7 +69,7 @@ CONFIGURE_ARGS= --enable-user=frr \ --disable-vrrpd \ --with-vtysh-pager=cat -MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} +MANPAGES_BUILD_DEPENDS= ${PY_SPHINX} MANPAGES_CONFIGURE_OFF= --disable-doc CONFIGROLLBACKS_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 CONFIGROLLBACKS_CONFIGURE_ENABLE= config-rollbacks diff --git a/net/irrd/Makefile b/net/irrd/Makefile index 16bc5ff73e98..1482ea4b1083 100644 --- a/net/irrd/Makefile +++ b/net/irrd/Makefile @@ -46,7 +46,7 @@ USERS= ${PORTNAME} GROUPS= ${PORTNAME} OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} +DOCS_BUILD_DEPENDS= ${PY_SPHINX} PLIST_FILES= "@sample etc/${PORTNAME}${PKGNAMESUFFIX}.yaml.sample" NO_ARCH= yes diff --git a/net/py-gntp/Makefile b/net/py-gntp/Makefile index 3ff3dd842cd0..c738fb16c7af 100644 --- a/net/py-gntp/Makefile +++ b/net/py-gntp/Makefile @@ -25,7 +25,7 @@ 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 post-install-DOCS-on: diff --git a/net/py-zeep/Makefile b/net/py-zeep/Makefile index 2cfacead7401..e6674bf6fb37 100644 --- a/net/py-zeep/Makefile +++ b/net/py-zeep/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE MIT LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} +BUILD_DEPENDS= ${PY_SPHINX} 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} \ diff --git a/net/savvycan/Makefile b/net/savvycan/Makefile index 619dafcb275c..6715e3f8f832 100644 --- a/net/savvycan/Makefile +++ b/net/savvycan/Makefile @@ -10,7 +10,7 @@ COMMENT= CAN bus reverse engineering and capture tool LICENSE= MIT -BUILD_DEPENDS= sphinx-build:textproc/py-sphinx@${PY_FLAVOR} +BUILD_DEPENDS= ${PY_SPHINX} USES= compiler:c++11-lang gmake python:build qmake qt:5 USE_QT= buildtools_build core gui help printsupport serialbus \ diff --git a/science/code_saturne/Makefile b/science/code_saturne/Makefile index 363601cfa66c..9ae220ba7dd4 100644 --- a/science/code_saturne/Makefile +++ b/science/code_saturne/Makefile @@ -86,7 +86,7 @@ USE_TEX= tex:build BUILD_DEPENDS+= fig2dev:print/transfig \ doxygen:devel/doxygen \ dot:graphics/graphviz \ - sphinx-build-${PYTHON_VER}:textproc/py-sphinx@${PY_FLAVOR} + ${PY_SPHINX} BINARY_ALIAS+= sphinx-build=sphinx-build-${PYTHON_VER} ALL_TARGET= all pdf DOCS= AUTHORS ChangeLog README diff --git a/security/libscep/Makefile b/security/libscep/Makefile index 7b86381c51a5..312a085dc2e0 100644 --- a/security/libscep/Makefile +++ b/security/libscep/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/README.md BUILD_DEPENDS= check>=0.12.0:devel/check \ curl>=7.64:ftp/curl \ uriparser>=0.9.1:net/uriparser \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} + ${PY_SPHINX} RUN_DEPENDS= check>=0.12.0:devel/check \ curl>=7.64:ftp/curl \ uriparser>=0.9.1:net/uriparser diff --git a/security/py-certbot-dns-cloudflare/Makefile b/security/py-certbot-dns-cloudflare/Makefile index 4335c841dd72..092cb523dcbb 100644 --- a/security/py-certbot-dns-cloudflare/Makefile +++ b/security/py-certbot-dns-cloudflare/Makefile @@ -25,7 +25,7 @@ NO_ARCH= yes OPTIONS_DEFINE= DOCS -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} .include "${.CURDIR}/../py-acme/version.mk" diff --git a/security/py-certbot-dns-cloudxns/Makefile b/security/py-certbot-dns-cloudxns/Makefile index db32f7c52713..e6b1450f2bd1 100644 --- a/security/py-certbot-dns-cloudxns/Makefile +++ b/security/py-certbot-dns-cloudxns/Makefile @@ -25,7 +25,7 @@ NO_ARCH= yes OPTIONS_DEFINE= DOCS -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} .include "${.CURDIR}/../py-acme/version.mk" diff --git a/security/py-certbot-dns-digitalocean/Makefile b/security/py-certbot-dns-digitalocean/Makefile index 90bb01b59f0b..cfcb228f9532 100644 --- a/security/py-certbot-dns-digitalocean/Makefile +++ b/security/py-certbot-dns-digitalocean/Makefile @@ -26,7 +26,7 @@ NO_ARCH= yes OPTIONS_DEFINE= DOCS -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} .include "${.CURDIR}/../py-acme/version.mk" diff --git a/security/py-certbot-dns-dnsimple/Makefile b/security/py-certbot-dns-dnsimple/Makefile index f200c6edf495..75ed90e30151 100644 --- a/security/py-certbot-dns-dnsimple/Makefile +++ b/security/py-certbot-dns-dnsimple/Makefile @@ -25,7 +25,7 @@ NO_ARCH= yes OPTIONS_DEFINE= DOCS -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} .include "${.CURDIR}/../py-acme/version.mk" diff --git a/security/py-certbot-dns-dnsmadeeasy/Makefile b/security/py-certbot-dns-dnsmadeeasy/Makefile index f7e8c3c01aad..369166b0f348 100644 --- a/security/py-certbot-dns-dnsmadeeasy/Makefile +++ b/security/py-certbot-dns-dnsmadeeasy/Makefile @@ -25,7 +25,7 @@ NO_ARCH= yes OPTIONS_DEFINE= DOCS -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} .include "${.CURDIR}/../py-acme/version.mk" diff --git a/security/py-certbot-dns-gehirn/Makefile b/security/py-certbot-dns-gehirn/Makefile index 9caef3289f7f..431361e63abd 100644 --- a/security/py-certbot-dns-gehirn/Makefile +++ b/security/py-certbot-dns-gehirn/Makefile @@ -25,7 +25,7 @@ NO_ARCH= yes OPTIONS_DEFINE= DOCS -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} .include "${.CURDIR}/../py-acme/version.mk" diff --git a/security/py-certbot-dns-google/Makefile b/security/py-certbot-dns-google/Makefile index 321e06cdf288..7ee69c2ddf38 100644 --- a/security/py-certbot-dns-google/Makefile +++ b/security/py-certbot-dns-google/Makefile @@ -27,7 +27,7 @@ NO_ARCH= yes OPTIONS_DEFINE= DOCS -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} .include "${.CURDIR}/../py-acme/version.mk" diff --git a/security/py-certbot-dns-linode/Makefile b/security/py-certbot-dns-linode/Makefile index 3acf21cb6451..3a5c1920eca2 100644 --- a/security/py-certbot-dns-linode/Makefile +++ b/security/py-certbot-dns-linode/Makefile @@ -25,7 +25,7 @@ NO_ARCH= yes OPTIONS_DEFINE= DOCS -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} .include "${.CURDIR}/../py-acme/version.mk" diff --git a/security/py-certbot-dns-luadns/Makefile b/security/py-certbot-dns-luadns/Makefile index a9f0eeb8f246..a917dda53064 100644 --- a/security/py-certbot-dns-luadns/Makefile +++ b/security/py-certbot-dns-luadns/Makefile @@ -25,7 +25,7 @@ NO_ARCH= yes OPTIONS_DEFINE= DOCS -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} .include "${.CURDIR}/../py-acme/version.mk" diff --git a/security/py-certbot-dns-nsone/Makefile b/security/py-certbot-dns-nsone/Makefile index 42460f0b395d..0d88eccb02e3 100644 --- a/security/py-certbot-dns-nsone/Makefile +++ b/security/py-certbot-dns-nsone/Makefile @@ -25,7 +25,7 @@ NO_ARCH= yes OPTIONS_DEFINE= DOCS -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} .include "${.CURDIR}/../py-acme/version.mk" diff --git a/security/py-certbot-dns-ovh/Makefile b/security/py-certbot-dns-ovh/Makefile index 69d9ae76f16f..1dedd09bba97 100644 --- a/security/py-certbot-dns-ovh/Makefile +++ b/security/py-certbot-dns-ovh/Makefile @@ -25,7 +25,7 @@ NO_ARCH= yes OPTIONS_DEFINE= DOCS -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} .include "${.CURDIR}/../py-acme/version.mk" diff --git a/security/py-certbot-dns-rfc2136/Makefile b/security/py-certbot-dns-rfc2136/Makefile index d14a5bd2fdd7..dd704a4b415b 100644 --- a/security/py-certbot-dns-rfc2136/Makefile +++ b/security/py-certbot-dns-rfc2136/Makefile @@ -25,7 +25,7 @@ NO_ARCH= yes OPTIONS_DEFINE= DOCS -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} .include "${.CURDIR}/../py-acme/version.mk" diff --git a/security/py-certbot-dns-sakuracloud/Makefile b/security/py-certbot-dns-sakuracloud/Makefile index 790d0e15a105..1a64fae5f289 100644 --- a/security/py-certbot-dns-sakuracloud/Makefile +++ b/security/py-certbot-dns-sakuracloud/Makefile @@ -25,7 +25,7 @@ NO_ARCH= yes OPTIONS_DEFINE= DOCS -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} .include "${.CURDIR}/../py-acme/version.mk" diff --git a/security/py-certbot-nginx/Makefile b/security/py-certbot-nginx/Makefile index d791c9271ea8..8b1a7a397de6 100644 --- a/security/py-certbot-nginx/Makefile +++ b/security/py-certbot-nginx/Makefile @@ -26,7 +26,7 @@ NO_ARCH= yes OPTIONS_DEFINE= DOCS -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} post-patch: diff --git a/security/py-keystone/Makefile b/security/py-keystone/Makefile index 8099b316f649..aab1f03ad362 100644 --- a/security/py-keystone/Makefile +++ b/security/py-keystone/Makefile @@ -82,7 +82,7 @@ MONGODB_DESC= MongoDB support (used for messaging services) MYSQL_DESC= MySQL/MariaDB support PGSQL_DESC= PostgreSQL support -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.6.2:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ ${PYTHON_PKGNAMEPREFIX}openstackdocstheme>=1.18.1:textproc/py-openstackdocstheme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reno>=2.5.0:textproc/py-reno@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ldap>=2.4.20:net/py-ldap@${PY_FLAVOR} \ diff --git a/shells/fish/Makefile b/shells/fish/Makefile index 8f9077be1d57..ea0f0417e96b 100644 --- a/shells/fish/Makefile +++ b/shells/fish/Makefile @@ -36,11 +36,16 @@ MANPAGES_BUILD_DEPENDS+= sphinx-build:textproc/py-sphinx NLS_USES= gettext NLS_CMAKE_BOOL= WITH_GETTEXT +PORTDOCS= * + post-install: .for i in fish fish_indent fish_key_reader @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i} .endfor +post-stage-DOCS-on: + @${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo + post-stage-MANPAGES-off: @${RM} -rf ${STAGEDIR}${MANPREFIX}/man/man1 @${RM} -rf ${STAGEDIR}${DATADIR}/man diff --git a/shells/fish/pkg-plist b/shells/fish/pkg-plist index 0d38a5953ccc..55135f74f887 100644 --- a/shells/fish/pkg-plist +++ b/shells/fish/pkg-plist @@ -6,254 +6,6 @@ libdata/pkgconfig/fish.pc %%MANPAGES%%man/man1/fish.1.gz %%MANPAGES%%man/man1/fish_indent.1.gz %%MANPAGES%%man/man1/fish_key_reader.1.gz -%%PORTDOCS%%%%DOCSDIR%%/.buildinfo -%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/abbr.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/alias.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/and.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/argparse.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/begin.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/bg.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/bind.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/block.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/break.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/breakpoint.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/builtin.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/case.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/cd.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/cdh.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/command.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/commandline.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/complete.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/contains.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/continue.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/count.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/dirh.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/dirs.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/disown.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/echo.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/else.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/emit.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/end.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/eval.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/exec.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/exit.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/false.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/fg.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/fish.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/fish_breakpoint_prompt.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/fish_config.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/fish_git_prompt.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/fish_hg_prompt.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/fish_indent.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/fish_key_reader.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/fish_mode_prompt.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/fish_opt.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/fish_prompt.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/fish_right_prompt.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/fish_svn_prompt.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/fish_update_completions.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/fish_vcs_prompt.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/for.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/funced.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/funcsave.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/function.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/functions.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/help.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/history.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/if.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/isatty.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/jobs.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/math.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/nextd.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/not.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/open.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/or.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/popd.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/prevd.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/printf.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/prompt_pwd.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/psub.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/pushd.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/pwd.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/random.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/read.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/realpath.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/return.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/set.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/set_color.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/source.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/status.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/string-collect.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/string-escape.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/string-join.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/string-join0.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/string-length.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/string-lower.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/string-match.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/string-repeat.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/string-replace.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/string-split.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/string-split0.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/string-sub.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/string-trim.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/string-unescape.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/string-upper.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/string.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/suspend.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/switch.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/test.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/time.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/trap.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/true.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/type.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/ulimit.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/umask.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/vared.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/wait.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/cmds/while.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/commands.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/design.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/faq.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/index.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/license.rst.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/tutorial.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/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/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%%/cmds/abbr.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/alias.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/and.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/argparse.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/begin.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/bg.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/bind.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/block.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/break.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/breakpoint.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/builtin.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/case.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/cd.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/cdh.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/command.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/commandline.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/complete.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/contains.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/continue.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/count.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/dirh.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/dirs.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/disown.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/echo.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/else.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/emit.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/end.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/eval.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/exec.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/exit.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/false.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/fg.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/fish.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/fish_breakpoint_prompt.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/fish_config.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/fish_git_prompt.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/fish_hg_prompt.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/fish_indent.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/fish_key_reader.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/fish_mode_prompt.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/fish_opt.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/fish_prompt.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/fish_right_prompt.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/fish_svn_prompt.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/fish_update_completions.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/fish_vcs_prompt.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/for.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/funced.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/funcsave.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/function.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/functions.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/help.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/history.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/if.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/isatty.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/jobs.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/math.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/nextd.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/not.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/open.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/or.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/popd.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/prevd.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/printf.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/prompt_pwd.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/psub.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/pushd.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/pwd.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/random.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/read.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/realpath.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/return.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/set.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/set_color.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/source.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/status.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/string-collect.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/string-escape.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/string-join.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/string-join0.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/string-length.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/string-lower.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/string-match.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/string-repeat.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/string-replace.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/string-split.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/string-split0.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/string-sub.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/string-trim.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/string-unescape.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/string-upper.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/string.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/suspend.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/switch.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/test.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/time.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/trap.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/true.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/type.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/ulimit.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/umask.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/vared.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/wait.html -%%PORTDOCS%%%%DOCSDIR%%/cmds/while.html -%%PORTDOCS%%%%DOCSDIR%%/commands.html -%%PORTDOCS%%%%DOCSDIR%%/design.html -%%PORTDOCS%%%%DOCSDIR%%/faq.html -%%PORTDOCS%%%%DOCSDIR%%/genindex.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/license.html -%%PORTDOCS%%%%DOCSDIR%%/objects.inv -%%PORTDOCS%%%%DOCSDIR%%/search.html -%%PORTDOCS%%%%DOCSDIR%%/searchindex.js -%%PORTDOCS%%%%DOCSDIR%%/tutorial.html %%DATADIR%%/__fish_build_paths.fish %%DATADIR%%/completions/VBoxHeadless.fish %%DATADIR%%/completions/VBoxSDL.fish diff --git a/sysutils/py-pkginfo/Makefile b/sysutils/py-pkginfo/Makefile index 4bf93f777039..74ba730ea0fe 100644 --- a/sysutils/py-pkginfo/Makefile +++ b/sysutils/py-pkginfo/Makefile @@ -19,7 +19,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/sysutils/zrepl/Makefile b/sysutils/zrepl/Makefile index 4fdfd0202adf..f23666b16303 100644 --- a/sysutils/zrepl/Makefile +++ b/sysutils/zrepl/Makefile @@ -69,7 +69,7 @@ OPTIONS_DEFINE= EXAMPLES MANPAGES OPTIONS_DEFAULT= MANPAGES MANPAGES_USES= python:build -MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} +MANPAGES_BUILD_DEPENDS= ${PY_SPHINX} MANPAGES_PLIST_FILES= man/man1/zrepl.1.gz .include <bsd.port.pre.mk> diff --git a/textproc/Makefile b/textproc/Makefile index 9a33397ea1da..63a92f411ecf 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1351,6 +1351,7 @@ SUBDIR += py-snowballstemmer SUBDIR += py-sparqlwrapper SUBDIR += py-sphinx + SUBDIR += py-sphinx18 SUBDIR += py-sphinx-hieroglyph SUBDIR += py-sphinx-intl SUBDIR += py-sphinx-me diff --git a/textproc/py-cloud_sptheme/Makefile b/textproc/py-cloud_sptheme/Makefile index ddd0f77be17b..e7e89eb5f702 100644 --- a/textproc/py-cloud_sptheme/Makefile +++ b/textproc/py-cloud_sptheme/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.6:textproc/py-sphinx@${PY_FLAVOR} \ +RUN_DEPENDS= ${PY_SPHINX} \ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-fulltoc>=1.1:textproc/py-sphinxcontrib-fulltoc@${PY_FLAVOR} USES= python diff --git a/textproc/py-gfm/Makefile b/textproc/py-gfm/Makefile index 0876de19661c..8e03e982c973 100644 --- a/textproc/py-gfm/Makefile +++ b/textproc/py-gfm/Makefile @@ -24,7 +24,7 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+=build_sphinx diff --git a/textproc/py-m2r/Makefile b/textproc/py-m2r/Makefile index f387d6a7db6b..f117e5aa8089 100644 --- a/textproc/py-m2r/Makefile +++ b/textproc/py-m2r/Makefile @@ -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} \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} + ${PY_SPHINX} # Officially 2.7, 3.4, 3.5, and 3.6 USES= python diff --git a/textproc/py-numpydoc/Makefile b/textproc/py-numpydoc/Makefile index 2edc716bd28e..f1a4e7518ac7 100644 --- a/textproc/py-numpydoc/Makefile +++ b/textproc/py-numpydoc/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sphinx>=1.6.5:textproc/py-sphinx@${PY_FLAVOR} + ${PY_SPHINX} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} USES= python diff --git a/textproc/py-openstackdocstheme/Makefile b/textproc/py-openstackdocstheme/Makefile index ebac5007dab1..6bc956d57775 100644 --- a/textproc/py-openstackdocstheme/Makefile +++ b/textproc/py-openstackdocstheme/Makefile @@ -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} \ - ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}sphinx18>=0:textproc/py-sphinx18@${PY_FLAVOR} USES= python USE_PYTHON= distutils concurrent autoplist @@ -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= ${PYTHON_PKGNAMEPREFIX}sphinx18>=0:textproc/py-sphinx18@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dulwich>=0.15.0:devel/dulwich@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" diff --git a/textproc/py-os-api-ref/Makefile b/textproc/py-os-api-ref/Makefile index c2d04cb6d89f..cbd498ce7f52 100644 --- a/textproc/py-os-api-ref/Makefile +++ b/textproc/py-os-api-ref/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sphinx>=1.6.2:textproc/py-sphinx@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx18>=1.6.2:textproc/py-sphinx18@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openstackdocstheme>=1.6.2:textproc/py-openstackdocstheme@${PY_FLAVOR} USES= python diff --git a/textproc/py-recommonmark/Makefile b/textproc/py-recommonmark/Makefile index b9a9dd1f1f30..5030edca5262 100644 --- a/textproc/py-recommonmark/Makefile +++ b/textproc/py-recommonmark/Makefile @@ -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} \ - ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}sphinx18>=1.3.1:textproc/py-sphinx18@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils diff --git a/textproc/py-sphinx-hieroglyph/Makefile b/textproc/py-sphinx-hieroglyph/Makefile index b4d659f30d99..925e646e9c91 100644 --- a/textproc/py-sphinx-hieroglyph/Makefile +++ b/textproc/py-sphinx-hieroglyph/Makefile @@ -13,7 +13,7 @@ COMMENT= Sphinx extension which builds HTML presentations LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.4:textproc/py-sphinx@${PY_FLAVOR} +RUN_DEPENDS= ${PY_SPHINX} USE_GITHUB= yes GH_ACCOUNT= nyergler diff --git a/textproc/py-sphinx-intl/Makefile b/textproc/py-sphinx-intl/Makefile index b654ab2d49c9..421d613b081d 100644 --- a/textproc/py-sphinx-intl/Makefile +++ b/textproc/py-sphinx-intl/Makefile @@ -14,7 +14,7 @@ COMMENT= Sphinx-intl translation features LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${PY_FLAVOR} \ +RUN_DEPENDS= ${PY_SPHINX} \ ${PYTHON_PKGNAMEPREFIX}polib>=1.0.6:devel/py-polib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${PY_FLAVOR} diff --git a/textproc/py-sphinx-tabs/Makefile b/textproc/py-sphinx-tabs/Makefile index 671f5ebaf065..d8f73dc0815d 100644 --- a/textproc/py-sphinx-tabs/Makefile +++ b/textproc/py-sphinx-tabs/Makefile @@ -13,7 +13,7 @@ COMMENT= Tabbed views for Sphinx LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.4:textproc/py-sphinx@${PY_FLAVOR} +RUN_DEPENDS= ${PY_SPHINX} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile index f7cf7573f7b2..2c1b7b1c33dc 100644 --- a/textproc/py-sphinx/Makefile +++ b/textproc/py-sphinx/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= sphinx -PORTVERSION= 1.6.5 -PORTREVISION= 2 +PORTVERSION= 3.0.2 PORTEPOCH= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP @@ -20,29 +19,38 @@ COMMENT= Python documentation generator LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -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} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-applehelp>=0:textproc/py-sphinxcontrib-applehelp@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-devhelp>=0:textproc/py-sphinxcontrib-devhelp@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-jsmath>=0:textproc/py-sphinxcontrib-jsmath@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-htmlhelp>=0:textproc/py-sphinxcontrib-htmlhelp@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-serializinghtml>=0:textproc/py-sphinxcontrib-serializinghtml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-qthelp>=0:textproc/py-sphinxcontrib-qthelp@${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}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}docutils>=0.12:textproc/py-docutils@${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}Babel>=1.3:devel/py-babel@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}alabaster>=0.7<0.8:textproc/py-alabaster@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}imagesize>=0:graphics/py-imagesize@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.5.0:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ ${PY_TYPING} \ ${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} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}html5lib>=0:www/py-html5lib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}typed-ast>=0:devel/py-typed-ast@${PY_FLAVOR} \ + cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR} -USES= python +USES= python:3.5+ USE_PYTHON= autoplist distutils concurrent + +CONFLICTS_INSTALL= py*-sphinx18 + NO_ARCH= yes +do-test: + @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts= + .include <bsd.port.mk> diff --git a/textproc/py-sphinx/distinfo b/textproc/py-sphinx/distinfo index aba7d8c61bcf..600afa6acdbe 100644 --- a/textproc/py-sphinx/distinfo +++ b/textproc/py-sphinx/distinfo @@ -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 = 1587422431 +SHA256 (python/Sphinx-3.0.2.tar.gz) = d7c6e72c6aa229caf96af82f60a0d286a1521d42496c226fe37f5a75dcfe2941 +SIZE (python/Sphinx-3.0.2.tar.gz) = 5904185 diff --git a/textproc/py-sphinx/files/patch-sphinx_writers_html.py b/textproc/py-sphinx/files/patch-sphinx_writers_html.py deleted file mode 100644 index dd967c1f7018..000000000000 --- a/textproc/py-sphinx/files/patch-sphinx_writers_html.py +++ /dev/null @@ -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 diff --git a/textproc/py-sphinx18/Makefile b/textproc/py-sphinx18/Makefile new file mode 100644 index 000000000000..bb6443bf08d2 --- /dev/null +++ b/textproc/py-sphinx18/Makefile @@ -0,0 +1,56 @@ +# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org> +# $FreeBSD$ + +PORTNAME= sphinx +PORTVERSION= 1.8.5 +PORTEPOCH= 1 +CATEGORIES= textproc python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 18 +DISTNAME= Sphinx-${PORTVERSION} +DIST_SUBDIR= python + +# NOTE: before committing to this port, contact portmgr to arrange for an +# experimental ports run. Untested commits may be backed out at portmgr's +# discretion. +MAINTAINER= python@FreeBSD.org +COMMENT= Python documentation generator + +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +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.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}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<0.8:textproc/py-alabaster@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}snowballstemmer>=1.1:textproc/py-snowballstemmer@${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} \ + ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ + ${PY_TYPING} \ + ${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} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR} + +USES= python +USE_PYTHON= autoplist distutils concurrent + +CONFLICTS_INSTALL= py*-sphinx + +NO_ARCH= yes + +do-test: + @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts= + +.include <bsd.port.mk> diff --git a/textproc/py-sphinx18/distinfo b/textproc/py-sphinx18/distinfo new file mode 100644 index 000000000000..3eeb04054523 --- /dev/null +++ b/textproc/py-sphinx18/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1586700367 +SHA256 (python/Sphinx-1.8.5.tar.gz) = c7658aab75c920288a8cf6f09f244c6cfdae30d82d803ac1634d9f223a80ca08 +SIZE (python/Sphinx-1.8.5.tar.gz) = 5756582 diff --git a/textproc/py-sphinx18/pkg-descr b/textproc/py-sphinx18/pkg-descr new file mode 100644 index 000000000000..0a007dcb2993 --- /dev/null +++ b/textproc/py-sphinx18/pkg-descr @@ -0,0 +1,5 @@ +Sphinx is a tool that makes it easy to create intelligent and beautiful +documentation for Python projects, written by Georg Brandl and licensed +under the BSD license. + +WWW: https://www.sphinx-doc.org/ diff --git a/textproc/py-sphinx_numfig/Makefile b/textproc/py-sphinx_numfig/Makefile index dbfd2949578a..d761f57b4ab7 100644 --- a/textproc/py-sphinx_numfig/Makefile +++ b/textproc/py-sphinx_numfig/Makefile @@ -15,7 +15,7 @@ LICENSE= BSD3CLAUSE DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-08-15 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx@${PY_FLAVOR} +RUN_DEPENDS= ${PY_SPHINX} USES= python:2.7 tar:tgz USE_PYTHON= flavors diff --git a/textproc/py-sphinx_wikipedia/Makefile b/textproc/py-sphinx_wikipedia/Makefile index 4eabf9b1e748..9aa478022fb0 100644 --- a/textproc/py-sphinx_wikipedia/Makefile +++ b/textproc/py-sphinx_wikipedia/Makefile @@ -11,7 +11,7 @@ COMMENT= Sphinx extension which adds role to create links to Wikipedia articles LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx@${PY_FLAVOR} +RUN_DEPENDS= ${PY_SPHINX} USES= python USE_PYTHON= flavors diff --git a/textproc/py-sphinxcontrib-adadomain/Makefile b/textproc/py-sphinxcontrib-adadomain/Makefile index 4d828b153657..7a6b8e1a9ac1 100644 --- a/textproc/py-sphinxcontrib-adadomain/Makefile +++ b/textproc/py-sphinxcontrib-adadomain/Makefile @@ -13,7 +13,7 @@ COMMENT= Sphinx Adadomain Extension LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.0:textproc/py-sphinx@${PY_FLAVOR} +RUN_DEPENDS= ${PY_SPHINX} USES= python USE_PYTHON= autoplist concurrent distutils diff --git a/textproc/py-sphinxcontrib-bitbucket/Makefile b/textproc/py-sphinxcontrib-bitbucket/Makefile index bee7529967d4..e405b4ae64f9 100644 --- a/textproc/py-sphinxcontrib-bitbucket/Makefile +++ b/textproc/py-sphinxcontrib-bitbucket/Makefile @@ -14,7 +14,7 @@ COMMENT= Sphinx/BitBucket integration LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0.6:textproc/py-sphinx@${PY_FLAVOR} \ +RUN_DEPENDS= ${PY_SPHINX} \ ${PYTHON_PKGNAMEPREFIX}docutils>=0.6:textproc/py-docutils@${PY_FLAVOR} USES= python diff --git a/textproc/py-sphinxcontrib-fulltoc/Makefile b/textproc/py-sphinxcontrib-fulltoc/Makefile index ef5b390f7b2a..411840361529 100644 --- a/textproc/py-sphinxcontrib-fulltoc/Makefile +++ b/textproc/py-sphinxcontrib-fulltoc/Makefile @@ -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= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${PY_FLAVOR} +RUN_DEPENDS= ${PY_SPHINX} USES= python USE_PYTHON= distutils autoplist diff --git a/textproc/py-sphinxcontrib-httpdomain/Makefile b/textproc/py-sphinxcontrib-httpdomain/Makefile index 9770075a1090..0866282ba1e9 100644 --- a/textproc/py-sphinxcontrib-httpdomain/Makefile +++ b/textproc/py-sphinxcontrib-httpdomain/Makefile @@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= wg@FreeBSD.org COMMENT= Sphinx domain for HTTP APIs -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${PY_FLAVOR} +RUN_DEPENDS= ${PY_SPHINX} USES= python USE_PYTHON= distutils autoplist diff --git a/textproc/py-sphinxcontrib-newsfeed/Makefile b/textproc/py-sphinxcontrib-newsfeed/Makefile index 9760fa6d0f35..555517bcf36a 100644 --- a/textproc/py-sphinxcontrib-newsfeed/Makefile +++ b/textproc/py-sphinxcontrib-newsfeed/Makefile @@ -12,7 +12,7 @@ COMMENT= News Feed extension for Sphinx LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} +RUN_DEPENDS= ${PY_SPHINX} USES= python USE_PYTHON= distutils autoplist diff --git a/textproc/py-sphinxcontrib-programoutput/Makefile b/textproc/py-sphinxcontrib-programoutput/Makefile index 701159c44877..35a013a3866a 100644 --- a/textproc/py-sphinxcontrib-programoutput/Makefile +++ b/textproc/py-sphinxcontrib-programoutput/Makefile @@ -13,7 +13,7 @@ COMMENT= Sphinx extension to include program output LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.5:textproc/py-sphinx@${PY_FLAVOR} +RUN_DEPENDS= ${PY_SPHINX} USES= python USE_PYTHON= autoplist distutils 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.* diff --git a/x11-toolkits/gtkada/Makefile b/x11-toolkits/gtkada/Makefile index 030e5bee943a..c21042e01dad 100644 --- a/x11-toolkits/gtkada/Makefile +++ b/x11-toolkits/gtkada/Makefile @@ -34,7 +34,7 @@ OPTIONS_DEFINE= DOCS NLS EXAMPLES .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= sphinx-build-2.7:textproc/py-sphinx@py27 +BUILD_DEPENDS+= sphinx-build-2.7:textproc/py-sphinx18@py27 BINARY_ALIAS+= sphinx-build=sphinx-build-2.7 .endif diff --git a/x11/py-pyvirtualdisplay/Makefile b/x11/py-pyvirtualdisplay/Makefile index 7708005c81e8..55341ed5588f 100644 --- a/x11/py-pyvirtualdisplay/Makefile +++ b/x11/py-pyvirtualdisplay/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cog>=2.3:devel/py-cog@${PY_FLAVOR} \ ${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} \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ + ${PY_SPHINX} \ ${PY_PILLOW} \ xauth>0:x11/xauth |