Index: head/mail/notmuch/Makefile =================================================================== --- head/mail/notmuch/Makefile (revision 446296) +++ head/mail/notmuch/Makefile (revision 446297) @@ -1,83 +1,83 @@ # Created by: DarwinSurvivor # $FreeBSD$ PORTNAME= notmuch -PORTVERSION= 0.24.1 +PORTVERSION= 0.24.2 CATEGORIES= mail MASTER_SITES= http://notmuchmail.org/releases/ MAINTAINER= mp39590@gmail.com COMMENT= Thread-based email index, search, and tagging application LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING-GPL-3 BUILD_DEPENDS= c++filt:devel/binutils LIB_DEPENDS= libgmime-2.6.so:mail/gmime26 \ libxapian.so:databases/xapian-core \ libtalloc.so:devel/talloc TEST_DEPENDS= bash:shells/bash \ emacs:editors/emacs-nox11 \ dtach:misc/dtach \ gdate:sysutils/coreutils \ gbase64:sysutils/coreutils \ gwc:sysutils/coreutils \ gsed:sysutils/coreutils \ gsha256sum:sysutils/coreutils \ gpg:security/gnupg \ ${LOCALBASE}/bin/gdb:devel/gdb BROKEN_powerpc64= Does not build HAS_CONFIGURE= yes USES= gmake pkgconfig python:build USE_GNOME= glib20 CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${MANPREFIX}/man USE_LDCONFIG= yes MAKE_ENV+= PYTHONCMD=${PYTHON_CMD} TEST_ENV+= NOTMUCH_SKIP_TESTS="basic count insert smime atomicity \ message-property new regexp-query tagging" \ V=1 \ TEST_CFLAGS="-g -O0 -I${LOCALBASE}/include -L${LOCALBASE}/lib" \ BSD_GDB=${LOCALBASE}/bin/gdb TEST_TARGET= test OPTIONS_DEFINE= BASH DOXYGEN EMACS MANPAGES MUTT RUBY ZSH EMACS_DESC= Install EMACS lisp files (requires emacs) MUTT_DESC= Install notmuch-mutt script OPTIONS_SUB= yes BASH_BUILD_DEPENDS= bash-completion>=1.90:shells/bash-completion BASH_RUN_DEPENDS= ${BASH_BUILD_DEPENDS} BASH_CONFIGURE_WITH= bash-completion DOXYGEN_CONFIGURE_WITH= api-docs DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen EMACS_CONFIGURE_WITH= emacs EMACS_CONFIGURE_ON= --emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \ --emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR} EMACS_USE= EMACS=yes MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx MUTT_RUN_DEPENDS= p5-Term-ReadLine-Gnu>0:devel/p5-Term-ReadLine-Gnu \ p5-Mail-Tools>0:mail/p5-Mail-Tools \ p5-Mail-Box>0:mail/p5-Mail-Box \ p5-String-ShellQuote>0:textproc/p5-String-ShellQuote MUTT_USE= PERL=yes RUBY_USE= RUBY=yes ZSH_CONFIGURE_WITH= zsh-completion do-build-MUTT-on: ${MAKE_CMD} -C ${WRKSRC}/contrib/notmuch-mutt all ${GZIP_CMD} ${WRKSRC}/contrib/notmuch-mutt/notmuch-mutt.1 do-install-MUTT-on: ${INSTALL_SCRIPT} ${WRKSRC}/contrib/notmuch-mutt/notmuch-mutt ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/contrib/notmuch-mutt/notmuch-mutt.1.gz ${STAGEDIR}${MANPREFIX}/man/man1 post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.4.4.0 .include Index: head/mail/notmuch/distinfo =================================================================== --- head/mail/notmuch/distinfo (revision 446296) +++ head/mail/notmuch/distinfo (revision 446297) @@ -1,3 +1,3 @@ -TIMESTAMP = 1494281277 -SHA256 (notmuch-0.24.1.tar.gz) = fa117de2c6096dd896a333b9c770572a939e04a02abe6745b6b07f5363063ca3 -SIZE (notmuch-0.24.1.tar.gz) = 709190 +TIMESTAMP = 1500399569 +SHA256 (notmuch-0.24.2.tar.gz) = aa76a96684d5c5918d940182b6fe40f7d6745f144476fdda57388479d586cc51 +SIZE (notmuch-0.24.2.tar.gz) = 709272 Index: head/mail/notmuch/files/patch-emacs_notmuch-emacs-mua =================================================================== --- head/mail/notmuch/files/patch-emacs_notmuch-emacs-mua (nonexistent) +++ head/mail/notmuch/files/patch-emacs_notmuch-emacs-mua (revision 446297) @@ -0,0 +1,35 @@ +--- emacs/notmuch-emacs-mua.orig 2017-07-18 20:34:56 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 Property changes on: head/mail/notmuch/files/patch-emacs_notmuch-emacs-mua ___________________________________________________________________ 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 446296) +++ head/mail/notmuch/pkg-plist (revision 446297) @@ -1,68 +1,72 @@ bin/notmuch +%%EMACS%%bin/notmuch-emacs-mua %%MUTT%%bin/notmuch-mutt include/notmuch.h lib/libnotmuch.so lib/libnotmuch.so.4 lib/libnotmuch.so.4.4.0 %%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-emacs-mua.1.gz %%MANPAGES%%man/man1/notmuch-insert.1.gz %%MANPAGES%%man/man1/notmuch-new.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 %%MUTT%%man/man1/notmuch-mutt.1.gz %%DOXYGEN%%man/man3/notmuch.3.gz %%MANPAGES%%man/man5/notmuch-hooks.5.gz %%MANPAGES%%man/man7/notmuch-search-terms.7.gz %%BASH%%etc/bash_completion.d/notmuch %%EMACS%%%%EMACS_SITE_LISPDIR%%/coolj.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/coolj.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-address.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-address.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-crypto.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-crypto.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-draft.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-draft.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-hello.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-hello.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-jump.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-jump.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-lib.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-lib.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-logo.png %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-maildir-fcc.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-maildir-fcc.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-message.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-message.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-mua.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-mua.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-parser.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-parser.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-print.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-print.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-query.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-query.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-show.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-show.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-tag.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-tag.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-tree.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-tree.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-version.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-version.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-wash.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-wash.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-company.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-company.elc %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-compat.el %%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-compat.elc +%%EMACS%%share/applications/notmuch-emacs-mua.desktop %%ZSH%%share/zsh/functions/Completion/Unix/_notmuch