Page MenuHomeFreeBSD
Files F108587504

D46961.diff
No OneTemporary
Actions

D46961.diff
View Options

diff --git a/MOVED b/MOVED
--- a/MOVED
+++ b/MOVED
@@ -23,6 +23,7 @@
# This file can be linted with Tools/scripts/MOVEDlint.awk
#
# Port|Moved to|Date|Why
+mail/mu4e||2024-12-28|Becomes integrated as an option to its backend port mail/mu
www/wt3|www/wt|2021-01-03|Has expired: Upstream end of life, switch to www/wt instead
archivers/ecm|archivers/cmdpack|2021-01-04|ECM is now included in cmdpack
math/qhull5|math/qhull|2021-01-04|Has expired: Legacy version of port no longer required by math/octave
diff --git a/mail/mu/Makefile b/mail/mu/Makefile
--- a/mail/mu/Makefile
+++ b/mail/mu/Makefile
@@ -1,47 +1,52 @@
PORTNAME= mu
-PORTVERSION= 1.8.13
-PORTREVISION= 3
DISTVERSIONPREFIX= v
+DISTVERSION= 1.12.8
CATEGORIES= mail
-MAINTAINER= hrs@FreeBSD.org
+MAINTAINER= rwn@mailo.com
COMMENT= Mail searching frontend for Xapian
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 \
- 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
-USES= autoreconf compiler:c++14-lang gettext-runtime gmake gnome \
- libtool makeinfo pkgconfig
+USES= meson compiler:c++17-lang gnome pkgconfig makeinfo shebangfix python:3.8+
USE_GITHUB= yes
GH_ACCOUNT= djcb
USE_GNOME= glib20
+USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
-CONFIGURE_ARGS= --disable-mu4e
-INSTALL_TARGET= install-strip
+SHEBANG_GLOB= *.py
-OPTIONS_DEFINE= DOCS GUILE
-OPTIONS_DEFAULT= DOCS GUILE
+OPTIONS_DEFINE= DOCS GUILE MU4E READLINE CLD2 TESTS
+OPTIONS_DEFAULT= DOCS GUILE MU4E READLINE CLD2
OPTIONS_SUB= yes
+CLD2_DESC= Compact Language Detector2
+GUILE_DESC= Guile support
+MU4E_DESC= Install mu4e lisp files
+READLINE_DESC= Enable readline support for the mu4e repl
+TESTS_DESC= Build unit tests
+
+CLD2_LIB_DEPENDS= libcld2.so:devel/cld2
+CLD2_MESON_ENABLED= cld2
+
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
+MU4E_INFO= mu4e
+
+READLINE_USES= readline
+READLINE_MESON_ENABLED= readline
+
+TESTS_MESON_ENABLED= tests
-post-install-GUILE-on:
- ${FIND} ${STAGEDIR}${PREFIX}/lib -name "*.so.*" -type f | \
- ${XARGS} ${STRIP_CMD}
+post-stage-MU4E-off:
+ ${RM} ${STAGEDIR}${PREFIX}/share/info/mu4e.info
.include <bsd.port.mk>
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 = 1735348597
+SHA256 (djcb-mu-v1.12.8_GH0.tar.gz) = bdb6fbeb8870aa422671fa0144d699900492a6f575c77fb5a7d60ac744214c27
+SIZE (djcb-mu-v1.12.8_GH0.tar.gz) = 974946
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-lib_utils_mu-lang-detector.cc b/mail/mu/files/patch-lib_utils_mu-lang-detector.cc
new file mode 100644
--- /dev/null
+++ b/mail/mu/files/patch-lib_utils_mu-lang-detector.cc
@@ -0,0 +1,13 @@
+--- lib/utils/mu-lang-detector.cc.orig 2024-10-05 11:34:05 UTC
++++ lib/utils/mu-lang-detector.cc
+@@ -25,8 +25,8 @@ Option<Language> Mu::detect_language(const std::string
+ // Dummy implementation
+ Option<Language> Mu::detect_language(const std::string& txt) { return Nothing; }
+ #else
+-#include <cld2/public/compact_lang_det.h>
+-#include <cld2/public/encodings.h>
++#include <cld/public/compact_lang_det.h>
++#include <cld/public/encodings.h>
+
+ Option<Language>
+ Mu::detect_language(const std::string& txt)
diff --git a/mail/mu/pkg-plist b/mail/mu/pkg-plist
--- a/mail/mu/pkg-plist
+++ b/mail/mu/pkg-plist
@@ -1,36 +1,93 @@
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
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-mkdir.1.gz
+share/man/man1/mu-move.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
+%%PORTDOCS%%%%DOCSDIR%%/NEWS.org
+%%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-autoloads.el
+%%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-mime-parts.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-mime-parts.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-pkg.el
+%%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-thread.el
+%%MU4E%%share/emacs/site-lisp/mu4e/mu4e-thread.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

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 27, 4:33 PM (6 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16200953
Default Alt Text
D46961.diff (9 KB)

Event Timeline