3 files changed, 2 insertions, 46 deletions

diff --git a/mail/notmuch-emacs/Makefile b/mail/notmuch-emacs/Makefile
index b3980b332151..fe3f1aebfce4 100644
--- a/mail/notmuch-emacs/Makefile
+++ b/mail/notmuch-emacs/Makefile
@@ -40,9 +40,11 @@ do-configure:
 	@${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 \
diff --git a/mail/notmuch-emacs/files/patch-doc_Makefile.local b/mail/notmuch-emacs/files/patch-doc_Makefile.local
deleted file mode 100644
index 08b8ad5de116..000000000000
--- a/mail/notmuch-emacs/files/patch-doc_Makefile.local
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.local.orig	2018-06-16 21:06:47 UTC
-+++ doc/Makefile.local
-@@ -44,7 +44,7 @@ sphinx-texinfo:
- 	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(DOCBUILDDIR)/texinfo
- 
- sphinx-info: sphinx-texinfo
--	make -C $(DOCBUILDDIR)/texinfo info
-+	$(MAKE) -C $(DOCBUILDDIR)/texinfo info
- 
- # Use the man page converter that is available. We should never depend
- # on MAN_ROFF_FILES if a converter is not available.
diff --git a/mail/notmuch-emacs/files/patch-emacs_notmuch-emacs-mua b/mail/notmuch-emacs/files/patch-emacs_notmuch-emacs-mua
deleted file mode 100644
index 56878a4b1648..000000000000
--- a/mail/notmuch-emacs/files/patch-emacs_notmuch-emacs-mua
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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