mu: updated to lastest version

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: mu: updated to lastest version
From: Kevin Bloom <kevin.bloom%posteo.net@localhost>
Date: Wed, 17 Apr 2024 19:49:12 +0000
Module Name:	pkgsrc-wip
Committed By:	Kevin Bloom <kevin.bloom%posteo.net@localhost>
Pushed By:	nuclearkev
Date:		Wed Apr 17 15:48:06 2024 -0400
Changeset:	a2faa840eed5d8ce044fc5c30768a63a82e9bed7

Modified Files:
	mu/Makefile
	mu/PLIST
	mu/PLIST.emacs
	mu/distinfo
	mu/options.mk
Added Files:
	mu/TODO
	mu/patches/patch-lib_utils_mu-utils-file.cc
	mu/patches/patch-mu_mu-cmd-find.cc

Log Message:
mu: updated to lastest version

while the program will compile and the single commands work (such as
index & init), the server does not. The server is required for mu4e
to work, which is probably the only reason someone would use this.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a2faa840eed5d8ce044fc5c30768a63a82e9bed7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mu/Makefile                                 | 24 ++++++++--
 mu/PLIST                                    | 67 ++++++++++++++++++++++++++-
 mu/PLIST.emacs                              | 72 ++++++++++++++++++++++-------
 mu/TODO                                     |  5 ++
 mu/distinfo                                 |  8 ++--
 mu/options.mk                               |  8 +---
 mu/patches/patch-lib_utils_mu-utils-file.cc | 15 ++++++
 mu/patches/patch-mu_mu-cmd-find.cc          | 14 ++++++
 8 files changed, 182 insertions(+), 31 deletions(-)

diffs:
diff --git a/mu/Makefile b/mu/Makefile
index af8a134290..ccaca4cc25 100644
--- a/mu/Makefile
+++ b/mu/Makefile
@@ -1,29 +1,47 @@
 # $NetBSD: Makefile,v 1.4 2014/11/09 21:02:11 thomasklausner Exp $
 
-DISTNAME=	mu-1.4.13
+DISTNAME=	mu-1.12.3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GITHUB:=djcb/}
+GITHUB_TAG=	refs/tags/v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://www.djcbsoftware.nl/code/mu/
 COMMENT=	E-mail searching and indexing tools
 LICENSE=	gnu-gpl-v3
 
+WRKSRC=	${WRKDIR}/${DISTNAME}
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--infodir=${PREFIX}/${PKGINFODIR}
+MESON_ARGS+=	-Dlispdir=${EMACS_LISPPREFIX}
+MESON_ARGS+=	-Dbuildtype=debug
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
-USE_TOOLS+=	gmake pkg-config autoconf automake autoreconf
+USE_TOOLS+=	gmake pkg-config autoconf automake ninja
+
+PYTHON_FOR_BUILD_ONLY=tool
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+# TODO: this isn't working at the moment
+# REPLACE_TOOL_PYTHON=	build-aux/date.py
+
+SUBST_CLASSES+=		py
+SUBST_FILES.py=	build-aux/date.py
+SUBST_STAGE.py=	post-extract
+SUBST_SED.py=	-e 's,/usr/bin/env,${PREFIX}/bin/env,'
+SUBST_SED.py=	-e 's,python3,python3.11,'
 
 .include "options.mk"
 
 pre-configure:
-	cd ${WRKSRC} && autoreconf -fiv
+	cd ${WRKSRC} && sh autogen.sh
 
 post-install:
 	-${RM} -f ${DESTDIR}${PREFIX}/info/dir
 
+#.include "../../lang/python/application.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/meson/build.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 9a13d685da..e1123b2e0f 100644
--- a/mu/PLIST
+++ b/mu/PLIST
@@ -2,7 +2,6 @@
 bin/mu
 man/man1/mu-add.1
 man/man1/mu-cfind.1
-man/man1/mu-easy.1
 man/man1/mu-extract.1
 man/man1/mu-find.1
 man/man1/mu-help.1
@@ -10,12 +9,76 @@ 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-script.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 30d2962c92..e1123b2e0f 100644
--- a/mu/PLIST.emacs
+++ b/mu/PLIST.emacs
@@ -1,18 +1,45 @@
-@comment $NetBSD: PLIST.emacs,v 1.1 2014/11/09 21:02:12 thomasklausner Exp $
+@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-draft.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-draft.elc
-${EMACS_LISPPREFIX}/mu4e/mu4e.el
-${EMACS_LISPPREFIX}/mu4e/mu4e.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
@@ -23,22 +50,35 @@ ${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-meta.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-meta.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-proc.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-proc.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-utils.el
-${EMACS_LISPPREFIX}/mu4e/mu4e-utils.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/org-mu4e.el
-${EMACS_LISPPREFIX}/mu4e/org-mu4e.elc
-info/mu4e.info
-info/mu-guile.info
-share/doc/mu/mu4e-about.org
+${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/TODO b/mu/TODO
new file mode 100644
index 0000000000..54485842c1
--- /dev/null
+++ b/mu/TODO
@@ -0,0 +1,5 @@
+- `mu server` starts up and immediately quits
+- more testing
+- add guile option back in
+- probably some issues with PLIST
+- fix REPLACE_PYTHON
diff --git a/mu/distinfo b/mu/distinfo
index 9a5fa5f93c..b53472c784 100644
--- a/mu/distinfo
+++ b/mu/distinfo
@@ -1,5 +1,7 @@
 $NetBSD: distinfo,v 1.2 2014/11/02 18:30:40 thomasklausner Exp $
 
-RMD160 (mu-1.4.13.tar.gz) = 2c9d6b8ddb339ce1d15bd9249414e3082ef0dcba
-SHA512 (mu-1.4.13.tar.gz) = 0f8e7f75332257e8cfdecf2c27bc23c83420387e40ecf92089232af6c545700a6c4925665b39fc236cacf8b26fa4b81df71775cdbe04c340fe3455c54c0d1bbc
-Size (mu-1.4.13.tar.gz) = 2309545 bytes
+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-utils-file.cc) = 3c748d6652b3d141ea40c125fe9fc3363611c84e
+SHA1 (patch-mu_mu-cmd-find.cc) = 1ac5aa68b309a86a47e7284d9ce43b845ceb268a
diff --git a/mu/options.mk b/mu/options.mk
index e07b31a764..8ded2dba13 100644
--- a/mu/options.mk
+++ b/mu/options.mk
@@ -2,7 +2,7 @@
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mu
 PKG_SUPPORTED_OPTIONS=	mu-emacs guile
-PKG_SUGGESTED_OPTIONS=	mu-emacs guile
+PKG_SUGGESTED_OPTIONS=	mu-emacs
 
 .include "../../mk/bsd.options.mk"
 
@@ -17,12 +17,6 @@ PLIST_SRC+=	PLIST.emacs
 CONFIGURE_ARGS+= --disable-mu4e
 .endif
 
-# needs gtk3 and webkit-gtk-3
-.if !empty(PKG_OPTIONS:Mgtk)
-.include "../../x11/gtk3/buildlink3.mk"
-.include "../../www/webkit24-gtk/buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mguile)
 .include "../../lang/guile22/buildlink3.mk"
 PLIST_SRC+=	PLIST.guile
diff --git a/mu/patches/patch-lib_utils_mu-utils-file.cc b/mu/patches/patch-lib_utils_mu-utils-file.cc
new file mode 100644
index 0000000000..a657c2c464
--- /dev/null
+++ b/mu/patches/patch-lib_utils_mu-utils-file.cc
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- 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 @@
+ 
+ #include <sys/stat.h>
+ 
++#if defined(__NetBSD__)
++#include <sys/wait.h>
++#endif
++
+ #include <glib.h>
+ #include <gio/gio.h>
+ #include <gio/gunixinputstream.h>
diff --git a/mu/patches/patch-mu_mu-cmd-find.cc b/mu/patches/patch-mu_mu-cmd-find.cc
new file mode 100644
index 0000000000..67160ceb26
--- /dev/null
+++ b/mu/patches/patch-mu_mu-cmd-find.cc
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- mu/mu-cmd-find.cc.orig	2024-04-08 20:22:35.000000000 +0000
++++ mu/mu-cmd-find.cc
+@@ -27,6 +27,9 @@
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <signal.h>
++#if defined(__NetBSD__)
++#include <sys/wait.h>
++#endif
+ 
+ #include "message/mu-message.hh"
+ #include "mu-maildir.hh"
Prev by Date: libreswan-git: update to 5.1pre0
Next by Date: py-homeassistant: Rototill deps
Previous by Thread: libreswan-git: update to 5.1pre0
Next by Thread: py-homeassistant: Rototill deps
Indexes:
Home | Main Index | Thread Index | Old Index