This incorporates the changes previously posted for 1.4.3, with the exception of the README since there seemed to be some disagreement about that.
I also added a FLAVOR to optionally build the guile bindings, with some patches to change hard-coded references to guile and guile-snarf to guile2.2 and guile-snarf2.2, since that's how lang/guile2 installs them. I don't know best to handle that; this seemed simpler than trying to mess with autoconf/automake. There's another patch for a function (mu_str_size()) that clang was optimizing incorrectly, which caused the tests to fail. The bad optimization happens if it's built with -O1 or higher. I couldn't reproduce this on different system with clang 11.x, so it might be something that's fixed in newer llvm releases. Diff against existing files below, new files in the attachment. Index: Makefile =================================================================== RCS file: /cvs/ports/mail/mu/Makefile,v retrieving revision 1.19 diff -u -p -r1.19 Makefile --- Makefile 24 Jan 2020 10:36:41 -0000 1.19 +++ Makefile 14 May 2020 07:07:53 -0000 @@ -2,8 +2,12 @@ COMMENT= maildir indexer and searcher with emacs frontend -DISTNAME= mu-1.2.0 -REVISION= 0 +V= 1.4.5 + +DISTNAME= mu-$V + +FLAVORS= guile +FLAVOR ?= CATEGORIES= mail HOMEPAGE= http://www.djcbsoftware.nl/code/mu/ @@ -16,9 +20,10 @@ PERMIT_PACKAGE= Yes WANTLIB += ${COMPILER_LIBCXX} assuan c ffi gio-2.0 glib-2.0 gmime-3.0 WANTLIB += gmodule-2.0 gobject-2.0 gpg-error gpgme gthread-2.0 WANTLIB += iconv idn2 intl json-glib-1.0 m pcre unistring uuid -WANTLIB += xapian z +WANTLIB += xapian z curses readline -MASTER_SITES= https://github.com/djcb/mu/releases/download/1.2/ + +MASTER_SITES= https://github.com/djcb/mu/releases/download/1.4.5/ EXTRACT_SUFX= .tar.xz BUILD_DEPENDS= emacs->=24:editors/emacs @@ -29,6 +34,8 @@ LIB_DEPENDS= databases/xapian-core \ mail/gmime30 \ security/gpgme + + # C++14 COMPILER= base-clang ports-gcc @@ -37,9 +44,18 @@ AUTOMAKE_VERSION= 1.15 CONFIGURE_STYLE= autoreconf CONFIGURE_ARGS= --disable-gtk \ - --disable-webkit \ - --disable-guile + --disable-webkit + +.if ${FLAVOR} == "guile" +WANTLIB += guile-2.2 gc ltdl gmp +LIB_DEPENDS += lang/guile2 +SHARED_LIBS= guile-mu 0.0 +.else +CONFIGURE_ARGS += --disable-guile +.endif USE_GMAKE= Yes + +SEPARATE_BUILD= Yes .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/mail/mu/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo 21 Jul 2019 00:10:04 -0000 1.7 +++ distinfo 14 May 2020 07:07:53 -0000 @@ -1,2 +1,2 @@ -SHA256 (mu-1.2.0.tar.xz) = 9jTH8kTcaET/cdw8PhiT5I4ZPKqeDnR+umFjCXdfBTo= -SIZE (mu-1.2.0.tar.xz) = 844192 +SHA256 (mu-1.4.5.tar.xz) = PhatObK8mvXf4uR/OqdrO3w+evJF6JwtGJqbXEPJk54= +SIZE (mu-1.4.5.tar.xz) = 875992 Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/mail/mu/pkg/PLIST,v retrieving revision 1.6 diff -u -p -r1.6 PLIST --- pkg/PLIST 20 May 2018 08:02:14 -0000 1.6 +++ pkg/PLIST 14 May 2020 07:07:53 -0000 @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.6 2018/05/20 08:02:14 espie Exp $ +@comment $OpenBSD: PLIST-main,v$ @bin bin/mu @info info/mu4e.info @man man/man1/mu-add.1 @@ -8,6 +8,8 @@ @man man/man1/mu-find.1 @man man/man1/mu-help.1 @man man/man1/mu-index.1 +@man man/man1/mu-info.1 +@man man/man1/mu-init.1 @man man/man1/mu-mkdir.1 @man man/man1/mu-remove.1 @man man/man1/mu-script.1 @@ -15,10 +17,11 @@ @man man/man1/mu-verify.1 @man man/man1/mu-view.1 @man man/man1/mu.1 -@comment mu is compiled without gtk -@comment man/man1/mug.1 @man man/man5/mu-bookmarks.5 @man man/man7/mu-query.7 +%%guile%% +@comment mu is compiled without gtk +@comment man/man1/mug.1 share/doc/mu/ share/doc/mu/NEWS.org share/doc/mu/mu4e-about.org @@ -37,6 +40,8 @@ share/emacs/site-lisp/mu4e/mu4e-draft.el share/emacs/site-lisp/mu4e/mu4e-draft.elc share/emacs/site-lisp/mu4e/mu4e-headers.el share/emacs/site-lisp/mu4e/mu4e-headers.elc +share/emacs/site-lisp/mu4e/mu4e-icalendar.el +share/emacs/site-lisp/mu4e/mu4e-icalendar.elc share/emacs/site-lisp/mu4e/mu4e-lists.el share/emacs/site-lisp/mu4e/mu4e-lists.elc share/emacs/site-lisp/mu4e/mu4e-main.el @@ -47,6 +52,8 @@ share/emacs/site-lisp/mu4e/mu4e-message. share/emacs/site-lisp/mu4e/mu4e-message.elc share/emacs/site-lisp/mu4e/mu4e-meta.el share/emacs/site-lisp/mu4e/mu4e-meta.elc +share/emacs/site-lisp/mu4e/mu4e-org.el +share/emacs/site-lisp/mu4e/mu4e-org.elc share/emacs/site-lisp/mu4e/mu4e-proc.el share/emacs/site-lisp/mu4e/mu4e-proc.elc share/emacs/site-lisp/mu4e/mu4e-speedbar.el @@ -61,5 +68,3 @@ share/emacs/site-lisp/mu4e/mu4e.el share/emacs/site-lisp/mu4e/mu4e.elc share/emacs/site-lisp/mu4e/org-mu4e.el share/emacs/site-lisp/mu4e/org-mu4e.elc -share/emacs/site-lisp/mu4e/org-old-mu4e.el -share/emacs/site-lisp/mu4e/org-old-mu4e.elc
mu.tar.gz
Description: mail/mu
