Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 5 Jul 2022 10:09:55 GMT
From:      Dima Panov <fluffy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 93e60ca97e7f - 2022Q3 - www/py-django32: unbreak build for HTML docs (+)
Message-ID:  <202207051009.265A9tC2063843@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2022Q3 has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=93e60ca97e7f8e23095e53d1c6a3f7cd9dca402a

commit 93e60ca97e7f8e23095e53d1c6a3f7cd9dca402a
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2022-07-05 09:59:49 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2022-07-05 10:09:44 +0000

    www/py-django32: unbreak build for HTML docs (+)
    
    Same fix as 64b2298a6d98dfcc467c328b18293f558fa92c59 for Django40.
    
    Django require at least sphinx 4.5.0 to generate offline HTML docs.
    Set version check for dependency.
    
    Another issue is gmake-style construction in docs/Makefile.
    Force gmake usage for HTMLDOCS option to resolve build issue.
    
    Pointyhat to:   wen (for skipped dependencies chech)
    Approved by:    portmgr blanket (fix build)
    MFH:            2022Q3
    
    (cherry picked from commit bcc99a70b304f6d0047e227a39122d47b67c4668)
---
 www/py-django32/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/www/py-django32/Makefile b/www/py-django32/Makefile
index bb9be741baf6..f6c60b7e651f 100644
--- a/www/py-django32/Makefile
+++ b/www/py-django32/Makefile
@@ -47,14 +47,15 @@ OPTIONS_GROUP_DATABASE=	PGSQL MYSQL SQLITE
 OPTIONS_DEFAULT=SQLITE
 HTMLDOCS_DESC=	Install HTML documentation (requires Sphinx)
 
-HTMLDOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
+HTMLDOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=4.5.0,1:textproc/py-sphinx@${PY_FLAVOR}
 HTMLDOCS_IMPLIES=	DOCS
+HTMLDOCS_USES=		gmake
 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}
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
 post-build-HTMLDOCS-on:
-	cd ${WRKSRC}/docs && ${MAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER}
+	cd ${WRKSRC}/docs && ${GMAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER}
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${MAN1PREFIX}/man/man1



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207051009.265A9tC2063843>