diff --git a/devel/transient/Makefile b/devel/transient/Makefile index 9f6c490642a5..620206b89f1e 100644 --- a/devel/transient/Makefile +++ b/devel/transient/Makefile @@ -1,79 +1,87 @@ PORTNAME= transient DISTVERSIONPREFIX= v -DISTVERSION= 0.13.3 +DISTVERSION= 0.13.4 CATEGORIES= devel elisp +MASTER_SITES= https://raw.githubusercontent.com/magit/magit.vc/${_ASSETS_VER}/assets/:assets +DISTFILES= ${_ASSETS:@.a.@${.a.}:assets@} +DIST_SUBDIR= ${PORTNAME}-${DISTVERSION} +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= freebsd@dev.thsi.be COMMENT= Emacs key and popup interface for complex keybindings WWW= https://github.com/magit/transient LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -_BR_DEPENDS= compat.el>=30.1.0.0:misc/compat.el \ - cond-let>=0.2:devel/cond-let +_BR_DEPENDS= compat.el>=31.0.0.0:misc/compat.el \ + cond-let>=1.0.0:devel/cond-let BUILD_DEPENDS= ${_BR_DEPENDS} RUN_DEPENDS= ${_BR_DEPENDS} USES= emacs:build gmake + USE_GITHUB= yes GH_ACCOUNT= magit +MAKE_JOBS_UNSAFE= yes +ALL_TARGET= autoloads + CONFLICTS_INSTALL= transient-emacs_* NO_ARCH= yes PLIST_FILES= ${ELISPDIR}/transient-autoloads.el \ ${ELISPDIR}/transient.el -PORTDOCS= CHANGELOG README.org transient.html +PORTDOCS= CHANGELOG README.org transient.html ${_ASSETS:@.a.@assets/${.a.}@} ELISPDIR= ${EMACS_SITE_LISPDIR}/${PORTNAME} OPTIONS_DEFINE= DOCS INFO PDF OPTIONS_DEFAULT= INFO -PDF_DESC= Build and install PDF document +PDF_DESC= Build and install PDF documentation -DOCS_BUILD_DEPENDS= gsed:textproc/gsed DOCS_USES= makeinfo +DOCS_ALL_TARGET= html -INFO_BUILD_DEPENDS= gsed:textproc/gsed +INFO_ALL_TARGET= info INFO_INFO= transient -PDF_BUILD_DEPENDS= gsed:textproc/gsed \ - texi2pdf:print/texinfo +PDF_BUILD_DEPENDS= texi2pdf:print/texinfo PDF_USES= tex PDF_USE= TEX=dvipdfmx:build +PDF_ALL_TARGET= pdf PDF_PLIST_FILES= ${DOCSDIR}/transient.pdf -do-build: - cd ${WRKSRC}/lisp && ${MAKE_CMD} autoloads - -do-build-DOCS-on: - cd ${WRKSRC}/docs && SED=gsed ${MAKE_CMD} html - -do-build-INFO-on: - cd ${WRKSRC} && SED=gsed ${MAKE_CMD} info - -do-build-PDF-on: - cd ${WRKSRC}/docs && SED=gsed ${MAKE_CMD} pdf +_ASSETS= magit_alt1.ico \ + page.css \ + themes/black-on-white.css \ + themes/default-high-contrast.css \ + themes/default.css \ + themes/solarized-dark-xterm.css \ + js/simple-css-switch.js +_ASSETS_VER= 66bd1a1fa6a05e6905b556929516929d41b53784 # 2025-11-16 do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${ELISPDIR} ${INSTALL_DATA} ${WRKSRC}/lisp/*.el \ ${STAGEDIR}${PREFIX}/${ELISPDIR} do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR}/assets/js ${STAGEDIR}${DOCSDIR}/assets/themes ${INSTALL_DATA} ${WRKSRC}/README.org ${WRKSRC}/CHANGELOG \ ${WRKSRC}/docs/transient.html ${STAGEDIR}${DOCSDIR} +.for a in ${_ASSETS} + ${INSTALL_DATA} ${_DISTDIR}/${a} ${STAGEDIR}${DOCSDIR}/assets/${a} +.endfor do-install-INFO-on: ${INSTALL_DATA} ${WRKSRC}/docs/*.info \ ${STAGEDIR}${PREFIX}/${INFO_PATH} do-install-PDF-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/transient.pdf ${STAGEDIR}${DOCSDIR} .include diff --git a/devel/transient/distinfo b/devel/transient/distinfo index c27a355181cd..c2a577781dc4 100644 --- a/devel/transient/distinfo +++ b/devel/transient/distinfo @@ -1,3 +1,17 @@ -TIMESTAMP = 1778378959 -SHA256 (magit-transient-v0.13.3_GH0.tar.gz) = 0181028586a1fa43e60db0ed08adf6f8644070c9fc89613e86bb05a9b428fc2b -SIZE (magit-transient-v0.13.3_GH0.tar.gz) = 181826 +TIMESTAMP = 1780383761 +SHA256 (transient-0.13.4/magit_alt1.ico) = bfd043a6c84a901afe0664f9768891165203937cfe5cf136e89f229ae68acaea +SIZE (transient-0.13.4/magit_alt1.ico) = 318 +SHA256 (transient-0.13.4/page.css) = d0538e82dc8a42422e1739fbb911b5032b024f67246c808b331dbadf6285a20b +SIZE (transient-0.13.4/page.css) = 3245 +SHA256 (transient-0.13.4/themes/black-on-white.css) = f1c0f67329cc880ac44d1b0041f40396aee33f2ec9709001f926aebf14294409 +SIZE (transient-0.13.4/themes/black-on-white.css) = 274 +SHA256 (transient-0.13.4/themes/default-high-contrast.css) = 70b979977212f6ebcc5013d6b3874b7250da8023192844058dc2d58863768f0e +SIZE (transient-0.13.4/themes/default-high-contrast.css) = 529 +SHA256 (transient-0.13.4/themes/default.css) = 8cd4f7b0d868e3ca5dadf8684b627489d190d0381a0106c9d1987a5ab073a1cc +SIZE (transient-0.13.4/themes/default.css) = 529 +SHA256 (transient-0.13.4/themes/solarized-dark-xterm.css) = 25d6be3c195ec101ad32d76fa1672358901747b2c83cb0a027a5a439e34ea7d3 +SIZE (transient-0.13.4/themes/solarized-dark-xterm.css) = 1788 +SHA256 (transient-0.13.4/js/simple-css-switch.js) = ca9cacae8c9073aeae9626a41545e67fa5d51e753f28ab0f9f95ef80c94ae0b3 +SIZE (transient-0.13.4/js/simple-css-switch.js) = 1705 +SHA256 (transient-0.13.4/magit-transient-v0.13.4_GH0.tar.gz) = 9209ba0fdf8432e439d2476982670ed3ac46fba4ea8b400a9f14da966181c2b6 +SIZE (transient-0.13.4/magit-transient-v0.13.4_GH0.tar.gz) = 181869 diff --git a/devel/transient/files/patch-Makefile b/devel/transient/files/patch-Makefile new file mode 100644 index 000000000000..01ca2a2edb30 --- /dev/null +++ b/devel/transient/files/patch-Makefile @@ -0,0 +1,11 @@ +--- Makefile.orig 2026-05-07 15:21:42 UTC ++++ Makefile +@@ -27,6 +27,8 @@ lisp: + + lisp: + @$(MAKE) -C lisp lisp ++autoloads: ++ @$(MAKE) -C lisp autoloads + redo: + @$(MAKE) -C lisp clean lisp + diff --git a/devel/transient/files/patch-docs_Makefile b/devel/transient/files/patch-docs_Makefile index d1941a75f771..c5142ca0db3e 100644 --- a/devel/transient/files/patch-docs_Makefile +++ b/devel/transient/files/patch-docs_Makefile @@ -1,34 +1,56 @@ --- docs/Makefile.orig 2026-05-07 15:21:42 UTC +++ docs/Makefile @@ -29,7 +29,7 @@ _ := $(shell test "$(REVDESC)" = "$$(cat .revdesc 2 %.texi: %.org .orgconfig .revdesc @printf "Generating $@\n" @$(EMACS_ORG) $< $(ORG_EVAL) - @sed -e 's/“/``/g' -e "s/”/''/g" -e '$$a\' -ix $@ && rm $@x #' + @$(SED) -e 's/“/``/g' -e "s/”/''/g" -e '$$a\' -ix $@ && rm $@x #' %.info: %.texi @printf "Generating $@\n" -@@ -52,19 +52,19 @@ HTML_FIXUP_MENU = '/<\/body>/i
/dev/null + @texi2pdf $< > /dev/null DOCS_DOMAIN = docs.$(DOMAIN) STAT_DOMAIN = stats.$(DOMAIN)