From 891e1d3e41ce0132c7a67e95717d2604ede029b0 Mon Sep 17 00:00:00 2001 From: Nicola Vitale Date: Wed, 14 Aug 2024 17:20:34 +0200 Subject: [PATCH] devel/py-virtualenv: Fix build caused by conflicting dependencies - Temporarly disable DOCS option due to the conflit between the docs build-dependency textproc/py-towncrier with textproc/py-towncrier23, which the other dependency py-sphinxcontrib-towncrier now depends on. I prefer to disable this option instead of changing the dependency to py-towncrier23 because a user may have already installed py-towncrier in the system for other reasons before updating. Other reference: https://github.com/sphinx-contrib/sphinxcontrib-towncrier/issues/92 - Bump PORTREVISION PR: 280687 --- devel/py-virtualenv/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/devel/py-virtualenv/Makefile b/devel/py-virtualenv/Makefile index 7f36b46ce6313..14ae2d969e663 100644 --- a/devel/py-virtualenv/Makefile +++ b/devel/py-virtualenv/Makefile @@ -1,5 +1,7 @@ PORTNAME= virtualenv +# Check XXX below before updating to see if that condition is still valid PORTVERSION= 20.26.3 +PORTREVISION= 1 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -45,8 +47,12 @@ TEST_ENV= PYTHONIOENCODING=utf-8 \ NO_ARCH= yes -OPTIONS_DEFINE= DOCS +# XXX: Temporarly disable DOCS option due to the issue reported at +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=280687 +# https://github.com/sphinx-contrib/sphinxcontrib-towncrier/issues/92 +#OPTIONS_DEFINE= DOCS +DOCS_BINARY_ALIAS= towncrier=towncrier-${PYTHON_VER} DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click-default-group>=1.2.4:devel/py-click-default-group@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}filelock>=3.12.2:sysutils/py-filelock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}furo>=2023.7.26:textproc/py-furo@${PY_FLAVOR} \ @@ -56,7 +62,6 @@ DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click-default-group>=1.2.4:devel/py-c ${PYTHON_PKGNAMEPREFIX}sphinx>=5.3.0:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-towncrier>=0.3.2a0:textproc/py-sphinxcontrib-towncrier@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}towncrier>=22.12.0:textproc/py-towncrier@${PY_FLAVOR} -DOCS_BINARY_ALIAS= towncrier=towncrier-${PYTHON_VER} DOCS_PLIST_FILES= share/man/man1/virtualenv.1.gz DOCS_PORTDOCS= * .buildinfo