Attachment #238385 for bug #268018




PORTNAME=	sphinx
PORTVERSION=	5.3.0
PORTEPOCH=	1
CATEGORIES=	textproc python
MASTER_SITES=	CHEESESHOP

LICENSE=	BSD2CLAUSE
LICENSE_FILE=	${WRKSRC}/LICENSE

BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit>=0:devel/py-flit@${PY_FLAVOR} \
		pyproject-build:devel/py-build@${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>=2.0.0:textproc/py-sphinxcontrib-htmlhelp@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-serializinghtml>=1.1.5:textproc/py-sphinxcontrib-serializinghtml@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-qthelp>=0:textproc/py-sphinxcontrib-qthelp@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0:devel/py-Jinja2@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}pygments>=2.12:textproc/py-pygments@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}docutils>=0.14,1<0.20,1:textproc/py-docutils@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}snowballstemmer>=2.0:textproc/py-snowballstemmer@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}Babel>=2.9:devel/py-babel@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}alabaster>=0.7<0.8:textproc/py-alabaster@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}imagesize>=1.3:graphics/py-imagesize@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}requests>=2.5.0:www/py-requests@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}packaging>=21.0:devel/py-packaging@${PY_FLAVOR} \
		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest4-cov>=0:devel/py-pytest4-cov@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}html5lib>=0:www/py-html5lib@${PY_FLAVOR} \

# Upstream archive contains files with UTF-8 names (#246618)
EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar

PYDISTUTILS_SETUP=	-c "import setuptools; setuptools.setup()"

CONFIGURE_ENV+=		FLIT_NO_NETWORK=true

CONFIGURE_WRKSRC=	${WRKDIR}/_build
BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
INSTALL_WRKSRC=		${CONFIGURE_WRKSRC}
TEST_WRKSRC=		${CONFIGURE_WRKSRC}
PYBUILD_OUTDIR=		${WRKDIR}/_pybuild

.include <bsd.port.pre.mk>

.if ${PYTHON_REL} < 31000

			test_defaults_json \
			test_anchors_ignored

post-patch:
	${REINPLACE_CMD} 's@%%VERSION%%@${PORTVERSION}@' ${WRKSRC}/pyproject.toml

## prepare sources, using flit via pybuild
pre-configure:
	@(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} pyproject-build --wheel --outdir ${PYBUILD_OUTDIR} --no-isolation)
	@(unzip -d ${CONFIGURE_WRKSRC} ${PYBUILD_OUTDIR}/${PYDISTUTILS_PKGNAME}-${PORTVERSION}-py${PYTHON_MAJOR_VER}-*.whl)

## ensure all sphinx resources are installed
post-install:
	@(cd ${INSTALL_WRKSRC}; ${COPYTREE_SHARE} . ${STAGEDIR}${PYTHON_SITELIBDIR})
	@(cd ${INSTALL_WRKSRC}; _TMPF=$$(${MKTEMP} ${WRKDIR}/.plist_tmp.XXXXXX); \
		cat ${_PYTHONPKGLIST} > $${_TMPF}; \
		find . -type f | sed 's@./@${PYTHON_SITELIBDIR}/@' >> $${_TMPF}; \
		${SORT} < $${_TMPF} | uniq > ${_PYTHONPKGLIST})

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)b/textproc/py-sphinx/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1654533273	1	TIMESTAMP = 1669461063
2	SHA256 (python/Sphinx-4.5.0.tar.gz) = 7bf8ca9637a4ee15af412d1a1d9689fec70523a68ca9bb9127c2f3eeb344e2e6	2	SHA256 (python/Sphinx-5.3.0.tar.gz) = 51026de0a9ff9fc13c05d74913ad66047e104f56a129ff73e174eb5c3ee794b5
3	SIZE (python/Sphinx-4.5.0.tar.gz) = 6698212	3	SIZE (python/Sphinx-5.3.0.tar.gz) = 6811365

Added Link Here

(-)b/textproc/py-sphinx/files/patch-pyproject.toml (+11 lines)
1	--- pyproject.toml.orig 2022-10-16 09:53:52 UTC
2	+++ pyproject.toml
3	@@ -75,7 +75,7 @@ dependencies = [
4	"importlib-metadata>=4.8; python_version < '3.10'",
5	"colorama>=0.4.5; sys_platform == 'win32'",
6	]
7	-dynamic = ["version"]
8	+version = "%%VERSION%%"
9
10	[project.optional-dependencies]
11	docs = [

Return to bug 268018

Lines 1-5 Link Here

(-)b/textproc/py-sphinx/Makefile (-8 / +36 lines)
1	PORTNAME= sphinx	1	PORTNAME= sphinx
2	PORTVERSION= 4.5.0	2	PORTVERSION= 5.3.0
3	PORTEPOCH= 1	3	PORTEPOCH= 1
4	CATEGORIES= textproc python	4	CATEGORIES= textproc python
5	MASTER_SITES= CHEESESHOP	5	MASTER_SITES= CHEESESHOP
Lines 17-37 WWW= https://www.sphinx-doc.org/ Link Here
17	LICENSE= BSD2CLAUSE	17	LICENSE= BSD2CLAUSE
18	LICENSE_FILE= ${WRKSRC}/LICENSE	18	LICENSE_FILE= ${WRKSRC}/LICENSE
19		19
		20	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flit>=0:devel/py-flit@${PY_FLAVOR} \
		21	pyproject-build:devel/py-build@${PY_FLAVOR}
20	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-applehelp>=0:textproc/py-sphinxcontrib-applehelp@${PY_FLAVOR} \	22	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-applehelp>=0:textproc/py-sphinxcontrib-applehelp@${PY_FLAVOR} \
21	${PYTHON_PKGNAMEPREFIX}sphinxcontrib-devhelp>=0:textproc/py-sphinxcontrib-devhelp@${PY_FLAVOR} \	23	${PYTHON_PKGNAMEPREFIX}sphinxcontrib-devhelp>=0:textproc/py-sphinxcontrib-devhelp@${PY_FLAVOR} \
22	${PYTHON_PKGNAMEPREFIX}sphinxcontrib-jsmath>=0:textproc/py-sphinxcontrib-jsmath@${PY_FLAVOR} \	24	${PYTHON_PKGNAMEPREFIX}sphinxcontrib-jsmath>=0:textproc/py-sphinxcontrib-jsmath@${PY_FLAVOR} \
23	${PYTHON_PKGNAMEPREFIX}sphinxcontrib-htmlhelp>=2.0.0:textproc/py-sphinxcontrib-htmlhelp@${PY_FLAVOR} \	25	${PYTHON_PKGNAMEPREFIX}sphinxcontrib-htmlhelp>=2.0.0:textproc/py-sphinxcontrib-htmlhelp@${PY_FLAVOR} \
24	${PYTHON_PKGNAMEPREFIX}sphinxcontrib-serializinghtml>=1.1.5:textproc/py-sphinxcontrib-serializinghtml@${PY_FLAVOR} \	26	${PYTHON_PKGNAMEPREFIX}sphinxcontrib-serializinghtml>=1.1.5:textproc/py-sphinxcontrib-serializinghtml@${PY_FLAVOR} \
25	${PYTHON_PKGNAMEPREFIX}sphinxcontrib-qthelp>=0:textproc/py-sphinxcontrib-qthelp@${PY_FLAVOR} \	27	${PYTHON_PKGNAMEPREFIX}sphinxcontrib-qthelp>=0:textproc/py-sphinxcontrib-qthelp@${PY_FLAVOR} \
26	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${PY_FLAVOR} \	28	${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0:devel/py-Jinja2@${PY_FLAVOR} \
27	${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${PY_FLAVOR} \	29	${PYTHON_PKGNAMEPREFIX}pygments>=2.12:textproc/py-pygments@${PY_FLAVOR} \
28	${PYTHON_PKGNAMEPREFIX}docutils>=0.14<0.18,1:textproc/py-docutils@${PY_FLAVOR} \	30	${PYTHON_PKGNAMEPREFIX}docutils>=0.14,1<0.20,1:textproc/py-docutils@${PY_FLAVOR} \
29	${PYTHON_PKGNAMEPREFIX}snowballstemmer>=1.1:textproc/py-snowballstemmer@${PY_FLAVOR} \	31	${PYTHON_PKGNAMEPREFIX}snowballstemmer>=2.0:textproc/py-snowballstemmer@${PY_FLAVOR} \
30	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR} \	32	${PYTHON_PKGNAMEPREFIX}Babel>=2.9:devel/py-babel@${PY_FLAVOR} \
31	${PYTHON_PKGNAMEPREFIX}alabaster>=0.7<0.8:textproc/py-alabaster@${PY_FLAVOR} \	33	${PYTHON_PKGNAMEPREFIX}alabaster>=0.7<0.8:textproc/py-alabaster@${PY_FLAVOR} \
32	${PYTHON_PKGNAMEPREFIX}imagesize>=0:graphics/py-imagesize@${PY_FLAVOR} \	34	${PYTHON_PKGNAMEPREFIX}imagesize>=1.3:graphics/py-imagesize@${PY_FLAVOR} \
33	${PYTHON_PKGNAMEPREFIX}requests>=2.5.0:www/py-requests@${PY_FLAVOR} \	35	${PYTHON_PKGNAMEPREFIX}requests>=2.5.0:www/py-requests@${PY_FLAVOR} \
34	${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \	36	${PYTHON_PKGNAMEPREFIX}packaging>=21.0:devel/py-packaging@${PY_FLAVOR} \
35	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss	37	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
36	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4-cov>=0:devel/py-pytest4-cov@${PY_FLAVOR} \	38	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4-cov>=0:devel/py-pytest4-cov@${PY_FLAVOR} \
37	${PYTHON_PKGNAMEPREFIX}html5lib>=0:www/py-html5lib@${PY_FLAVOR} \	39	${PYTHON_PKGNAMEPREFIX}html5lib>=0:www/py-html5lib@${PY_FLAVOR} \
Lines 46-51 NO_ARCH= yes Link Here
46	# Upstream archive contains files with UTF-8 names (#246618)	48	# Upstream archive contains files with UTF-8 names (#246618)
47	EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar	49	EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
48		50
		51	PYDISTUTILS_SETUP= -c "import setuptools; setuptools.setup()"
		52
		53	CONFIGURE_ENV+= FLIT_NO_NETWORK=true
		54
		55	CONFIGURE_WRKSRC= ${WRKDIR}/_build
		56	BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
		57	INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}
		58	TEST_WRKSRC= ${CONFIGURE_WRKSRC}
		59	PYBUILD_OUTDIR= ${WRKDIR}/_pybuild
		60
49	.include <bsd.port.pre.mk>	61	.include <bsd.port.pre.mk>
50		62
51	.if ${PYTHON_REL} < 31000	63	.if ${PYTHON_REL} < 31000
Lines 58-61 PYTEST_BROKEN_TESTS= test_latex_images \ Link Here
58	test_defaults_json \	70	test_defaults_json \
59	test_anchors_ignored	71	test_anchors_ignored
60		72
		73	post-patch:
		74	${REINPLACE_CMD} 's@%%VERSION%%@${PORTVERSION}@' ${WRKSRC}/pyproject.toml
		75
		76	## prepare sources, using flit via pybuild
		77	pre-configure:
		78	@(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} pyproject-build --wheel --outdir ${PYBUILD_OUTDIR} --no-isolation)
		79	@(unzip -d ${CONFIGURE_WRKSRC} ${PYBUILD_OUTDIR}/${PYDISTUTILS_PKGNAME}-${PORTVERSION}-py${PYTHON_MAJOR_VER}-*.whl)
		80
		81	## ensure all sphinx resources are installed
		82	post-install:
		83	@(cd ${INSTALL_WRKSRC}; ${COPYTREE_SHARE} . ${STAGEDIR}${PYTHON_SITELIBDIR})
		84	@(cd ${INSTALL_WRKSRC}; _TMPF=$$(${MKTEMP} ${WRKDIR}/.plist_tmp.XXXXXX); \
		85	cat ${_PYTHONPKGLIST} > $${_TMPF}; \
		86	find . -type f \| sed 's@./@${PYTHON_SITELIBDIR}/@' >> $${_TMPF}; \
		87	${SORT} < $${_TMPF} \| uniq > ${_PYTHONPKGLIST})
		88
61	.include <bsd.port.post.mk>	89	.include <bsd.port.post.mk>