git: f2ae0881f042 - main - mail/mu: Improve port and fix compatibility with (lib)fmt 12

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Daniel Engberg <diizzy_at_FreeBSD.org>
Date: Mon, 03 Nov 2025 20:28:59 UTC
The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f2ae0881f042b2e348487c42ce657b0929f37d54

commit f2ae0881f042b2e348487c42ce657b0929f37d54
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2025-11-03 20:03:36 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2025-11-03 20:28:05 +0000

    mail/mu: Improve port and fix compatibility with (lib)fmt 12
    
    * Switch to upstream release archive
    * Backport upstream patch 0a4fabbf446d15b538600dfe7d879cad70ce941e
      for comptibility with (lib)fmt 12
    * Make MANPAGES optional (removes build dependency of emacs)
    * Drop info files to simplify port
    * Define SHEBANG_FILES as we're only patching a single file
    * Sort options and related variables in port Makefile
    
    References:
    https://github.com/djcb/mu/commit/0a4fabbf446d15b538600dfe7d879cad70ce941e
    
    PR:             290616
    Reviewed by:    RwN <rwn@mailo.com> (maintainer)
---
 mail/mu/Makefile  | 42 +++++++++++++++---------------------------
 mail/mu/distinfo  |  8 +++++---
 mail/mu/pkg-plist | 40 ++++++++++++++++++++--------------------
 3 files changed, 40 insertions(+), 50 deletions(-)

diff --git a/mail/mu/Makefile b/mail/mu/Makefile
index 992d05b6a3e9..8005d3e08766 100644
--- a/mail/mu/Makefile
+++ b/mail/mu/Makefile
@@ -1,7 +1,10 @@
 PORTNAME=	mu
-DISTVERSIONPREFIX=	v
 DISTVERSION=	1.12.13
 CATEGORIES=	mail
+MASTER_SITES=	https://github.com/djcb/${PORTNAME}/releases/download/v${DISTVERSION}/
+
+PATCH_SITES=	https://github.com/djcb/mu/commit/
+PATCHFILES=	0a4fabbf446d15b538600dfe7d879cad70ce941e.patch:-p1
 
 MAINTAINER=	rwn@mailo.com
 COMMENT=	Mail searching frontend for Xapian
@@ -10,46 +13,31 @@ WWW=		https://www.djcbsoftware.nl/code/mu/
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	emacs:editors/emacs@nox
-
 LIB_DEPENDS=	libxapian.so:databases/xapian-core \
 		libfmt.so:devel/libfmt \
 		libgmime-3.0.so:mail/gmime30
 
-USES=		meson compiler:c++17-lang gnome \
-		makeinfo pkgconfig \
-		readline shebangfix python:build
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	djcb
-
+USES=		compiler:c++17-lang gnome meson pkgconfig python:build \
+		readline shebangfix tar:xz
+SHEBANG_FILES=	build-aux/date.py
 USE_GNOME=	glib20
 
-SHEBANG_GLOB=	*.py
-
-OPTIONS_DEFINE=		DOCS MU4E GUILE CLD2
-OPTIONS_DEFAULT=	MU4E
+OPTIONS_DEFINE=		CLD2 DOCS GUILE MANPAGES MU4E
+OPTIONS_DEFAULT=	MANPAGES MU4E
 OPTIONS_SUB=		yes
 
-MU4E_DESC=		Install mu4e e-mail client for emacs
-GUILE_DESC=		Install guile support
 CLD2_DESC=		Install CL2 support
+GUILE_DESC=		Install guile support
+MU4E_DESC=		Install mu4e e-mail client for emacs
 
-MU4E_RUN_DEPENDS=	emacs:editors/emacs
-MU4E_INFO=		mu4e
+CLD2_LIB_DEPENDS=	libcld2.so:devel/cld2
+CLD2_MESON_ENABLED=	cld2
 
 GUILE_USES=		guile:3.0
 GUILE_MESON_ENABLED=	guile
-GUILE_INFO=		mu-guile mu-scm
 
-CLD2_MESON_ENABLED=	cld2
-CLD2_LIB_DEPENDS=	libcld2.so:devel/cld2
+MANPAGES_BUILD_DEPENDS=	emacs:editors/emacs@nox
 
-post-stage-GUILE-off:
-	${RM} ${STAGEDIR}${PREFIX}/share/info/mu-guile.info
-	${RM} ${STAGEDIR}${PREFIX}/share/info/mu-scm.info
-
-post-stage-MU4E-off:
-	${RM} ${STAGEDIR}${PREFIX}/share/info/mu4e.info
+MU4E_RUN_DEPENDS=	emacs:editors/emacs
 
 .include <bsd.port.mk>
diff --git a/mail/mu/distinfo b/mail/mu/distinfo
index 6a7cbb7b3b5b..06bf7dc8d329 100644
--- a/mail/mu/distinfo
+++ b/mail/mu/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1757779184
-SHA256 (djcb-mu-v1.12.13_GH0.tar.gz) = bc7c4dc1a3c86498efcbc9d61b4ff8c38630153c4a8f7e3af39c7f03c1c049bc
-SIZE (djcb-mu-v1.12.13_GH0.tar.gz) = 1033829
+TIMESTAMP = 1761521692
+SHA256 (mu-1.12.13.tar.xz) = 7908078c5cc90afc7c038d4372b33b404f7fddfe466a27994413dc06f993a445
+SIZE (mu-1.12.13.tar.xz) = 775148
+SHA256 (0a4fabbf446d15b538600dfe7d879cad70ce941e.patch) = 24b385afcc508550e6edb745c03d320c2de37905128b15da348455814b2a7327
+SIZE (0a4fabbf446d15b538600dfe7d879cad70ce941e.patch) = 931
diff --git a/mail/mu/pkg-plist b/mail/mu/pkg-plist
index 9163be007e4f..c1de3dc2ec5c 100644
--- a/mail/mu/pkg-plist
+++ b/mail/mu/pkg-plist
@@ -1,24 +1,24 @@
 bin/mu
-share/man/man1/mu-add.1.gz
-share/man/man1/mu-cfind.1.gz
-share/man/man1/mu-extract.1.gz
-share/man/man1/mu-find.1.gz
-share/man/man1/mu-help.1.gz
-share/man/man1/mu-index.1.gz
-share/man/man1/mu-info.1.gz
-share/man/man1/mu-init.1.gz
-share/man/man1/mu-labels.1.gz
-share/man/man1/mu-mkdir.1.gz
-share/man/man1/mu-move.1.gz
-share/man/man1/mu-remove.1.gz
-share/man/man1/mu-scm.1.gz
-share/man/man1/mu-server.1.gz
-share/man/man1/mu-verify.1.gz
-share/man/man1/mu-view.1.gz
-share/man/man1/mu.1.gz
-share/man/man5/mu-bookmarks.5.gz
-share/man/man7/mu-easy.7.gz
-share/man/man7/mu-query.7.gz
+%%MANPAGES%%share/man/man1/mu-add.1.gz
+%%MANPAGES%%share/man/man1/mu-cfind.1.gz
+%%MANPAGES%%share/man/man1/mu-extract.1.gz
+%%MANPAGES%%share/man/man1/mu-find.1.gz
+%%MANPAGES%%share/man/man1/mu-help.1.gz
+%%MANPAGES%%share/man/man1/mu-index.1.gz
+%%MANPAGES%%share/man/man1/mu-info.1.gz
+%%MANPAGES%%share/man/man1/mu-init.1.gz
+%%MANPAGES%%share/man/man1/mu-labels.1.gz
+%%MANPAGES%%share/man/man1/mu-mkdir.1.gz
+%%MANPAGES%%share/man/man1/mu-move.1.gz
+%%MANPAGES%%share/man/man1/mu-remove.1.gz
+%%MANPAGES%%share/man/man1/mu-scm.1.gz
+%%MANPAGES%%share/man/man1/mu-server.1.gz
+%%MANPAGES%%share/man/man1/mu-verify.1.gz
+%%MANPAGES%%share/man/man1/mu-view.1.gz
+%%MANPAGES%%share/man/man1/mu.1.gz
+%%MANPAGES%%share/man/man5/mu-bookmarks.5.gz
+%%MANPAGES%%share/man/man7/mu-easy.7.gz
+%%MANPAGES%%share/man/man7/mu-query.7.gz
 %%PORTDOCS%%%%DOCSDIR%%/IDEAS.org
 %%PORTDOCS%%%%DOCSDIR%%/NEWS.org
 %%PORTDOCS%%%%DOCSDIR%%/mu4e-about.org