Date: Sat, 1 Jun 2024 09:21:57 GMT From: Yasuhiro Kimura <yasu@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 67bdba3a9a40 - main - */*: Fix build when PDF option is enabled Message-ID: <202406010921.4519LvmL070306@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=67bdba3a9a407094ef567f5b652c3a079602e3e6 commit 67bdba3a9a407094ef567f5b652c3a079602e3e6 Author: Yasuhiro Kimura <yasu@FreeBSD.org> AuthorDate: 2024-06-01 09:21:01 +0000 Commit: Yasuhiro Kimura <yasu@FreeBSD.org> CommitDate: 2024-06-01 09:21:01 +0000 */*: Fix build when PDF option is enabled When PDF option is enabled PDF file is generated from Texinfo source file with texi2pdf, and the command is invoked with '--clear' option. When the command is invoked with the option, however, it returns non-zero value even if conversion is (or, at least seems to be) successful. As a result build of ports fails when the option is enabled. The command returns zero value if it is invoked without the option. So fix build by patching Makefile of source tree. While I'm here, replace CONFLICTS in devel/{forge,forge-devel/Makefile with CONFLICTS_INSTALL as neither of them interfere with build of the other. --- devel/forge-devel/Makefile | 3 +-- devel/forge-devel/files/patch-docs_Makefile | 11 +++++++++++ devel/forge/Makefile | 3 +-- devel/forge/files/patch-docs_Makefile | 11 +++++++++++ devel/ghub-devel/Makefile | 1 - devel/ghub-devel/files/patch-docs_Makefile | 11 +++++++++++ devel/ghub/Makefile | 1 - devel/ghub/files/patch-docs_Makefile | 11 +++++++++++ devel/magit-devel/Makefile | 1 - devel/magit-devel/files/patch-docs_Makefile | 11 +++++++++++ devel/magit/Makefile | 1 - devel/magit/files/patch-Documentation_Makefile | 11 +++++++++++ devel/transient-devel/Makefile | 1 - devel/transient-devel/files/patch-docs_Makefile | 11 +++++++++++ devel/transient/Makefile | 1 - devel/transient/files/patch-docs_Makefile | 11 +++++++++++ editors/with-editor-devel/Makefile | 1 - editors/with-editor-devel/files/patch-docs_Makefile | 11 +++++++++++ editors/with-editor/Makefile | 1 - editors/with-editor/files/patch-docs_Makefile | 11 +++++++++++ 20 files changed, 112 insertions(+), 12 deletions(-) diff --git a/devel/forge-devel/Makefile b/devel/forge-devel/Makefile index dc9762b055b6..54bd92cffdb8 100644 --- a/devel/forge-devel/Makefile +++ b/devel/forge-devel/Makefile @@ -41,7 +41,7 @@ MAKE_ENV+= INSTALL_INFO=install-info \ MAKE_JOBS_UNSAFE= yes ALL_TARGET= lisp info -CONFLICTS= forge-emacs* +CONFLICTS_INSTALL= forge-emacs* NO_ARCH= yes @@ -56,7 +56,6 @@ PDF_DESC= Build and install PDF document DOCS_BUILD_DEPENDS= gsed:textproc/gsed DOCS_ALL_TARGET= html DOCS_BINARY_ALIAS= sed=gsed -PDF_BROKEN= Does not build with texinfo PDF_BUILD_DEPENDS= texi2pdf:print/texinfo PDF_USES= tex PDF_USE= TEX=dvipdfmx:build diff --git a/devel/forge-devel/files/patch-docs_Makefile b/devel/forge-devel/files/patch-docs_Makefile new file mode 100644 index 000000000000..b123a9e81803 --- /dev/null +++ b/devel/forge-devel/files/patch-docs_Makefile @@ -0,0 +1,11 @@ +--- docs/Makefile.orig 2024-05-23 11:03:19 UTC ++++ docs/Makefile +@@ -49,7 +49,7 @@ html-dir: $(PKG).texi + + %.pdf: %.texi + @printf "Generating $@\n" +- @texi2pdf --clean $< > /dev/null ++ @texi2pdf $< > /dev/null + + PUBLISH_PATH ?= /manual/ + RELEASE_PATH ?= /manual/$(VERSION)/ diff --git a/devel/forge/Makefile b/devel/forge/Makefile index 484e8350c3b9..badeb89a95db 100644 --- a/devel/forge/Makefile +++ b/devel/forge/Makefile @@ -39,7 +39,7 @@ MAKE_ENV+= INSTALL_INFO=install-info \ MAKE_JOBS_UNSAFE= yes ALL_TARGET= lisp info -CONFLICTS= forge-devel* +CONFLICTS_INSTALL= forge-devel* NO_ARCH= yes @@ -54,7 +54,6 @@ PDF_DESC= Build and install PDF document DOCS_BUILD_DEPENDS= gsed:textproc/gsed DOCS_ALL_TARGET= html DOCS_BINARY_ALIAS= sed=gsed -PDF_BROKEN= Does not build with texinfo PDF_BUILD_DEPENDS= texi2pdf:print/texinfo PDF_USES= tex PDF_USE= TEX=dvipdfmx:build diff --git a/devel/forge/files/patch-docs_Makefile b/devel/forge/files/patch-docs_Makefile new file mode 100644 index 000000000000..aa21316d8c9d --- /dev/null +++ b/devel/forge/files/patch-docs_Makefile @@ -0,0 +1,11 @@ +--- docs/Makefile.orig 2022-03-07 17:47:08 UTC ++++ docs/Makefile +@@ -50,7 +50,7 @@ html-dir: $(PKG).texi + + %.pdf: %.texi + @printf "Generating $@\n" +- @texi2pdf --clean $< > /dev/null ++ @texi2pdf $< > /dev/null + + PUBLISH_PATH ?= /manual/ + RELEASE_PATH ?= /manual/$(VERSION)/ diff --git a/devel/ghub-devel/Makefile b/devel/ghub-devel/Makefile index 39e81bfd5a4a..a5d16626f406 100644 --- a/devel/ghub-devel/Makefile +++ b/devel/ghub-devel/Makefile @@ -39,7 +39,6 @@ PDF_DESC= Build and install PDF document DOCS_BUILD_DEPENDS= gsed:textproc/gsed DOCS_ALL_TARGET= html DOCS_BINARY_ALIAS= sed=gsed -PDF_BROKEN= Does not build with texinfo PDF_BUILD_DEPENDS= texi2pdf:print/texinfo PDF_USES= tex PDF_USE= TEX=dvipdfmx:build diff --git a/devel/ghub-devel/files/patch-docs_Makefile b/devel/ghub-devel/files/patch-docs_Makefile new file mode 100644 index 000000000000..57c1e9382ad6 --- /dev/null +++ b/devel/ghub-devel/files/patch-docs_Makefile @@ -0,0 +1,11 @@ +--- docs/Makefile.orig 2024-05-07 16:47:04 UTC ++++ docs/Makefile +@@ -49,7 +49,7 @@ html-dir: $(PKG).texi + + %.pdf: %.texi + @printf "Generating $@\n" +- @texi2pdf --clean $< > /dev/null ++ @texi2pdf $< > /dev/null + + PUBLISH_PATH ?= /manual/ + RELEASE_PATH ?= /manual/$(VERSION)/ diff --git a/devel/ghub/Makefile b/devel/ghub/Makefile index ed14b133b085..833b20097671 100644 --- a/devel/ghub/Makefile +++ b/devel/ghub/Makefile @@ -39,7 +39,6 @@ PDF_DESC= Build and install PDF document DOCS_BUILD_DEPENDS= gsed:textproc/gsed DOCS_ALL_TARGET= html DOCS_BINARY_ALIAS= sed=gsed -PDF_BROKEN= Does not build with texinfo PDF_BUILD_DEPENDS= texi2pdf:print/texinfo PDF_USES= tex PDF_USE= TEX=dvipdfmx:build diff --git a/devel/ghub/files/patch-docs_Makefile b/devel/ghub/files/patch-docs_Makefile new file mode 100644 index 000000000000..a086c34ccdf6 --- /dev/null +++ b/devel/ghub/files/patch-docs_Makefile @@ -0,0 +1,11 @@ +--- docs/Makefile.orig 2023-05-13 16:19:37 UTC ++++ docs/Makefile +@@ -51,7 +51,7 @@ html-dir: $(PKG).texi + + %.pdf: %.texi + @printf "Generating $@\n" +- @texi2pdf --clean $< > /dev/null ++ @texi2pdf $< > /dev/null + + PUBLISH_PATH ?= /manual/ + RELEASE_PATH ?= /manual/$(VERSION)/ diff --git a/devel/magit-devel/Makefile b/devel/magit-devel/Makefile index 8ea3ad6eb51b..7088592e28ae 100644 --- a/devel/magit-devel/Makefile +++ b/devel/magit-devel/Makefile @@ -57,7 +57,6 @@ LIBEGIT2_BUILD_DEPENDS_OFF= git:devel/git LIBEGIT2_RUN_DEPENDS= libegit2${EMACS_PKGNAMESUFFIX}>=g20200515:devel/libegit2@${EMACS_FLAVOR} LIBEGIT2_RUN_DEPENDS_OFF= git:devel/git LIBEGIT2_VARS= MAKE_ENV+=BUILD_MAGIT_LIBGIT=true -PDF_BROKEN= Does not build with texinfo PDF_BUILD_DEPENDS= texi2pdf:print/texinfo PDF_USES= tex PDF_USE= TEX=dvipdfmx:build diff --git a/devel/magit-devel/files/patch-docs_Makefile b/devel/magit-devel/files/patch-docs_Makefile new file mode 100644 index 000000000000..88cb117cede7 --- /dev/null +++ b/devel/magit-devel/files/patch-docs_Makefile @@ -0,0 +1,11 @@ +--- docs/Makefile.orig 2024-05-22 02:04:09 UTC ++++ docs/Makefile +@@ -51,7 +51,7 @@ html-dir: $(TEXIFILES) + + %.pdf: %.texi + @printf "Generating $@\n" +- @texi2pdf --clean $< > /dev/null ++ @texi2pdf $< > /dev/null + + %.epub: %.texi + @printf "Generating $@\n" diff --git a/devel/magit/Makefile b/devel/magit/Makefile index 894dab2194fd..0ff68a02c887 100644 --- a/devel/magit/Makefile +++ b/devel/magit/Makefile @@ -55,7 +55,6 @@ LIBEGIT2_BUILD_DEPENDS_OFF= git:devel/git LIBEGIT2_RUN_DEPENDS= libegit2${EMACS_PKGNAMESUFFIX}>=g20200515:devel/libegit2@${EMACS_FLAVOR} LIBEGIT2_RUN_DEPENDS_OFF= git:devel/git LIBEGIT2_VARS_OFF= MAKE_ENV+=BUILD_MAGIT_LIBGIT=false -PDF_BROKEN= Does not build with texinfo PDF_BUILD_DEPENDS= texi2pdf:print/texinfo PDF_USES= tex PDF_USE= TEX=dvipdfmx:build diff --git a/devel/magit/files/patch-Documentation_Makefile b/devel/magit/files/patch-Documentation_Makefile new file mode 100644 index 000000000000..f21a259c78d5 --- /dev/null +++ b/devel/magit/files/patch-Documentation_Makefile @@ -0,0 +1,11 @@ +--- Documentation/Makefile.orig 2021-10-04 19:55:06 UTC ++++ Documentation/Makefile +@@ -51,7 +51,7 @@ html-dir: $(TEXIFILES) + + %.pdf: %.texi + @printf "Generating $@\n" +- @texi2pdf --clean $< > /dev/null ++ @texi2pdf $< > /dev/null + + %.epub: %.texi + @printf "Generating $@\n" diff --git a/devel/transient-devel/Makefile b/devel/transient-devel/Makefile index 49e65905a42a..0f8def45cf9b 100644 --- a/devel/transient-devel/Makefile +++ b/devel/transient-devel/Makefile @@ -38,7 +38,6 @@ PDF_DESC= Build and install PDF document DOCS_BUILD_DEPENDS= gsed:textproc/gsed DOCS_ALL_TARGET= html DOCS_BINARY_ALIAS= sed=gsed -PDF_BROKEN= Does not build with texinfo PDF_BUILD_DEPENDS= texi2pdf:print/texinfo PDF_USES= tex PDF_USE= TEX=dvipdfmx:build diff --git a/devel/transient-devel/files/patch-docs_Makefile b/devel/transient-devel/files/patch-docs_Makefile new file mode 100644 index 000000000000..dd8f09133a8b --- /dev/null +++ b/devel/transient-devel/files/patch-docs_Makefile @@ -0,0 +1,11 @@ +--- docs/Makefile.orig 2024-05-25 11:18:38 UTC ++++ docs/Makefile +@@ -50,7 +50,7 @@ html-dir: $(PKG).texi + + %.pdf: %.texi + @printf "Generating $@\n" +- @texi2pdf --clean $< > /dev/null ++ @texi2pdf $< > /dev/null + + PUBLISH_PATH ?= /manual/ + RELEASE_PATH ?= /manual/$(VERSION)/ diff --git a/devel/transient/Makefile b/devel/transient/Makefile index 8b767e571999..78ec47fdb689 100644 --- a/devel/transient/Makefile +++ b/devel/transient/Makefile @@ -38,7 +38,6 @@ PDF_DESC= Build and install PDF document DOCS_BUILD_DEPENDS= gsed:textproc/gsed DOCS_ALL_TARGET= html DOCS_BINARY_ALIAS= sed=gsed -PDF_BROKEN= Does not build with texinfo PDF_BUILD_DEPENDS= texi2pdf:print/texinfo PDF_USES= tex PDF_USE= TEX=dvipdfmx:build diff --git a/devel/transient/files/patch-docs_Makefile b/devel/transient/files/patch-docs_Makefile new file mode 100644 index 000000000000..f202f214d89b --- /dev/null +++ b/devel/transient/files/patch-docs_Makefile @@ -0,0 +1,11 @@ +--- docs/Makefile.orig 2024-03-21 22:09:38 UTC ++++ docs/Makefile +@@ -50,7 +50,7 @@ html-dir: $(PKG).texi + + %.pdf: %.texi + @printf "Generating $@\n" +- @texi2pdf --clean $< > /dev/null ++ @texi2pdf $< > /dev/null + + PUBLISH_PATH ?= /manual/ + RELEASE_PATH ?= /manual/$(VERSION)/ diff --git a/editors/with-editor-devel/Makefile b/editors/with-editor-devel/Makefile index bf6012afcb0b..9ecf10ea9a24 100644 --- a/editors/with-editor-devel/Makefile +++ b/editors/with-editor-devel/Makefile @@ -40,7 +40,6 @@ PDF_DESC= Build and install PDF document DOCS_BUILD_DEPENDS= gsed:textproc/gsed DOCS_ALL_TARGET= html DOCS_BINARY_ALIAS= sed=gsed -PDF_BROKEN= Does not build with texinfo PDF_BUILD_DEPENDS= texi2pdf:print/texinfo PDF_USES= tex PDF_USE= TEX=dvipdfmx:build diff --git a/editors/with-editor-devel/files/patch-docs_Makefile b/editors/with-editor-devel/files/patch-docs_Makefile new file mode 100644 index 000000000000..505eabebdba6 --- /dev/null +++ b/editors/with-editor-devel/files/patch-docs_Makefile @@ -0,0 +1,11 @@ +--- docs/Makefile.orig 2024-04-15 15:58:56 UTC ++++ docs/Makefile +@@ -49,7 +49,7 @@ html-dir: $(PKG).texi + + %.pdf: %.texi + @printf "Generating $@\n" +- @texi2pdf --clean $< > /dev/null ++ @texi2pdf $< > /dev/null + + PUBLISH_PATH ?= /manual/ + RELEASE_PATH ?= /manual/$(VERSION)/ diff --git a/editors/with-editor/Makefile b/editors/with-editor/Makefile index 0221c35d5e3b..b9052a2ea3fa 100644 --- a/editors/with-editor/Makefile +++ b/editors/with-editor/Makefile @@ -40,7 +40,6 @@ PDF_DESC= Build and install PDF document DOCS_BUILD_DEPENDS= gsed:textproc/gsed DOCS_ALL_TARGET= html DOCS_BINARY_ALIAS= sed=gsed -PDF_BROKEN= Does not build with texinfo PDF_BUILD_DEPENDS= texi2pdf:print/texinfo PDF_USES= tex PDF_USE= TEX=dvipdfmx:build diff --git a/editors/with-editor/files/patch-docs_Makefile b/editors/with-editor/files/patch-docs_Makefile new file mode 100644 index 000000000000..58cd32ab2e17 --- /dev/null +++ b/editors/with-editor/files/patch-docs_Makefile @@ -0,0 +1,11 @@ +--- docs/Makefile.orig 2023-08-29 19:17:39 UTC ++++ docs/Makefile +@@ -51,7 +51,7 @@ html-dir: $(PKG).texi + + %.pdf: %.texi + @printf "Generating $@\n" +- @texi2pdf --clean $< > /dev/null ++ @texi2pdf $< > /dev/null + + PUBLISH_PATH ?= /manual/ + RELEASE_PATH ?= /manual/$(VERSION)/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406010921.4519LvmL070306>