git: faffa5c2807a - main - devel/magit: Update to 4.7.0
Joseph Mingrone <[email protected]> Sat, 01 Aug 2026 18:32:19 +0000
| Newsgroups | gmane.os.freebsd.devel.cvs.ports |
|---|---|
| Message-ID | <[email protected]> |
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=faffa5c2807ace442e53db4f7d298295f314705b commit faffa5c2807ace442e53db4f7d298295f314705b Author: Joseph Mingrone <[email protected]> AuthorDate: 2026-08-01 17:36:03 +0000 Commit: Joseph Mingrone <[email protected]> CommitDate: 2026-08-01 18:31:55 +0000 devel/magit: Update to 4.7.0 - Track upstream's replacement of docs/RelNotes/ with per-major-release docs/CHANGELOG.N files in PORTDOCS and the DOCS install - Fix the DOCS and PDF options. With the custom do-build target, DOCS_ALL_TARGET/PDF_ALL_TARGET never ran, so the HTML and PDF manuals were never built and staging failed. Build them explicitly in post-build-DOCS-on/post-build-PDF-on, under MAKE_ENV so the sed=gsed binary alias is on PATH. Changelog: https://github.com/magit/magit/blob/v4.7.0/docs/CHANGELOG.4#v470----2026-08-01 Sponsored by: The FreeBSD Foundation --- devel/magit/Makefile | 39 +++++++++++++++++++++------------------ devel/magit/distinfo | 6 +++--- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/devel/magit/Makefile b/devel/magit/Makefile index 6b49471a0a26..d42a24a3264b 100644 --- a/devel/magit/Makefile +++ b/devel/magit/Makefile @@ -1,7 +1,6 @@ PORTNAME= magit DISTVERSIONPREFIX= v -DISTVERSION= 4.5.0 -PORTREVISION= 1 +DISTVERSION= 4.7.0 CATEGORIES= devel elisp MAINTAINER= [email protected] @@ -11,18 +10,18 @@ WWW= https://magit.vc/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= compat.el>=30.1.0.0:misc/compat.el \ - cond-let>=0.1:devel/cond-let \ +BUILD_DEPENDS= compat.el>=31.0.0.0:misc/compat.el \ + cond-let>=1.1:devel/cond-let \ git:devel/git \ llama.el>=1.0.0:devel/llama.el \ - transient>=0.10.0:devel/transient \ - with-editor>=3.4.4:editors/with-editor -RUN_DEPENDS= compat.el>=30.1.0.0:misc/compat.el \ - cond-let>=0.1:devel/cond-let \ + transient>=0.13.0:devel/transient \ + with-editor>=3.5.0:editors/with-editor +RUN_DEPENDS= compat.el>=31.0.0.0:misc/compat.el \ + cond-let>=1.1:devel/cond-let \ git:devel/git \ llama.el>=1.0.0:devel/llama.el \ - transient>=0.10.0:devel/transient \ - with-editor>=3.4.4:editors/with-editor + transient>=0.13.0:devel/transient \ + with-editor>=3.5.0:editors/with-editor USES= emacs:build gmake makeinfo USE_GITHUB= yes @@ -44,7 +43,7 @@ NO_ARCH= yes INFO= magit magit-section PLIST_SUB+= ELISPDIR=${ELISPDIR} -PORTDOCS= *.html *.md RelNotes/* +PORTDOCS= *.html *.md CHANGELOG.* OPTIONS_DEFINE= DOCS PDF OPTIONS_SUB= yes @@ -52,18 +51,22 @@ OPTIONS_SUB= yes PDF_DESC= Build and install PDF document DOCS_BUILD_DEPENDS= gsed:textproc/gsed -DOCS_ALL_TARGET= html DOCS_BINARY_ALIAS= sed=gsed PDF_BUILD_DEPENDS= texi2pdf:print/texinfo PDF_USES= tex PDF_USE= TEX=dvipdfmx:build -PDF_ALL_TARGET= pdf ELISPDIR= ${EMACS_SITE_LISPDIR}/${PORTNAME} do-build: - ${GMAKE} -C ${WRKSRC}/lisp autoloads versionlib - ${GMAKE} -C ${WRKSRC}/docs info + ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC}/lisp autoloads versionlib + ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC}/docs info + +post-build-DOCS-on: + ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC}/docs html + +post-build-PDF-on: + ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC}/docs pdf do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${ELISPDIR} @@ -75,9 +78,9 @@ do-install: ${STAGEDIR}${PREFIX}/share/info do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR}/RelNotes - ${INSTALL_DATA} ${WRKSRC}/docs/*.md ${STAGEDIR}${DOCSDIR} - ${COPYTREE_SHARE} ${WRKSRC}/docs/RelNotes ${STAGEDIR}${DOCSDIR}/RelNotes + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/*.html ${WRKSRC}/docs/*.md \ + ${WRKSRC}/docs/CHANGELOG.* ${STAGEDIR}${DOCSDIR} do-install-PDF-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/devel/magit/distinfo b/devel/magit/distinfo index 253e553c5f58..64601b6e8a75 100644 --- a/devel/magit/distinfo +++ b/devel/magit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1771588788 -SHA256 (magit-magit-v4.5.0_GH0.tar.gz) = 8f99c6080fb9656606be1dc588b82d9756de1c7461375b0f24f83d0ac09ef413 -SIZE (magit-magit-v4.5.0_GH0.tar.gz) = 702733 +TIMESTAMP = 1785603054 +SHA256 (magit-magit-v4.7.0_GH0.tar.gz) = 9baddf75339eeccce22dae0cd59c43bbdfc0b2e5745422063858492f341ecb75 +SIZE (magit-magit-v4.7.0_GH0.tar.gz) = 717998