Date: Mon, 20 Apr 2026 03:11:42 +0000 Message-ID: <69e5996e.257d8.6db6c536@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=895d30cebc9a3db035d89d49fd345378ca9872d3 commit 895d30cebc9a3db035d89d49fd345378ca9872d3 Author: Joseph Mingrone <jrm@FreeBSD.org> AuthorDate: 2026-04-19 22:30:28 +0000 Commit: Joseph Mingrone <jrm@FreeBSD.org> CommitDate: 2026-04-20 03:11:01 +0000 devel/ghub: Update to 5.1.0 Also, do not byte-compile Elisp since .elc files are no longer packaged. This means we can remove BUILD_DEPENDS and MAKE_JOBS_UNSAFE. Sponsored by: The FreeBSD Foundation --- devel/ghub/Makefile | 23 +++++++++++++---------- devel/ghub/distinfo | 6 +++--- devel/ghub/files/patch-default.mk | 11 +++++++++++ devel/ghub/files/patch-docs_Makefile | 22 ++++++++++++++++++---- 4 files changed, 45 insertions(+), 17 deletions(-) diff --git a/devel/ghub/Makefile b/devel/ghub/Makefile index ada73c2b0730..84257398ba38 100644 --- a/devel/ghub/Makefile +++ b/devel/ghub/Makefile @@ -1,7 +1,6 @@ PORTNAME= ghub DISTVERSIONPREFIX= v -DISTVERSION= 5.0.2 -PORTREVISION= 1 +DISTVERSION= 5.1.0 CATEGORIES= devel elisp MAINTAINER= jrm@FreeBSD.org @@ -11,20 +10,16 @@ WWW= https://github.com/magit/ghub LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= compat.el>=30.1.0.0:misc/compat.el \ - llama.el>=1.0:devel/llama.el \ - treepy.el>=0.1.2:devel/treepy.el RUN_DEPENDS= compat.el>=30.1.0.0:misc/compat.el \ + cond-let>0.2:devel/cond-let \ llama.el>=1.0:devel/llama.el \ - treepy.el>=0.1.2:devel/treepy.el + treepy.el>=0.1.3:devel/treepy.el USES= emacs:build gmake makeinfo USE_GITHUB= yes GH_ACCOUNT= magit MAKE_ARGS= LOAD_PATH=" -L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_SITE_LISPDIR}/compat -L ." -MAKE_JOBS_UNSAFE= yes -ALL_TARGET= lisp info CONFLICTS_INSTALL= ghub-emacs_* @@ -38,16 +33,24 @@ OPTIONS_DEFINE= DOCS PDF 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 PDF_PLIST_FILES= ${DOCSDIR}/ghub.pdf ELISP_FILES= ghub-autoloads.el ghub-graphql.el ghub-legacy.el ghub.el gsexp.el +do-build: + cd ${WRKSRC} && ${MAKE_CMD} info + cd ${WRKSRC}/lisp && ${MAKE_CMD} autoloads + +do-build-DOCS-on: + cd ${WRKSRC} && SED=gsed ${MAKE_CMD} html + +do-build-PDF-on: + cd ${WRKSRC} && ${MAKE_CMD} pdf + do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME} ${INSTALL_DATA} ${ELISP_FILES:C/^/${WRKSRC}\/lisp\//} \ diff --git a/devel/ghub/distinfo b/devel/ghub/distinfo index 91738582ffcc..6133f979bf40 100644 --- a/devel/ghub/distinfo +++ b/devel/ghub/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1762059817 -SHA256 (magit-ghub-v5.0.2_GH0.tar.gz) = 499293a512cb7cbaf0ec87064bc7d6ea9d4f6939bc560c2f6ef86300d33f1619 -SIZE (magit-ghub-v5.0.2_GH0.tar.gz) = 58558 +TIMESTAMP = 1776631551 +SHA256 (magit-ghub-v5.1.0_GH0.tar.gz) = 2107e9bb6cf6181728c122d2b93ad611903a6a82aaba0319771c0431c40ddbaf +SIZE (magit-ghub-v5.1.0_GH0.tar.gz) = 58949 diff --git a/devel/ghub/files/patch-default.mk b/devel/ghub/files/patch-default.mk new file mode 100644 index 000000000000..d0c9efb8da9a --- /dev/null +++ b/devel/ghub/files/patch-default.mk @@ -0,0 +1,11 @@ +--- default.mk.orig 2026-04-19 21:38:08 UTC ++++ default.mk +@@ -28,6 +28,8 @@ EMACS_ORG ?= $(EMACS) $(EMACS_Q_ARG) --batch $(EMACS + EMACS_BATCH ?= $(EMACS) $(EMACS_Q_ARG) --batch $(EMACS_ARGS) $(LOAD_PATH) + EMACS_ORG ?= $(EMACS) $(EMACS_Q_ARG) --batch $(EMACS_ARGS) $(ORG_LOAD_PATH) + ++SED ?= sed ++ + INSTALL_INFO ?= $(shell command -v ginstall-info || printf install-info) + MAKEINFO ?= makeinfo + MANUAL_HTML_ARGS ?= --css-ref https://magit.vc/assets/page.css diff --git a/devel/ghub/files/patch-docs_Makefile b/devel/ghub/files/patch-docs_Makefile index a086c34ccdf6..f10536fa03c6 100644 --- a/devel/ghub/files/patch-docs_Makefile +++ b/devel/ghub/files/patch-docs_Makefile @@ -1,11 +1,25 @@ ---- docs/Makefile.orig 2023-05-13 16:19:37 UTC +--- docs/Makefile.orig 2026-04-01 12:39:11 UTC +++ docs/Makefile -@@ -51,7 +51,7 @@ html-dir: $(PKG).texi +@@ -52,19 +52,19 @@ HTML_FIXUP_HREF = 's% href="\.\./\(.*\)_html/% href= + %.html: %.texi + @printf "Generating $@\n" + @$(MAKEINFO) --html --no-split $(MANUAL_HTML_ARGS) $< +- @sed -i -e $(HTML_FIXUP_CSS) -e $(HTML_FIXUP_ONLOAD) -e $(HTML_FIXUP_MENU) $@ ++ @$(SED) -i -e $(HTML_FIXUP_CSS) -e $(HTML_FIXUP_ONLOAD) -e $(HTML_FIXUP_MENU) $@ + + %/index.html: %.texi + @printf "Generating $(PKG)/*.html\n" + @rm -rf $(PKG) + @$(MAKEINFO) --html -o $(PKG)/ $(MANUAL_HTML_ARGS) $< + @for f in $$(find $(PKG) -name '*.html') ; do \ +- sed -i -e $(HTML_FIXUP_CSS) -e $(HTML_FIXUP_ONLOAD) -e $(HTML_FIXUP_MENU) -e $(HTML_FIXUP_HREF) $$f ; \ ++ $(SED) -i -e $(HTML_FIXUP_CSS) -e $(HTML_FIXUP_ONLOAD) -e $(HTML_FIXUP_MENU) -e $(HTML_FIXUP_HREF) $$f ; \ + done %.pdf: %.texi @printf "Generating $@\n" - @texi2pdf --clean $< > /dev/null + @texi2pdf $< > /dev/null - PUBLISH_PATH ?= /manual/ - RELEASE_PATH ?= /manual/$(VERSION)/ + DOCS_DOMAIN = docs.$(DOMAIN) + STAT_DOMAIN = stats.$(DOMAIN)home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69e5996e.257d8.6db6c536>