diff --git a/mail/mu/Makefile b/mail/mu/Makefile --- a/mail/mu/Makefile +++ b/mail/mu/Makefile @@ -1,7 +1,6 @@ PORTNAME= mu -PORTVERSION= 1.8.13 -PORTREVISION= 3 DISTVERSIONPREFIX= v +DISTVERSION= 1.10.9 CATEGORIES= mail MAINTAINER= hrs@FreeBSD.org @@ -12,36 +11,25 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libxapian.so:databases/xapian-core \ - libgmime-3.0.so:mail/gmime30 \ - libgc-threaded.so:devel/boehm-gc-threaded \ - libjson-glib-1.0.so:devel/json-glib + libgmime-3.0.so:mail/gmime30 +BUILD_DEPENDS= emacs:editors/emacs + +USES= meson compiler:c++17-lang gnome makeinfo pkgconfig readline -USES= autoreconf compiler:c++14-lang gettext-runtime gmake gnome \ - libtool makeinfo pkgconfig USE_GITHUB= yes GH_ACCOUNT= djcb -USE_GNOME= glib20 -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share -CONFIGURE_ARGS= --disable-mu4e -INSTALL_TARGET= install-strip +USE_GNOME= glib20 -OPTIONS_DEFINE= DOCS GUILE -OPTIONS_DEFAULT= DOCS GUILE +OPTIONS_DEFINE= DOCS GUILE MU4E +OPTIONS_DEFAULT= DOCS GUILE MU4E OPTIONS_SUB= yes GUILE_USES= guile:3.0 -GUILE_USE= ldconfig=yes -GUILE_CONFIGURE_ENABLE= guile +GUILE_MESON_ENABLED= guile GUILE_INFO= mu-guile -post-install: - cd ${FILESDIR} && ${INSTALL_SCRIPT} mu-ask \ - ${STAGEDIR}${PREFIX}/bin - -post-install-GUILE-on: - ${FIND} ${STAGEDIR}${PREFIX}/lib -name "*.so.*" -type f | \ - ${XARGS} ${STRIP_CMD} +MU4E_DESC= Install mu4e lisp files +MU4E_INFO= mu4e .include diff --git a/mail/mu/distinfo b/mail/mu/distinfo --- a/mail/mu/distinfo +++ b/mail/mu/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672749076 -SHA256 (djcb-mu-v1.8.13_GH0.tar.gz) = bb95143f6b153637c3d2551b81d82a04fea0227aa470df863abfa4e2b6474e7e -SIZE (djcb-mu-v1.8.13_GH0.tar.gz) = 734397 +TIMESTAMP = 1717637588 +SHA256 (djcb-mu-v1.10.9_GH0.tar.gz) = ca68192f66e7ec3ea39f748cd14b785fb451bc8be28fb9db87c95c5dce19a710 +SIZE (djcb-mu-v1.10.9_GH0.tar.gz) = 768442 diff --git a/mail/mu/files/mu-ask b/mail/mu/files/mu-ask deleted file mode 100644 --- a/mail/mu/files/mu-ask +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -read -p "Query: " query -exec mu find "$@" $query diff --git a/mail/mu/files/patch-configure.ac b/mail/mu/files/patch-configure.ac deleted file mode 100644 --- a/mail/mu/files/patch-configure.ac +++ /dev/null @@ -1,18 +0,0 @@ ---- configure.ac.orig 2022-12-06 08:23:41 UTC -+++ configure.ac -@@ -134,13 +134,13 @@ PKG_PROG_PKG_CONFIG(0.28) # latest version in buildroo - m4_ifndef([PKG_PROG_PKG_CONFIG], - [m4_fatal([please install pkg-config >= 0.28 before running autoconf/autogen])]) - PKG_PROG_PKG_CONFIG(0.28) # latest version in buildroot --AS_IF([test -z "$PKG_CONFIG"], -+AS_IF([test -z "$PKG_CONFIG"],[ - AC_MSG_ERROR([ - *** pkg-config with version >= 0.28 could not be found. - *** - *** Make sure it is in your path, or set the PKG_CONFIG environment variable - *** to the full path to pkg-config.]) --) -+]) - - # glib2? - PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.58 gobject-2.0 gio-2.0) diff --git a/mail/mu/files/patch-guile_meson.build b/mail/mu/files/patch-guile_meson.build new file mode 100644 --- /dev/null +++ b/mail/mu/files/patch-guile_meson.build @@ -0,0 +1,13 @@ +--- guile/meson.build.orig 2024-06-09 18:33:26 UTC ++++ guile/meson.build +@@ -87,10 +87,6 @@ if makeinfo.found() + '-o', join_paths(meson.current_build_dir(), 'mu-guile.info'), + join_paths(meson.current_source_dir(), 'mu-guile.texi'), + '-I', join_paths(meson.current_build_dir(), '..')]) +- if install_info.found() +- infodir = join_paths(get_option('prefix') / get_option('infodir')) +- meson.add_install_script(install_info_script, infodir, 'mu-guile.info') +- endif + endif + + guile_scm_dir=join_paths(datadir, 'guile', 'site', '3.0') diff --git a/mail/mu/files/patch-mu4e_meson.build b/mail/mu/files/patch-mu4e_meson.build new file mode 100644 --- /dev/null +++ b/mail/mu/files/patch-mu4e_meson.build @@ -0,0 +1,11 @@ +--- mu4e/meson.build.orig 2024-06-08 09:51:30 UTC ++++ mu4e/meson.build +@@ -130,8 +130,4 @@ if makeinfo.found() + '-o', join_paths(meson.current_build_dir(), 'mu4e.info'), + join_paths(meson.current_source_dir(), 'mu4e.texi'), + '-I', join_paths(meson.current_build_dir(), '..')]) +- if install_info.found() +- infodir = join_paths(get_option('prefix') / get_option('infodir')) +- meson.add_install_script(install_info_script, infodir, 'mu4e.info') +- endif + endif diff --git a/mail/mu/pkg-plist b/mail/mu/pkg-plist --- a/mail/mu/pkg-plist +++ b/mail/mu/pkg-plist @@ -1,16 +1,6 @@ bin/mu -bin/mu-ask -%%GUILE%%lib/libguile-mu.so -%%GUILE%%lib/libguile-mu.so.0 -%%GUILE%%lib/libguile-mu.so.0.0.0 -%%PORTDOCS%%%%DOCSDIR%%/NEWS.org -%%GUILE%%share/guile/site/3.0/mu.scm -%%GUILE%%share/guile/site/3.0/mu/plot.scm -%%GUILE%%share/guile/site/3.0/mu/script.scm -%%GUILE%%share/guile/site/3.0/mu/stats.scm share/man/man1/mu-add.1.gz share/man/man1/mu-cfind.1.gz -share/man/man1/mu-easy.1.gz share/man/man1/mu-extract.1.gz share/man/man1/mu-fields.1.gz share/man/man1/mu-find.1.gz @@ -20,17 +10,78 @@ share/man/man1/mu-init.1.gz share/man/man1/mu-mkdir.1.gz share/man/man1/mu-remove.1.gz -share/man/man1/mu-script.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 +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/NEWS.org +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/mu4e-about.org +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-actions.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-actions.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-bookmarks.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-bookmarks.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-compose.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-compose.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-config.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-contacts.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-contacts.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-context.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-context.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-contrib.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-contrib.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-draft.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-draft.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-folders.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-folders.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-headers.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-headers.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-helpers.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-helpers.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-icalendar.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-icalendar.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-lists.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-lists.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-main.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-main.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-mark.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-mark.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-message.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-message.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-modeline.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-modeline.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-notification.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-notification.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-obsolete.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-obsolete.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-org.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-org.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-query-items.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-query-items.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-search.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-search.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-server.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-server.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-speedbar.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-speedbar.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-update.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-update.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-vars.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-vars.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-view.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-view.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-window.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-window.elc +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e.el +%%MU4E%%share/emacs/site-lisp/mu4e/mu4e.elc +%%GUILE%%lib/guile/%%GUILE_VER%%/extensions/libguile-mu.so +%%GUILE%%%%GUILE_SITE%%/mu.scm +%%GUILE%%%%GUILE_SITE%%/mu/message.scm +%%GUILE%%%%GUILE_SITE%%/mu/plot.scm +%%GUILE%%%%GUILE_SITE%%/mu/script.scm +%%GUILE%%%%GUILE_SITE%%/mu/stats.scm %%GUILE%%%%DATADIR%%/scripts/find-dups.scm +%%GUILE%%%%DATADIR%%/scripts/histogram.scm %%GUILE%%%%DATADIR%%/scripts/msgs-count.scm -%%GUILE%%%%DATADIR%%/scripts/msgs-per-day.scm -%%GUILE%%%%DATADIR%%/scripts/msgs-per-hour.scm -%%GUILE%%%%DATADIR%%/scripts/msgs-per-month.scm -%%GUILE%%%%DATADIR%%/scripts/msgs-per-year.scm -%%GUILE%%%%DATADIR%%/scripts/msgs-per-year-month.scm