Index: head/mail/notmuch/Makefile =================================================================== --- head/mail/notmuch/Makefile (revision 472816) +++ head/mail/notmuch/Makefile (revision 472817) @@ -1,76 +1,80 @@ # Created by: DarwinSurvivor # $FreeBSD$ PORTNAME= notmuch -PORTVERSION= 0.26.2 +PORTVERSION= 0.27 CATEGORIES?= mail MASTER_SITES= https://notmuchmail.org/releases/ MAINTAINER= seschwar@gmail.com 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 \ libtalloc.so:devel/talloc TEST_DEPENDS= bash:shells/bash \ emacs:editors/emacs@nox \ dtach:misc/dtach \ gdate:sysutils/coreutils \ gbase64:sysutils/coreutils \ gsed:textproc/gsed \ gsha256sum:sysutils/coreutils \ gpg:security/gnupg \ gwc:sysutils/coreutils \ ${LOCALBASE}/bin/gdb:devel/gdb USES= gmake pkgconfig python:build,test 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 \ --with-zsh-completion \ --without-emacs CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} TEST_ENV+= NOTMUCH_SKIP_TESTS="basic.12 count.14 insert.2[89] insert.3[0-9] message-property.6 regexp-query.21" \ TEST_CFLAGS="-g -O0 -I${LOCALBASE}/include -L${LOCALBASE}/lib" \ TEST_GDB=${LOCALBASE}/bin/gdb \ V=1 TEST_TARGET= test .endif +PATCH_WRKSRC= ${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g} PKGDIR= ${.CURDIR} .ifndef MASTERDIR OPTIONS_DEFINE= DOXYGEN MANPAGES OPTIONS_DEFAULT= MANPAGES OPTIONS_SUB= yes DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen DOXYGEN_CONFIGURE_WITH= api-docs MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx 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: @${RM} ${STAGEDIR}${MANPREFIX}/man/man1/notmuch-emacs-mua.1.gz .endif .include Index: head/mail/notmuch/distinfo =================================================================== --- head/mail/notmuch/distinfo (revision 472816) +++ head/mail/notmuch/distinfo (revision 472817) @@ -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 Index: head/mail/notmuch/files/patch-doc_Makefile.local =================================================================== --- head/mail/notmuch/files/patch-doc_Makefile.local (nonexistent) +++ head/mail/notmuch/files/patch-doc_Makefile.local (revision 472817) @@ -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. Property changes on: head/mail/notmuch/files/patch-doc_Makefile.local ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +ON \ No newline at end of property 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 472817) @@ -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 ## +ON \ No newline at end of property Index: head/mail/notmuch/pkg-plist =================================================================== --- head/mail/notmuch/pkg-plist (revision 472816) +++ head/mail/notmuch/pkg-plist (revision 472817) @@ -1,26 +1,26 @@ %%DOXYGEN%%man/man3/notmuch.3.gz %%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-insert.1.gz %%MANPAGES%%man/man1/notmuch-new.1.gz %%MANPAGES%%man/man1/notmuch-reindex.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 %%MANPAGES%%man/man5/notmuch-hooks.5.gz %%MANPAGES%%man/man7/notmuch-properties.7.gz %%MANPAGES%%man/man7/notmuch-search-terms.7.gz 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 Index: head/mail/notmuch-emacs/Makefile =================================================================== --- head/mail/notmuch-emacs/Makefile (revision 472816) +++ head/mail/notmuch-emacs/Makefile (revision 472817) @@ -1,68 +1,74 @@ # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= mail elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} COMMENT= Emacs major-mode for the Notmuch email search and tagging application +LICENSE= GPLv3 + RUN_DEPENDS= notmuch:mail/notmuch USES= emacs gmake INSTALL_TARGET= install-emacs -MAKE_ARGS+= subdirs+=emacs MASTERDIR= ${.CURDIR}/../notmuch NO_ARCH= yes OPTIONS_DEFINE= DESKTOP DOCS MANPAGES OPTIONS_DEFAULT= MANPAGES OPTIONS_SUB= yes DESKTOP_DESC= Install .desktop file for notmuch-emacs-mua -DESKTOP_MAKE_ARGS= WITH_DESKTOP=1 +DESKTOP_CONFIGURE_ON= WITH_DESKTOP=1 DESKTOP_USES= desktop-file-utils +DOCS_ALL_TARGET= build-info DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx +DOCS_CONFIGURE_ON= HAVE_INSTALL_INFO=1 HAVE_MAKEINFO=1 HAVE_SPHINX=1 DOCS_INFO= notmuch-emacs +DOCS_INSTALL_TARGET= install-info DOCS_USES= makeinfo MANPAGES_ALL_TARGET= build-man MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx +MANPAGES_CONFIGURE_ON= HAVE_SPHINX=1 MANPAGES_INSTALL_TARGET= install-man -MANPAGES_MAKE_ARGS= subdirs+=doc # fake ./configure to avoid unneeded dependencies do-configure: @${CP} ${WRKSRC}/version ${WRKSRC}/version.stamp @${ECHO_CMD} 'quiet=$$($$(word 1, $$(1)))' > ${WRKSRC}/Makefile.local @${PRINTF} \ '%s\n' \ desktop_dir=${PREFIX}/share/applications \ emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR} \ emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \ HAVE_EMACS=1 \ - HAVE_SPHINX=1 \ + infodir=${PREFIX}/${INFO_PATH} \ mandir=${MANPREFIX}/man \ + NOTMUCH_SRCDIR=${WRKSRC} \ prefix=${PREFIX} \ srcdir=. \ + subdirs='doc emacs' \ WITH_EMACS=1 \ + ${CONFIGURE_ARGS} \ > ${WRKSRC}/Makefile.config -do-build-DOCS-on: - @${MAKE_CMD} -C ${WRKSRC} subdirs=doc sphinx-texinfo - @${MAKE_CMD} -C ${WRKSRC}/doc/_build/texinfo MAKEINFO='${MAKEINFO} --no-split' info +# work around race condition in Sphinx (cf. PR-227460) +pre-build: + @${MKDIR} ${WRKSRC}/doc/_build/doctrees -do-install-DOCS-on: - ${INSTALL_MAN} ${WRKSRC}/doc/_build/texinfo/notmuch-emacs.info ${STAGEDIR}${PREFIX}/${INFO_PATH} - post-install: @${GZIP_CMD} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/*.el # keep poudriere testport happy +post-install-DOCS-on: + @${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} ! -type d ! -name notmuch-emacs.info -delete + post-install-MANPAGES-on: @${FIND} ${STAGEDIR}${MANPREFIX}/man ! -type d ! -name notmuch-emacs-mua.1.gz -delete -.include "${MASTERDIR}/Makefile" - # modify what Mk/Uses/emacs.mk set MAKE_ARGS+= EMACS+=--quick + +.include "${MASTERDIR}/Makefile" Index: head/mail/notmuch-emacs/files/patch-doc_Makefile.local =================================================================== --- head/mail/notmuch-emacs/files/patch-doc_Makefile.local (nonexistent) +++ head/mail/notmuch-emacs/files/patch-doc_Makefile.local (revision 472817) @@ -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. Property changes on: head/mail/notmuch-emacs/files/patch-doc_Makefile.local ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +ON \ 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-emacs/files/patch-emacs_notmuch-emacs-mua =================================================================== --- head/mail/notmuch-emacs/files/patch-emacs_notmuch-emacs-mua (nonexistent) +++ head/mail/notmuch-emacs/files/patch-emacs_notmuch-emacs-mua (revision 472817) @@ -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-emacs/files/patch-emacs_notmuch-emacs-mua ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +ON \ 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/py-notmuch/Makefile =================================================================== --- head/mail/py-notmuch/Makefile (revision 472816) +++ head/mail/py-notmuch/Makefile (revision 472817) @@ -1,29 +1,31 @@ # $FreeBSD$ CATEGORIES= mail python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} COMMENT= Python interface for the Notmuch email search and tagging library +LICENSE= GPLv3 + LIB_DEPENDS= libnotmuch.so:mail/notmuch -USES= python +USES= python uniquefiles:dirs USE_PYTHON= autoplist distutils MASTERDIR= ${.CURDIR}/../notmuch NO_ARCH= yes -PORTDOCS= python/ +PORTDOCS= * WRKSRC_SUBDIR= bindings/python OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx do-build-DOCS-on: @${MAKE_CMD} -C ${WRKSRC}/docs html do-install-DOCS-on: - cd ${WRKSRC}/docs/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/python - @${RM} ${STAGEDIR}${DOCSDIR}/python/.buildinfo + cd ${WRKSRC}/docs/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} + @${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo .include "${MASTERDIR}/Makefile"