From nobody Sat Jun 1 09:21:57 2024 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 4VrvdL120fz5MXw6; Sat, 01 Jun 2024 09:21:58 +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 4VrvdK6xTnz4lQx; Sat, 1 Jun 2024 09:21:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717233718; 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=p4cQvxew/nKppoMK06REl5muSbH3pb7kLtm0dIWtrKo=; b=bCeDLoofRartGE3oUEGgQma9y3YiP2o2gxTBeZ4UvK/w56k1XCueeurRkCyJrWMJJD6d2Y cxQSVSfqrOWZ0rnl+zu1VDlHbcSDsiCDZhSMb+eaoLf8OKaROWIA2WUI+Akm9gnpKNn2DP deubYuxVpWHAN8B7hGwY6wvbPw1N96UiHpYFM/gZT2Yo/7kN9zgDjO4KmhtitXEJyd3Th0 jnwKip8PxF02niHuLUKkS/YmK6fcE7cOVr+LTBlds3w1TZVcb8zPkham+pSLdsflfIxdxU oecWbGhlwduBhb1XXVtKkydbx0EpDrzasyphzLC6i679M/PdzYmAnEC65H1eIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717233718; a=rsa-sha256; cv=none; b=ymrTX9KYDm4JtbQfiXNaEPTJ8yqJNMqHd8NG3q70L90PcbLDmWam8NYEf/NWajbaBFz7xS LF0zDd13FwBZ+F3zyPqUHJZhDx4ozOmSTJaHb7UfxSv/8UMmd5LegTqX4GEiQztaxlDNPg hQxtM3QC9o+6pAKcEVgFNB4ci7V2Zyoa4XpuaVn333gcQk+I6UMhvax34hCrCy5Co5VJxe 4IHm0ZwwHN6ve5CK3pfKzjJDPFN66dT+H0qJwuh8Cgxhgdrs0vmlhrtM/04E9G24DbxCYc VSStkVZ0yCxSRrjh6YjXEUBzcf0nFEp0p9hvcXp0nhvmNMYoXX4zQdkA/eOVzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717233718; 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=p4cQvxew/nKppoMK06REl5muSbH3pb7kLtm0dIWtrKo=; b=jTuaEKihbbgbIt2iClx2CtKWH7tA4+pjozkGXyvFDufqI3METDwesVDkLo1ihC3coG3bFy f7Y6D0WNOo8vypL0cs/jpR/cfyoRLD/mKF3CFbpKDdCK+lxVBdfDm7R+gLaw+e8DmB++Xu HSpg1PEbglEVJSs24W563c8A9N6Rl4y0IJvkhQrTOr5ZX7dqLRzohQYDgRY4/h8Z1hMs0b C0d7iyMcfWhncqdpGW8kYuc0dJrRoMRKKrIfRsdZYvtR09M7EDs5VDoo85YvbVe5YsLOC0 lcnWhfMvclVmllobt8WqMpWF/nqxcvDMtMP0r/xJHk+avUgVb1HPUgpEKEeMew== 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 4VrvdK6PDbz12Zd; Sat, 1 Jun 2024 09:21:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4519Lvva070309; Sat, 1 Jun 2024 09:21:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4519LvmL070306; Sat, 1 Jun 2024 09:21:57 GMT (envelope-from git) Date: Sat, 1 Jun 2024 09:21:57 GMT Message-Id: <202406010921.4519LvmL070306@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 67bdba3a9a40 - main - */*: Fix build when PDF option is enabled 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 67bdba3a9a407094ef567f5b652c3a079602e3e6 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=67bdba3a9a407094ef567f5b652c3a079602e3e6 commit 67bdba3a9a407094ef567f5b652c3a079602e3e6 Author: Yasuhiro Kimura AuthorDate: 2024-06-01 09:21:01 +0000 Commit: Yasuhiro Kimura 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)/