mu: fixings things up in prep for release

diff --git a/mu/DESCR b/mu/DESCR
index 45f3dbfd2cd906f4fafcde97c6b84cde56ecdd6d..d02f253cfe52a54c3c991ddf0f63ffca2d2c0c25 100644 (file)
--- a/mu/DESCR
+++ b/mu/DESCR
@@ -1,15 +1,8 @@
-mu is a set of utilities to deal with Maildirs, specifically,
-indexing and searching.
-
-- mu-index - recursively scans a collection of email messages, and
-stores information found in a database.
-
-- mu-find - searches for messages based on some search criteria.
-
-- mu-msginfo - gives information (such as subject, sender, message
-body) for a certain message file
-
-- mu-mkmdir - creates a new Maildir
-
-mu uses libgmime2 to parse the message, and SQLite and Xapian to
-store the message data.
+mu is a tool for dealing with e-mail messages stored in the
+Maildir-format.  mu's purpose in life is to help you to quickly
+find the messages you need; in addition, it allows you to view
+messages, extract attachments, create new maildirs, and so on.
+
+Built on top of mu are some extensions:
+- mu4e: a full-featured e-mail client that runs inside emacs
+- mu-guile: bindings for the Guile/Scheme programming language

diff --git a/mu/Makefile b/mu/Makefile
index b6167cfd7e44da36aa5d6890db5513d8119399ba..2eda0f0c86dc3b5d6bf0ea4e3d5bf20f80eed06e 100644 (file)
--- a/mu/Makefile
+++ b/mu/Makefile
@@ -11,7 +11,6 @@ COMMENT=      E-mail searching and indexing tools
 LICENSE=       gnu-gpl-v3
 
 MESON_ARGS+=   -Dlispdir=${EMACS_LISPPREFIX}
-MESON_ARGS+=   -Dreadline=enabled
 USE_LANGUAGES= c c++
 USE_TOOLS+=    pkg-config
 
@@ -21,13 +20,9 @@ REPLACE_PYTHON+=             build-aux/date.py
 
 .include "options.mk"
 
-#post-install:
-#      -${RM} -f ${DESTDIR}${PREFIX}/info/dir
-
 .include "../../lang/python/application.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/meson/build.mk"
-.include "../../devel/readline/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.16.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mail/gmime3/buildlink3.mk"

diff --git a/mu/PLIST b/mu/PLIST
index e1123b2e0f7d8f02c0e9fa7acabcdd9ed28f83fa..a94ed7878861136a9c6f1dc19c3e783743bdac3d 100644 (file)
--- a/mu/PLIST
+++ b/mu/PLIST
@@ -1,84 +1,2 @@
 @comment $NetBSD$
 bin/mu
-man/man1/mu-add.1
-man/man1/mu-cfind.1
-man/man1/mu-extract.1
-man/man1/mu-find.1
-man/man1/mu-help.1
-man/man1/mu-index.1
-man/man1/mu-info.1
-man/man1/mu-init.1
-man/man1/mu-mkdir.1
-man/man1/mu-move.1
-man/man1/mu-remove.1
-man/man1/mu-server.1
-man/man1/mu-verify.1
-man/man1/mu-view.1
-man/man1/mu.1
-man/man5/mu-bookmarks.5
-man/man7/mu-easy.7
-man/man7/mu-query.7
-share/doc/mu/NEWS.org
-share/doc/mu/mu4e-about.org
-${EMACS_LISPPREFIX}/mu4e/mu4e-actions.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-actions.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-autoloads.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-bookmarks.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-bookmarks.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-compose.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-compose.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-config.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-contacts.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-contacts.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-context.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-context.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-contrib.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-contrib.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-folders.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-folders.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-headers.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-headers.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-helpers.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-helpers.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-icalendar.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-icalendar.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-lists.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-lists.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-main.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-main.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-mark.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-mark.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-message.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-message.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-mime-parts.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-mime-parts.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-modeline.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-modeline.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-notification.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-notification.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-obsolete.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-obsolete.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-org.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-org.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-pkg.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-query-items.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-query-items.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-search.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-search.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-server.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-server.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-speedbar.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-speedbar.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-thread.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-thread.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-update.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-update.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-vars.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-vars.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-view.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-view.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e-window.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-window.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e.el
-${EMACS_LISPPREFIX}/mu4e/mu4e.elc
-share/info/mu4e.info

diff --git a/mu/PLIST.emacs b/mu/PLIST.emacs
index e1123b2e0f7d8f02c0e9fa7acabcdd9ed28f83fa..f4d54698f1a238079e8d67e468747c56421004f2 100644 (file)
--- a/mu/PLIST.emacs
+++ b/mu/PLIST.emacs
@@ -1,5 +1,4 @@
 @comment $NetBSD$
-bin/mu
 man/man1/mu-add.1
 man/man1/mu-cfind.1
 man/man1/mu-extract.1

diff --git a/mu/PLIST.guile b/mu/PLIST.guile
index 910c1c7d99227b70d7f39a41b545d92373c707ce..f6e248a7b70f766a8123df99dffda105a3fb897a 100644 (file)
--- a/mu/PLIST.guile
+++ b/mu/PLIST.guile
@@ -1,14 +1,12 @@
 @comment $NetBSD: PLIST.guile,v 1.1 2015/01/03 09:55:19 thomasklausner Exp $
-info/mu-guile.info
-lib/libguile-mu.la
-share/guile/site/2.2/mu.scm
-share/guile/site/2.2/mu/plot.scm
-share/guile/site/2.2/mu/script.scm
-share/guile/site/2.2/mu/stats.scm
+guile/3.0/lib/guile/3.0/extensions/libguile-mu.so
+share/doc/mu/NEWS.org
+share/guile/site/3.0/mu.scm
+share/guile/site/3.0/mu/message.scm
+share/guile/site/3.0/mu/plot.scm
+share/guile/site/3.0/mu/script.scm
+share/guile/site/3.0/mu/stats.scm
+share/info/mu-guile.info
 share/mu/scripts/find-dups.scm
+share/mu/scripts/histogram.scm
 share/mu/scripts/msgs-count.scm
-share/mu/scripts/msgs-per-day.scm
-share/mu/scripts/msgs-per-hour.scm
-share/mu/scripts/msgs-per-month.scm
-share/mu/scripts/msgs-per-year-month.scm
-share/mu/scripts/msgs-per-year.scm

diff --git a/mu/TODO b/mu/TODO
deleted file mode 100644 (file)
index 2cb5b0f..0000000
--- a/mu/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-- more testing
-- add guile option back in
-- probably some issues with PLIST
-- fix REPLACE_PYTHON

diff --git a/mu/distinfo b/mu/distinfo
index bcc64e06338d89aab997daaa6559dc6c71dc00b9..08b9c59d766476d820c30fdf7c0d27c2076a6a9c 100644 (file)
--- a/mu/distinfo
+++ b/mu/distinfo
@@ -3,6 +3,6 @@ $NetBSD: distinfo,v 1.2 2014/11/02 18:30:40 thomasklausner Exp $
 BLAKE2s (mu-1.12.3.tar.gz) = bb68bcd5bd4c70ca715edf5aba81e6fe93a425b15dae277d674a5efa41d401c8
 SHA512 (mu-1.12.3.tar.gz) = 018a7abb91dd61f27bb4f6d1ce1b52f762f42383a73fd63f0c42264fe3938530dd232b4315d1f599fa2974938a22ead7d0dc2c188b1e45c8acbc1ce21f287d66
 Size (mu-1.12.3.tar.gz) = 958099 bytes
-SHA1 (patch-lib_utils_mu-readline.cc) = a5da17e0221671b18656565841dd8bfb6d7d02d1
-SHA1 (patch-lib_utils_mu-utils-file.cc) = 3c748d6652b3d141ea40c125fe9fc3363611c84e
-SHA1 (patch-mu_mu-cmd-find.cc) = 1ac5aa68b309a86a47e7284d9ce43b845ceb268a
+SHA1 (patch-lib_utils_mu-logger.cc) = 9fbc427529d2b3696d41a980f2926e8b28f0f76f
+SHA1 (patch-lib_utils_mu-utils-file.cc) = e35e880a64f39e3f26c1a635fd6ac4f2ea1b4b50
+SHA1 (patch-mu_mu-cmd-find.cc) = 1ae455a4939eed86b1cac75a6af347c7ffd61be6

diff --git a/mu/options.mk b/mu/options.mk
index e0593dd03bf27a81d4a137079601ee64d43c7475..06bdb32f3ab571f11f05b521b1929dd9e18940dd 100644 (file)
--- a/mu/options.mk
+++ b/mu/options.mk
@@ -8,23 +8,28 @@ PKG_SUGGESTED_OPTIONS=        mu-emacs
 
 PLIST_SRC=     PLIST
 
+###
+###  Include the Emacs mu frontend, mu4e
+###
 .if !empty(PKG_OPTIONS:Mmu-emacs)
 .include "../../editors/emacs/modules.mk"
 INFO_FILES=    yes
 USE_TOOLS+=    makeinfo
 PLIST_SRC+=    PLIST.emacs
 .else
-# TODO: update for meson
-CONFIGURE_ARGS+= --disable-mu4e
+MESON_ARGS+=   -Demacs=disabled
 .endif
 
+###
+###  Support guile
+###
 .if !empty(PKG_OPTIONS:Mguile)
-.include "../../lang/guile22/buildlink3.mk"
+.include "../../lang/guile30/buildlink3.mk"
 PLIST_SRC+=    PLIST.guile
 # TODO: update for meson
-CONFIGURE_ENV+= ac_cv_path_GUILE=guile
+# CONFIGURE_ENV+= ac_cv_path_GUILE=guile
 USE_TOOLS+= makeinfo
+MESON_ARGS+=   -Dguile=enabled
 .else
-# TODO: update for meson
-CONFIGURE_ARGS+= --disable-guile
+MESON_ARGS+=   -Dguile=disabled
 .endif

diff --git a/mu/patches/patch-lib_utils_mu-logger.cc b/mu/patches/patch-lib_utils_mu-logger.cc
new file mode 100644 (file)
index 0000000..f3f8f85
--- /dev/null
+++ b/mu/patches/patch-lib_utils_mu-logger.cc
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Only Linux has systemd
+
+--- lib/utils/mu-logger.cc.orig        2024-05-01 14:55:55.224250331 +0000
++++ lib/utils/mu-logger.cc
+@@ -156,8 +156,12 @@ Mu::Logger::Logger(const std::string& pa
+                   }
+ 
+                   // log to the journal, or, if not available to a file.
++#if defined(__linux__)
+                   if (any_of(MuLogOptions & Options::File) ||
+                       log_journal(level, fields, n_fields, user_data) != G_LOG_WRITER_HANDLED)
++#else
++                  if (any_of(MuLogOptions & Options::File))
++#endif
+                           return log_file(level, fields, n_fields, user_data);
+                   else
+                           return G_LOG_WRITER_HANDLED;

diff --git a/mu/patches/patch-lib_utils_mu-readline.cc b/mu/patches/patch-lib_utils_mu-readline.cc
deleted file mode 100644 (file)
index 91b9491..0000000
--- a/mu/patches/patch-lib_utils_mu-readline.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
---- lib/utils/mu-readline.cc.orig      2024-04-24 01:19:02.086438386 +0000
-+++ lib/utils/mu-readline.cc
-@@ -73,7 +73,11 @@ Mu::have_readline()
- void
- Mu::setup_readline(const std::string& histpath, size_t maxlines)
- {
-+#if defined(__NetBSD__)
-+      is_a_tty  = 1;
-+#else
-       is_a_tty  = !!::isatty(::fileno(stdout));
-+#endif
-       hist_path = histpath;
-       max_lines = maxlines;
- 

diff --git a/mu/patches/patch-lib_utils_mu-utils-file.cc b/mu/patches/patch-lib_utils_mu-utils-file.cc
index a657c2c4647fba179ee5a63a988f209d792e1d4d..73829ee26030b72eb22043f074acff07c01d86d6 100644 (file)
--- a/mu/patches/patch-lib_utils_mu-utils-file.cc
+++ b/mu/patches/patch-lib_utils_mu-utils-file.cc
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Must include sys/wait.h for WEXITSTATUS
+
 --- lib/utils/mu-utils-file.cc.orig    2024-04-08 20:22:35.000000000 +0000
 +++ lib/utils/mu-utils-file.cc
 @@ -24,6 +24,10 @@

diff --git a/mu/patches/patch-mu_mu-cmd-find.cc b/mu/patches/patch-mu_mu-cmd-find.cc
index 67160ceb26b9ab8a035d50a311785fd44df9a26b..a6130510cd0e932c2da1c535c52d0495462b3db0 100644 (file)
--- a/mu/patches/patch-mu_mu-cmd-find.cc
+++ b/mu/patches/patch-mu_mu-cmd-find.cc
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Must include sys/wait.h for WEXITSTATUS
+
 --- mu/mu-cmd-find.cc.orig     2024-04-08 20:22:35.000000000 +0000
 +++ mu/mu-cmd-find.cc
 @@ -27,6 +27,9 @@