Date: Mon, 20 Apr 2026 03:11:45 +0000 From: Joseph Mingrone <jrm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f1af7dff74de - main - editors/with-editor: Update to 3.4.9 Message-ID: <69e59971.236e1.7440170f@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=f1af7dff74dee41974c922137701d5be9cb9f4bb commit f1af7dff74dee41974c922137701d5be9cb9f4bb Author: Joseph Mingrone <jrm@FreeBSD.org> AuthorDate: 2026-04-19 23:26:57 +0000 Commit: Joseph Mingrone <jrm@FreeBSD.org> CommitDate: 2026-04-20 03:11:02 +0000 editors/with-editor: Update to 3.4.9 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 --- editors/with-editor/Makefile | 21 +++++++++++---------- editors/with-editor/distinfo | 6 +++--- editors/with-editor/files/patch-default.mk | 11 +++++++++++ editors/with-editor/files/patch-docs_Makefile | 22 ++++++++++++++++++---- 4 files changed, 43 insertions(+), 17 deletions(-) diff --git a/editors/with-editor/Makefile b/editors/with-editor/Makefile index 810a1c7fa447..48b087a5ead6 100644 --- a/editors/with-editor/Makefile +++ b/editors/with-editor/Makefile @@ -1,7 +1,6 @@ PORTNAME= with-editor DISTVERSIONPREFIX= v -DISTVERSION= 3.4.8 -PORTREVISION= 1 +DISTVERSION= 3.4.9 CATEGORIES= editors elisp MAINTAINER= jrm@FreeBSD.org @@ -11,17 +10,12 @@ WWW= https://github.com/magit/with-editor LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= compat.el>=30.1.0.0:misc/compat.el RUN_DEPENDS= compat.el>=30.1.0.0:misc/compat.el USES= emacs:build gmake makeinfo USE_GITHUB= yes GH_ACCOUNT= magit -MAKE_ENV+= LOAD_PATH="-L ${PREFIX}/${EMACS_SITE_LISPDIR}/compat" -MAKE_JOBS_UNSAFE= yes -ALL_TARGET= lisp info - CONFLICTS_INSTALL= with-editor-devel-emacs* NO_ARCH= yes @@ -36,14 +30,21 @@ 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}/with-editor.pdf +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} ${INSTALL_DATA} ${WRKSRC}/lisp/*.el \ diff --git a/editors/with-editor/distinfo b/editors/with-editor/distinfo index 149ddb8bd653..612a646df26d 100644 --- a/editors/with-editor/distinfo +++ b/editors/with-editor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1771585756 -SHA256 (magit-with-editor-v3.4.8_GH0.tar.gz) = fc59dd5b44890b584516b405f6b258e3da7804f351a03027086ed6bcc2ba6257 -SIZE (magit-with-editor-v3.4.8_GH0.tar.gz) = 33836 +TIMESTAMP = 1776640173 +SHA256 (magit-with-editor-v3.4.9_GH0.tar.gz) = 47ee6519666d976b16d4624cf349e68e96447ebb20ddf0d5cbb36b51d13b7702 +SIZE (magit-with-editor-v3.4.9_GH0.tar.gz) = 33896 diff --git a/editors/with-editor/files/patch-default.mk b/editors/with-editor/files/patch-default.mk new file mode 100644 index 000000000000..19921e2adfdc --- /dev/null +++ b/editors/with-editor/files/patch-default.mk @@ -0,0 +1,11 @@ +--- default.mk.orig 2026-04-19 23:17:49 UTC ++++ default.mk +@@ -23,6 +23,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/editors/with-editor/files/patch-docs_Makefile b/editors/with-editor/files/patch-docs_Makefile index 58cd32ab2e17..e6cf4b450e83 100644 --- a/editors/with-editor/files/patch-docs_Makefile +++ b/editors/with-editor/files/patch-docs_Makefile @@ -1,11 +1,25 @@ ---- docs/Makefile.orig 2023-08-29 19:17:39 UTC +--- docs/Makefile.orig 2026-03-01 13:17:15 UTC +++ docs/Makefile -@@ -51,7 +51,7 @@ html-dir: $(PKG).texi +@@ -51,19 +51,19 @@ HTML_FIXUP_MENU = '/<\/body>/i<div id="s-css-s--menu + %.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) $$f ; \ ++ $(SED) -i -e $(HTML_FIXUP_CSS) -e $(HTML_FIXUP_ONLOAD) -e $(HTML_FIXUP_MENU) $$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?69e59971.236e1.7440170f>