diff options
author | Joseph Mingrone <jrm@FreeBSD.org> | 2017-07-20 22:18:31 +0000 |
---|---|---|
committer | Joseph Mingrone <jrm@FreeBSD.org> | 2017-07-20 22:18:31 +0000 |
commit | ff51ca4c64d989c0a994bf65fedd780250c6ff1a (patch) | |
tree | 30a2d06c8503bde96729fe7f62fb0cf47fea104e /mail/notmuch/files/patch-emacs_notmuch-emacs-mua | |
parent | emulators/rpcs3: update to 0.0.3 (diff) |
mail/notmuch: Fix issues and upgrade to 0.24.2
Port changes:
- fix pkg-plist issues
- patch notmuch-emacs-mua to remove bashisms
- upgrade to version 0.24.2
Upstream changes:
https://git.notmuchmail.org/git?p=notmuch;a=blob_plain;f=NEWS;hb=2e86a4da55c29e0751d950839cdcbe40234ca8ba
Approved by: mp39590@gmail.com (maintainer)
Differential Revision: https://reviews.freebsd.org/D11644
Notes
Notes:
svn path=/head/; revision=446297
Diffstat (limited to 'mail/notmuch/files/patch-emacs_notmuch-emacs-mua')
-rw-r--r-- | mail/notmuch/files/patch-emacs_notmuch-emacs-mua | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/mail/notmuch/files/patch-emacs_notmuch-emacs-mua b/mail/notmuch/files/patch-emacs_notmuch-emacs-mua new file mode 100644 index 000000000000..56878a4b1648 --- /dev/null +++ b/mail/notmuch/files/patch-emacs_notmuch-emacs-mua @@ -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 |