diff --git a/mail/notmuch-emacs/Makefile b/mail/notmuch-emacs/Makefile index 01444bfe874c..fb977ccd3586 100644 --- a/mail/notmuch-emacs/Makefile +++ b/mail/notmuch-emacs/Makefile @@ -1,75 +1,74 @@ -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 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_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 PORTSCOUT= limit:^[0-9\.]*$$ # fake ./configure to avoid unneeded dependencies do-configure: @${CP} ${WRKSRC}/version.txt ${WRKSRC}/version.stamp @${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 \ NOTMUCH_SRCDIR=${WRKSRC} \ prefix=${PREFIX} \ srcdir=. \ subdirs='doc emacs' \ WITH_EMACS=1 \ ${CONFIGURE_ARGS} \ > ${WRKSRC}/Makefile.config @${PRINTF} "tags.add('WITH_EMACS')\nrsti_dir = '${WRKSRC}/emacs'\n" \ > ${WRKSRC}/sphinx.config 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 # modify what Mk/Uses/emacs.mk set MAKE_ARGS+= EMACS+=--quick .include "${MASTERDIR}/Makefile" diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile index 70a35300f219..1c0611dca1d2 100644 --- a/mail/notmuch/Makefile +++ b/mail/notmuch/Makefile @@ -1,92 +1,92 @@ # Created by: DarwinSurvivor PORTNAME= notmuch -PORTVERSION= 0.32.2 +PORTVERSION= 0.32.3 PORTREVISION?= 0 CATEGORIES?= mail MASTER_SITES= https://notmuchmail.org/releases/ MAINTAINER= dbaio@FreeBSD.org COMMENT?= Thread-based email index, search and tagging application LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g}/COPYING-GPL-3 .ifndef MASTERDIR LIB_DEPENDS= libgmime-3.0.so:mail/gmime30 \ 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= compiler:c++11-lang gmake gnome pkgconfig python:3.5+,build,test USE_GNOME= glib20 USE_LDCONFIG= yes .endif USES+= tar:xz .ifndef MASTERDIR HAS_CONFIGURE= yes 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 PORTSCOUT= limit:^[0-9\.]*$$ # Avoid conflict with C++20 by ignoring <...> under WRKSRC post-patch: @${REINPLACE_CMD} -i .c++20 's/-I$$(srcdir)/-iquote$$(srcdir)/' \ ${WRKSRC}/*/Makefile.local # Install bash completions without incurring a dependency on # shells/bash-completion. post-configure: ${REINPLACE_CMD} \ -e '/^BASH_ABSOLUTE[[:blank:]]*=/s|=.*|=${LOCALBASE}/bin/bash|' \ -e '/^HAVE_BASH[[:blank:]]*=/s/=.*/=1/' \ -e '/^WITH_BASH[[:blank:]]*=/s/=.*/=1/' \ ${WRKSRC}/Makefile.config post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.?*.?*.?* # Keep poudriere-testport(8) happy. post-install-MANPAGES-on: @${RM} ${STAGEDIR}${MANPREFIX}/man/man1/notmuch-emacs-mua.1.gz .endif .include diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo index 0d35081a664a..f340ce2de019 100644 --- a/mail/notmuch/distinfo +++ b/mail/notmuch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1625746680 -SHA256 (notmuch-0.32.2.tar.xz) = 8e0a7eb8ff2e6011ef48b2bf11d79b9c4bb74511cfe2987758b64898c2a2ded7 -SIZE (notmuch-0.32.2.tar.xz) = 725652 +TIMESTAMP = 1629401857 +SHA256 (notmuch-0.32.3.tar.xz) = be2ffff884eaecf61806f89b195a373f767a62e5bf2cc02ff1f55e41a55f8b84 +SIZE (notmuch-0.32.3.tar.xz) = 725872 diff --git a/mail/notmuch/pkg-plist b/mail/notmuch/pkg-plist index 6addac35fe37..e8dbf08351d7 100644 --- a/mail/notmuch/pkg-plist +++ b/mail/notmuch/pkg-plist @@ -1,27 +1,27 @@ %%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.3.0 +lib/libnotmuch.so.5.4.0 share/bash-completion/completions/notmuch share/zsh/site-functions/_email-notmuch share/zsh/site-functions/_notmuch