Date: Tue, 26 May 2020 21:21:27 +0000 (UTC) From: Nicola Vitale <nivit@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r536660 - in head/devel/py-pathtools: . files Message-ID: <202005262121.04QLLRm0080824@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nivit Date: Tue May 26 21:21:27 2020 New Revision: 536660 URL: https://svnweb.freebsd.org/changeset/ports/536660 Log: Fix build when DOCS option is off. The build failed if py-sphinx was not installed as it always ran post-build and post-install targets. This patch also moves OPTIONS_DEFINE further down (as suggested by portlint). PR: 246643 Submitted by: Robert Kruus <robert.kruus@utoronto.ca> Modified: head/devel/py-pathtools/Makefile head/devel/py-pathtools/files/patch-docs__source__conf.py Modified: head/devel/py-pathtools/Makefile ============================================================================== --- head/devel/py-pathtools/Makefile Tue May 26 21:21:17 2020 (r536659) +++ head/devel/py-pathtools/Makefile Tue May 26 21:21:27 2020 (r536660) @@ -12,21 +12,21 @@ COMMENT= File system general utilities for Python LICENSE= MIT -OPTIONS_DEFINE= DOCS - USES= python USE_PYTHON= distutils autoplist +OPTIONS_DEFINE= DOCS + DOCS_BUILD_DEPENDS= ${PY_SPHINX} DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} PORTDOCS= * -post-build: +post-build-DOCS-on: @(cd ${WRKSRC}/docs ; ${MAKE} SPHINXBUILD=sphinx-build-${PYTHON_VER} html) -post-install: +post-install-DOCS-on: @(cd ${WRKSRC}/docs/build/html ; ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \ "! -name .buildinfo -and ! -name objects.inv") Modified: head/devel/py-pathtools/files/patch-docs__source__conf.py ============================================================================== --- head/devel/py-pathtools/files/patch-docs__source__conf.py Tue May 26 21:21:17 2020 (r536659) +++ head/devel/py-pathtools/files/patch-docs__source__conf.py Tue May 26 21:21:27 2020 (r536660) @@ -1,6 +1,6 @@ ---- ./docs/source/conf.py.orig 2012-09-11 15:54:40.000000000 +0200 -+++ ./docs/source/conf.py 2012-09-11 15:54:44.000000000 +0200 -@@ -104,7 +104,7 @@ +--- docs/source/conf.py.orig 2011-08-25 09:25:25 UTC ++++ docs/source/conf.py +@@ -104,7 +104,7 @@ pygments_style = 'sphinx' # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005262121.04QLLRm0080824>