Index: head/mail/notmuch/Makefile =================================================================== --- head/mail/notmuch/Makefile (revision 504136) +++ head/mail/notmuch/Makefile (revision 504137) @@ -1,89 +1,90 @@ # Created by: DarwinSurvivor # $FreeBSD$ PORTNAME= notmuch -PORTVERSION= 0.28.2 +PORTVERSION= 0.29.1 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 .ifndef MASTERDIR -LIB_DEPENDS= libgmime-2.6.so:mail/gmime26 \ +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: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 -post-patch: # 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 dependcy on -# shells/bash-completion. Also avoid automatic installation of -# info pages on FreeBSD 10. +# 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 '/^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.?*.?*.?* -# keep poudriere testport happy +# Keep poudriere-testport(8) 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 504136) +++ head/mail/notmuch/distinfo (revision 504137) @@ -1,3 +1,3 @@ -TIMESTAMP = 1551537254 -SHA256 (notmuch-0.28.2.tar.gz) = 85a6498033451e188bcebbb3a4841e77c8d07b7fb1db89f17a74d6038f73e931 -SIZE (notmuch-0.28.2.tar.gz) = 921580 +TIMESTAMP = 1560452810 +SHA256 (notmuch-0.29.1.tar.xz) = 9846fc8e32d415cee41f6644581a4de7b0d2e6bc98e1ba86db918f061fcfe365 +SIZE (notmuch-0.29.1.tar.xz) = 660352 Index: head/mail/notmuch/files/patch-doc_Makefile.local =================================================================== --- head/mail/notmuch/files/patch-doc_Makefile.local (revision 504136) +++ head/mail/notmuch/files/patch-doc_Makefile.local (nonexistent) @@ -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. Property changes on: head/mail/notmuch/files/patch-doc_Makefile.local ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -ON \ No newline at end of property Index: head/mail/notmuch-emacs/Makefile =================================================================== --- head/mail/notmuch-emacs/Makefile (revision 504136) +++ head/mail/notmuch-emacs/Makefile (revision 504137) @@ -1,76 +1,72 @@ # $FreeBSD$ 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 # 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' \ 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 -# work around race condition in Sphinx (cf. PR-227460) -pre-build: - @${MKDIR} ${WRKSRC}/doc/_build/doctrees - 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"