Date: Thu, 20 Jul 2017 22:18:31 +0000 (UTC) From: Joseph Mingrone <jrm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r446297 - in head/mail/notmuch: . files Message-ID: <201707202218.v6KMIVh7060487@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jrm Date: Thu Jul 20 22:18:31 2017 New Revision: 446297 URL: https://svnweb.freebsd.org/changeset/ports/446297 Log: 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 Added: head/mail/notmuch/files/patch-emacs_notmuch-emacs-mua (contents, props changed) Modified: head/mail/notmuch/Makefile head/mail/notmuch/distinfo head/mail/notmuch/pkg-plist Modified: head/mail/notmuch/Makefile ============================================================================== --- head/mail/notmuch/Makefile Thu Jul 20 21:39:38 2017 (r446296) +++ head/mail/notmuch/Makefile Thu Jul 20 22:18:31 2017 (r446297) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= notmuch -PORTVERSION= 0.24.1 +PORTVERSION= 0.24.2 CATEGORIES= mail MASTER_SITES= http://notmuchmail.org/releases/ Modified: head/mail/notmuch/distinfo ============================================================================== --- head/mail/notmuch/distinfo Thu Jul 20 21:39:38 2017 (r446296) +++ head/mail/notmuch/distinfo Thu Jul 20 22:18:31 2017 (r446297) @@ -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 Added: head/mail/notmuch/files/patch-emacs_notmuch-emacs-mua ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/notmuch/files/patch-emacs_notmuch-emacs-mua Thu Jul 20 22:18:31 2017 (r446297) @@ -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 Modified: head/mail/notmuch/pkg-plist ============================================================================== --- head/mail/notmuch/pkg-plist Thu Jul 20 21:39:38 2017 (r446296) +++ head/mail/notmuch/pkg-plist Thu Jul 20 22:18:31 2017 (r446297) @@ -1,4 +1,5 @@ bin/notmuch +%%EMACS%%bin/notmuch-emacs-mua %%MUTT%%bin/notmuch-mutt include/notmuch.h lib/libnotmuch.so @@ -30,6 +31,8 @@ lib/libnotmuch.so.4.4.0 %%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 @@ -65,4 +68,5 @@ lib/libnotmuch.so.4.4.0 %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707202218.v6KMIVh7060487>