Index: head/mail/notmuch/Makefile =================================================================== --- head/mail/notmuch/Makefile (revision 548368) +++ head/mail/notmuch/Makefile (revision 548369) @@ -1,93 +1,93 @@ # Created by: DarwinSurvivor # $FreeBSD$ PORTNAME= notmuch -PORTVERSION= 0.30 +PORTVERSION= 0.31 PORTREVISION?= 0 CATEGORIES?= mail MASTER_SITES= https://notmuchmail.org/releases/ MAINTAINER= dbaio@FreeBSD.org COMMENT?= Thread-based email index, search and tagging application LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g}/COPYING-GPL-3 .ifndef MASTERDIR LIB_DEPENDS= libgmime-3.0.so:mail/gmime30 \ libxapian.so:databases/xapian-core \ libtalloc.so:devel/talloc TEST_DEPENDS= bash:shells/bash \ emacs:editors/emacs@nox \ dtach:misc/dtach \ gdate:sysutils/coreutils \ gbase64:sysutils/coreutils \ gsed:textproc/gsed \ gsha256sum:sysutils/coreutils \ gpg:security/gnupg \ gwc:sysutils/coreutils \ ${LOCALBASE}/bin/gdb:devel/gdb USES= compiler:c++11-lang gmake gnome pkgconfig python:3.5+,build,test USE_GNOME= glib20 USE_LDCONFIG= yes .endif USES+= tar:xz .ifndef MASTERDIR HAS_CONFIGURE= yes CONFIGURE_ARGS= --infodir=${PREFIX}/${INFO_PATH} \ --mandir=${MANPREFIX}/man \ --prefix=${PREFIX} \ --with-bash-completion \ --with-retry-lock \ --with-zsh-completion \ --without-emacs CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} TEST_ENV+= NOTMUCH_SKIP_TESTS="basic.12 count.14 insert.2[89] insert.3[0-9] message-property.6 regexp-query.21" \ TEST_CFLAGS="-g -O0 -I${LOCALBASE}/include -L${LOCALBASE}/lib" \ TEST_GDB=${LOCALBASE}/bin/gdb \ V=1 TEST_TARGET= test .endif PATCH_WRKSRC= ${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g} PKGDIR= ${.CURDIR} .ifndef MASTERDIR OPTIONS_DEFINE= DOXYGEN MANPAGES OPTIONS_DEFAULT= MANPAGES OPTIONS_SUB= yes DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen DOXYGEN_CONFIGURE_WITH= api-docs MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx MANPAGES_CONFIGURE_WITH= docs PORTSCOUT= limit:^[0-9\.]*$$ # Avoid conflict with C++20 by ignoring <...> under WRKSRC post-patch: @${REINPLACE_CMD} -i .c++20 's/-I$$(srcdir)/-iquote$$(srcdir)/' \ ${WRKSRC}/*/Makefile.local # Install bash completions without incurring a dependency on # shells/bash-completion. post-configure: ${REINPLACE_CMD} \ -e '/^BASH_ABSOLUTE[[:blank:]]*=/s|=.*|=${LOCALBASE}/bin/bash|' \ -e '/^HAVE_BASH[[:blank:]]*=/s/=.*/=1/' \ -e '/^WITH_BASH[[:blank:]]*=/s/=.*/=1/' \ ${WRKSRC}/Makefile.config post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.?*.?*.?* # Keep poudriere-testport(8) happy. post-install-MANPAGES-on: @${RM} ${STAGEDIR}${MANPREFIX}/man/man1/notmuch-emacs-mua.1.gz .endif .include Index: head/mail/notmuch/distinfo =================================================================== --- head/mail/notmuch/distinfo (revision 548368) +++ head/mail/notmuch/distinfo (revision 548369) @@ -1,3 +1,3 @@ -TIMESTAMP = 1596897922 -SHA256 (notmuch-0.30.tar.xz) = 5e3baa6fe11d65c67e26ae488be11b320bae04e336acc9c64621f7e3449096fa -SIZE (notmuch-0.30.tar.xz) = 711904 +TIMESTAMP = 1599486775 +SHA256 (notmuch-0.31.tar.xz) = 571fa0e1539c86612b1f2b2c80a398e08ecfef52e27ef7e48cf8e3b84fa18394 +SIZE (notmuch-0.31.tar.xz) = 713144 Index: head/mail/notmuch/files/patch-configure =================================================================== --- head/mail/notmuch/files/patch-configure (revision 548368) +++ head/mail/notmuch/files/patch-configure (revision 548369) @@ -1,18 +1,18 @@ ---- configure.orig 2020-07-11 01:25:04 UTC +--- configure.orig 2020-09-06 00:50:03 UTC +++ configure -@@ -753,6 +753,7 @@ if command -v ${BASHCMD} > /dev/null; then +@@ -734,6 +734,7 @@ if command -v ${BASHCMD} > /dev/null; then printf "Yes (%s).\n" "$bash_absolute" else have_bash=0 + bash_absolute= printf "No. (%s not found)\n" "${BASHCMD}" fi -@@ -763,6 +764,7 @@ if command -v ${PERL} > /dev/null; then +@@ -744,6 +745,7 @@ if command -v ${PERL} > /dev/null; then printf "Yes (%s).\n" "$perl_absolute" else have_perl=0 + perl_absolute= printf "No. (%s not found)\n" "${PERL}" fi Index: head/mail/notmuch/files/patch-emacs_notmuch-emacs-mua =================================================================== --- head/mail/notmuch/files/patch-emacs_notmuch-emacs-mua (revision 548368) +++ head/mail/notmuch/files/patch-emacs_notmuch-emacs-mua (revision 548369) @@ -1,35 +1,36 @@ ---- emacs/notmuch-emacs-mua.orig 2017-07-18 20:34:56 UTC +--- emacs/notmuch-emacs-mua.orig 2020-09-06 00:50:03 UTC +++ emacs/notmuch-emacs-mua @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # # notmuch-emacs-mua - start composing a mail on the command line # @@ -26,8 +26,8 @@ set -eu # calling convention: escape -v var "$arg" (like in bash printf). escape () { - local __escape_arg__=${3//\\/\\\\} - printf -v $2 '%s' "${__escape_arg__//\"/\\\"}" + __escape_arg__="$(printf '%s' "$3" | sed -e 's|\\|\\\\|g' -e 's|\"|\\\"|g')" + eval "$2=\$__escape_arg__" } EMACS=${EMACS:-emacs} @@ -150,14 +150,14 @@ if [ -n "${MAILTO}" ]; then exit 1 fi ELISP="(browse-url-mail \"${MAILTO}\")" -elif [ -z "${ELISP}" -a -n "${HELLO}" ]; then +elif [ -z "${ELISP}" ] && [ -n "${HELLO}" ]; then ELISP="(notmuch)" else ELISP="(notmuch-mua-new-mail) ${ELISP}" fi # Kill the terminal/frame if we're creating one. -if [ -z "$USE_EMACSCLIENT" -o -n "$CREATE_FRAME" -o -n "$NO_WINDOW" ]; then +if [ -z "$USE_EMACSCLIENT" ] || [ -n "$CREATE_FRAME" ] || [ -n "$NO_WINDOW" ]; then ELISP="${ELISP} (message-add-action #'save-buffers-kill-terminal 'exit)" fi + Index: head/mail/notmuch/files/patch-emacs_notmuch-tree.el =================================================================== --- head/mail/notmuch/files/patch-emacs_notmuch-tree.el (nonexistent) +++ head/mail/notmuch/files/patch-emacs_notmuch-tree.el (revision 548369) @@ -0,0 +1,22 @@ +From: William Casarin + +Some are running into undeclarated function errors + +> emacs/notmuch-tree.el:1143:1:Warning: the following functions are +> not known to be defined: notmuch-search-previous-thread, +> notmuch-search-next-thread, notmuch-tree-from-search-thread + +Reported-by: Danilo G. Baio +Signed-off-by: William Casarin +--- emacs/notmuch-tree.el.orig 2020-09-06 00:50:03 UTC ++++ emacs/notmuch-tree.el +@@ -41,6 +41,9 @@ + (declare-function notmuch-read-query "notmuch" (prompt)) + (declare-function notmuch-search-find-thread-id "notmuch" (&optional bare)) + (declare-function notmuch-search-find-subject "notmuch" ()) ++(declare-function notmuch-search-next-thread "notmuch" ()) ++(declare-function notmuch-search-previous-thread "notmuch" ()) ++(declare-function notmuch-tree-from-search-thread "notmuch" ()) + + ;; the following variable is defined in notmuch.el + (defvar notmuch-search-query-string) Property changes on: head/mail/notmuch/files/patch-emacs_notmuch-tree.el ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/notmuch/pkg-plist =================================================================== --- head/mail/notmuch/pkg-plist (revision 548368) +++ head/mail/notmuch/pkg-plist (revision 548369) @@ -1,27 +1,27 @@ %%DOXYGEN%%man/man3/notmuch.3.gz %%MANPAGES%%man/man1/notmuch-address.1.gz %%MANPAGES%%man/man1/notmuch-compact.1.gz %%MANPAGES%%man/man1/notmuch-config.1.gz %%MANPAGES%%man/man1/notmuch-count.1.gz %%MANPAGES%%man/man1/notmuch-dump.1.gz %%MANPAGES%%man/man1/notmuch-insert.1.gz %%MANPAGES%%man/man1/notmuch-new.1.gz %%MANPAGES%%man/man1/notmuch-reindex.1.gz %%MANPAGES%%man/man1/notmuch-reply.1.gz %%MANPAGES%%man/man1/notmuch-restore.1.gz %%MANPAGES%%man/man1/notmuch-search.1.gz %%MANPAGES%%man/man1/notmuch-setup.1.gz %%MANPAGES%%man/man1/notmuch-show.1.gz %%MANPAGES%%man/man1/notmuch-tag.1.gz %%MANPAGES%%man/man1/notmuch.1.gz %%MANPAGES%%man/man5/notmuch-hooks.5.gz %%MANPAGES%%man/man7/notmuch-properties.7.gz %%MANPAGES%%man/man7/notmuch-search-terms.7.gz bin/notmuch include/notmuch.h lib/libnotmuch.so lib/libnotmuch.so.5 -lib/libnotmuch.so.5.2.0 +lib/libnotmuch.so.5.3.0 share/bash-completion/completions/notmuch share/zsh/site-functions/_email-notmuch share/zsh/site-functions/_notmuch Index: head/mail/notmuch-emacs/Makefile =================================================================== --- head/mail/notmuch-emacs/Makefile (revision 548368) +++ head/mail/notmuch-emacs/Makefile (revision 548369) @@ -1,74 +1,76 @@ # $FreeBSD$ CATEGORIES= mail elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} COMMENT= Emacs major-mode for the Notmuch email search and tagging application LICENSE= GPLv3 RUN_DEPENDS= notmuch:mail/notmuch USES= emacs gmake INSTALL_TARGET= install-emacs MASTERDIR= ${.CURDIR}/../notmuch NO_ARCH= yes OPTIONS_DEFINE= DESKTOP DOCS MANPAGES OPTIONS_DEFAULT= MANPAGES OPTIONS_SUB= yes DESKTOP_DESC= Install .desktop file for notmuch-emacs-mua DESKTOP_CONFIGURE_ON= WITH_DESKTOP=1 DESKTOP_USES= desktop-file-utils DOCS_ALL_TARGET= build-info DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx DOCS_CONFIGURE_ON= HAVE_INSTALL_INFO=1 HAVE_MAKEINFO=1 HAVE_SPHINX=1 DOCS_INFO= notmuch-emacs DOCS_INSTALL_TARGET= install-info DOCS_USES= makeinfo MANPAGES_ALL_TARGET= build-man MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx MANPAGES_CONFIGURE_ON= HAVE_SPHINX=1 MANPAGES_INSTALL_TARGET= install-man PORTSCOUT= limit:^[0-9\.]*$$ # fake ./configure to avoid unneeded dependencies do-configure: @${CP} ${WRKSRC}/version ${WRKSRC}/version.stamp @${ECHO_CMD} 'quiet=$$($$(word 1, $$(1)))' > ${WRKSRC}/Makefile.local @${PRINTF} \ '%s\n' \ BASH_ABSOLUTE=/bin/sh \ desktop_dir=${PREFIX}/share/applications \ emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR} \ emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \ HAVE_BASH=1 \ HAVE_EMACS=1 \ infodir=${PREFIX}/${INFO_PATH} \ mandir=${MANPREFIX}/man \ NOTMUCH_SRCDIR=${WRKSRC} \ prefix=${PREFIX} \ srcdir=. \ subdirs='doc emacs' \ WITH_EMACS=1 \ ${CONFIGURE_ARGS} \ > ${WRKSRC}/Makefile.config + @${PRINTF} "tags.add('WITH_EMACS')\nrsti_dir = '${WRKSRC}/emacs'\n" \ + > ${WRKSRC}/sphinx.config post-install: @${GZIP_CMD} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/*.el # keep poudriere testport happy post-install-DOCS-on: @${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} ! -type d ! -name notmuch-emacs.info -delete post-install-MANPAGES-on: @${FIND} ${STAGEDIR}${MANPREFIX}/man ! -type d ! -name notmuch-emacs-mua.1.gz -delete # modify what Mk/Uses/emacs.mk set MAKE_ARGS+= EMACS+=--quick .include "${MASTERDIR}/Makefile"