From nobody Sat Oct 09 21:15:35 2021 X-Original-To: dev-commits-doc-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 D58CB17EE5E7 for ; Sat, 9 Oct 2021 21:15:35 +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 4HRdBb4g8Bz4jqn; Sat, 9 Oct 2021 21:15:35 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 80F7E20FE0; Sat, 9 Oct 2021 21:15:35 +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 199LFZGs031102; Sat, 9 Oct 2021 21:15:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 199LFZlX031101; Sat, 9 Oct 2021 21:15:35 GMT (envelope-from git) Date: Sat, 9 Oct 2021 21:15:35 GMT Message-Id: <202110092115.199LFZlX031101@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: "Danilo G. Baio" Subject: git: 151b473480 - main - documentation: Remove asciidoctor-pdf from default requirements List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-doc-all@freebsd.org X-BeenThere: dev-commits-doc-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dbaio X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 151b473480373cea7cdc1af86a1e7837976429a1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dbaio: URL: https://cgit.FreeBSD.org/doc/commit/?id=151b473480373cea7cdc1af86a1e7837976429a1 commit 151b473480373cea7cdc1af86a1e7837976429a1 Author: Danilo G. Baio AuthorDate: 2021-10-09 21:13:16 +0000 Commit: Danilo G. Baio CommitDate: 2021-10-09 21:13:16 +0000 documentation: Remove asciidoctor-pdf from default requirements With the current requirements, if textproc/docproj is built with PDF option disabled, you can't build the documentation. This fixes that, and now asciidoctor-pdf will be checked only when building PDF. Reported by: jhb --- documentation/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/documentation/Makefile b/documentation/Makefile index c8c4f4322d..44bb80fa28 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -52,7 +52,6 @@ RUBYLIB = ../shared/lib RUN_DEPENDS= ${PYTHON_CMD} \ ${HUGO_CMD} \ ${LOCALBASE}/bin/asciidoctor \ - ${LOCALBASE}/bin/asciidoctor-pdf \ ${LOCALBASE}/bin/rougify .ifndef HOSTNAME @@ -108,6 +107,12 @@ requirements: .endif .endfor +requirements-pdf: +.if !exists(${LOCALBASE}/bin/asciidoctor-pdf) + @(echo ${LOCALBASE}/bin/asciidoctor-pdf not found, please run 'pkg install rubygem-asciidoctor-pdf'; exit 1) +.endif + + starting-message: .PHONY @echo --------------------------------------------------------------- @echo Building the documentation @@ -169,7 +174,7 @@ TTMP += ${.CURDIR}/content/${_lang}/articles/*/ .endfor ARTICLESDIR != echo ${TTMP} -pdf-books: pdf-books-target generate-books-toc +pdf-books: requirements-pdf pdf-books-target generate-books-toc # Books build # @@ -213,7 +218,7 @@ pdf-books: pdf-books-target generate-books-toc .endif .endfor -pdf-articles: pdf-articles-target +pdf-articles: requirements-pdf pdf-articles-target # Articles build .for _curpdf in ${ARTICLESDIR}