diff options
author | pi <pi@FreeBSD.org> | 2018-06-20 03:29:32 +0800 |
---|---|---|
committer | pi <pi@FreeBSD.org> | 2018-06-20 03:29:32 +0800 |
commit | 9ed4b9972afea358cc00875b522751876f605627 (patch) | |
tree | a6d63797a4394b774c014b8d899cb83789afe14d /mail/notmuch | |
parent | 113ece6d0702e2e8a631fd762c3cf9478da51503 (diff) | |
download | freebsd-ports-gnome-9ed4b9972afea358cc00875b522751876f605627.tar.gz freebsd-ports-gnome-9ed4b9972afea358cc00875b522751876f605627.tar.zst freebsd-ports-gnome-9ed4b9972afea358cc00875b522751876f605627.zip |
mail/notmuch,mail/notmuch-emacs,mail/py-notmuch: update 0.26.2 -> 0.27
- add LICENSE to pet portlint
- remove BROKEN_powerpc64 since the cause has been fixed in ports r471400
- adjust to upstream's new info page handling
- fix parallel installation of flavored mail/py-notmuch
PR: 229075
Submitted by: Sebastian Schwarz <seschwar@gmail.com> (maintainer)
Relnotes: https://notmuchmail.org/pipermail/notmuch/2018/026684.html
Diffstat (limited to 'mail/notmuch')
-rw-r--r-- | mail/notmuch/Makefile | 18 | ||||
-rw-r--r-- | mail/notmuch/distinfo | 6 | ||||
-rw-r--r-- | mail/notmuch/files/patch-doc_Makefile.local | 11 | ||||
-rw-r--r-- | mail/notmuch/files/patch-emacs_notmuch-emacs-mua | 35 | ||||
-rw-r--r-- | mail/notmuch/pkg-plist | 2 |
5 files changed, 61 insertions, 11 deletions
diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile index bb6ab2387d14..89a36cfed11f 100644 --- a/mail/notmuch/Makefile +++ b/mail/notmuch/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= notmuch -PORTVERSION= 0.26.2 +PORTVERSION= 0.27 CATEGORIES?= mail MASTER_SITES= https://notmuchmail.org/releases/ @@ -12,8 +12,6 @@ COMMENT?= Thread-based email index, search and tagging application LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g}/COPYING-GPL-3 -BROKEN_powerpc64= Does not build due to databases/xapian-core - .ifndef MASTERDIR LIB_DEPENDS= libgmime-2.6.so:mail/gmime26 \ libxapian.so:databases/xapian-core \ @@ -34,7 +32,8 @@ USE_GNOME= glib20 USE_LDCONFIG= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \ +CONFIGURE_ARGS= --infodir=${PREFIX}/${INFO_PATH} \ + --mandir=${MANPREFIX}/man \ --prefix=${PREFIX} \ --with-bash-completion \ --with-retry-lock \ @@ -48,6 +47,7 @@ TEST_ENV+= NOTMUCH_SKIP_TESTS="basic.12 count.14 insert.2[89] insert.3[0-9] mess TEST_TARGET= test .endif +PATCH_WRKSRC= ${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g} PKGDIR= ${.CURDIR} .ifndef MASTERDIR @@ -62,11 +62,15 @@ MANPAGES_CONFIGURE_WITH= docs # install completions even in absence of shells/bash-completions post-configure: - @${REINPLACE_CMD} -e '/^WITH_BASH[[:blank:]]*=/s/=.*/= 1/' ${WRKSRC}/Makefile.config + ${REINPLACE_CMD} \ + -e '/^HAVE_INSTALL_INFO[[:blank:]]*=/s/=.*/=0/' \ + -e '/^HAVE_MAKEINFO[[:blank:]]*=/s/=.*/=0/' \ + -e '/^WITH_BASH[[:blank:]]*=/s/=.*/= 1/' \ + ${WRKSRC}/Makefile.config post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.5.1.0 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.?*.?*.?* # keep poudriere testport happy post-install-MANPAGES-on: diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo index 5bd380e9ddbb..d54ff57f5744 100644 --- a/mail/notmuch/distinfo +++ b/mail/notmuch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1525128779 -SHA256 (notmuch-0.26.2.tar.gz) = 109c1865db7a035d08707421d13e9b6b82ee8e9f1534db70c28c51bc39370e3b -SIZE (notmuch-0.26.2.tar.gz) = 907187 +TIMESTAMP = 1529138705 +SHA256 (notmuch-0.27.tar.gz) = 40d3192f8f130f227b511fc80be86310c7f60ccb6d043b563f201fa505de0876 +SIZE (notmuch-0.27.tar.gz) = 912583 diff --git a/mail/notmuch/files/patch-doc_Makefile.local b/mail/notmuch/files/patch-doc_Makefile.local new file mode 100644 index 000000000000..08b8ad5de116 --- /dev/null +++ b/mail/notmuch/files/patch-doc_Makefile.local @@ -0,0 +1,11 @@ +--- 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/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 diff --git a/mail/notmuch/pkg-plist b/mail/notmuch/pkg-plist index eecfe2ab7702..78b13c376b86 100644 --- a/mail/notmuch/pkg-plist +++ b/mail/notmuch/pkg-plist @@ -21,6 +21,6 @@ bin/notmuch include/notmuch.h lib/libnotmuch.so lib/libnotmuch.so.5 -lib/libnotmuch.so.5.1.0 +lib/libnotmuch.so.5.2.0 share/bash-completion/completions/notmuch share/zsh/functions/Completion/Unix/_notmuch |