From nobody Tue Jul 5 10:09:55 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 50C3E1D17F25; Tue, 5 Jul 2022 10:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LcdhN1hC1z4hTL; Tue, 5 Jul 2022 10:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657015796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S/cO99N6osbJR4L9NU0DB3uRKMQC/qtMazi5qOjy81Q=; b=pfZF6RnOnZWaLMjOXYE5nSAht/n/Q46+Mdsklr2EyPNhzQRZRc3WdVka4BiFeirCmuXc3c qIYKUL+Obgx4kA7LNPA3CDVlvsBqadd52YhsTs2g8pex4KQTy6Ft5k6BEWGE43EHBkPDjo nkxLFZ9rwZabXDhI4MIlCACU8cZa9KEUT72avVSqtmBm+cM1BlgpqMLgphT08i5SGjSs42 rj5Dw4YJCBRspreD1fxUrrJtzmBA7hE6EWiRshi1wPY8ii1II6bwfCvnLpQ+30qjb7U5bh GzAfoayWqZMpBVxhPmzk8JExDp1TPtY/imXpNsV78mTJX2tQZC2BypGNiv2ZIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 19DC32346D; Tue, 5 Jul 2022 10:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 265A9utN063844; Tue, 5 Jul 2022 10:09:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 265A9tC2063843; Tue, 5 Jul 2022 10:09:55 GMT (envelope-from git) Date: Tue, 5 Jul 2022 10:09:55 GMT Message-Id: <202207051009.265A9tC2063843@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dima Panov Subject: git: 93e60ca97e7f - 2022Q3 - www/py-django32: unbreak build for HTML docs (+) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 93e60ca97e7f8e23095e53d1c6a3f7cd9dca402a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657015796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S/cO99N6osbJR4L9NU0DB3uRKMQC/qtMazi5qOjy81Q=; b=ws9od0nvTeNjjJvo3rjyzDjHEgHMk/kTTLScXTIKfMK1S/BbAz29aVx42Z5iXEHLIrcNel 3PPefC5f4a4PNShjEgViH3V8QlFJ7KEI+JRgkvZbZEDJcwrFxKzQNuvVZHgSYiXkPZ7ubH ufG9tHjJnCazxfxBwuKsEIjJWlTDzdnarYbtXIw/Rp4NLYf2Rv43p4JzlJokXDWf4BrivX labJFf1FaOCnuHK9oo8eCjMM/MYMjLzBq8dgr8e1IPriRRkhx+USFN8wf1/qKhFF0aFbXP A2pJSKBOHr2WjAQbLaTrhO8chwg+47oP/+q5wvob1jXMq79jHKGVQPmsSih4LA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657015796; a=rsa-sha256; cv=none; b=DNDizbQwRxjhuCoXa1d87D6b98pGUJk9dgnWpJmJlHRBp8n4Ydgsjjk4G8qeR7HWFztD20 ueq/31i8XnCwUbBd/36SpP9vdhgmFl839J17hmo8pD4bTJO23kJtVgT3qCrrhtLupDh1i7 8JMuYuwAR0jDH+y2WZBWDgPBjcXM6MCxDd9HN/SKP5h6OueM+aGYqVaODkEhRXLXOgeOiz poq3gK5Rry0dwuSUaKTtS+JP144ZTegz6fNHmgdfJgjQ4ktxqQ6Mo66CRSxIwpNIZWWFBY b236hYi05C5YSW4+I2IqTAcwMg3nIWv1KN7dIami69Q4x+PmCSpHrXPRil5Rfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=93e60ca97e7f8e23095e53d1c6a3f7cd9dca402a commit 93e60ca97e7f8e23095e53d1c6a3f7cd9dca402a Author: Dima Panov AuthorDate: 2022-07-05 09:59:49 +0000 Commit: Dima Panov 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